diff --git a/.all-contributorsrc b/.all-contributorsrc
index 0ef793ed77..d7b219ee17 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -343,6 +343,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "aswathkk",
+      "name": "Aswath K",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10436935?v=4",
+      "profile": "https://github.com/aswathkk",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/.env.example b/.env.example
index ef48c3bc9d..6dfdfab187 100644
--- a/.env.example
+++ b/.env.example
@@ -57,4 +57,9 @@ APPSMITH_MAIL_SMTP_TLS_ENABLED=
 #APPSMITH_SENTRY_ENVIRONMENT=
 
 # Configure cloud services
-# APPSMITH_CLOUD_SERVICES_BASE_URL
\ No newline at end of file
+# APPSMITH_CLOUD_SERVICES_BASE_URL="https://release-cs.appsmith.com"
+
+# Google Recaptcha Config
+APPSMITH_RECAPTCHA_SITE_KEY=
+APPSMITH_RECAPTCHA_SECRET_KEY=
+APPSMITH_RECAPTCHA_ENABLED=
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/----feature-request.md b/.github/ISSUE_TEMPLATE/----feature-request.md
index 7f7ff5b05d..be54588e4d 100644
--- a/.github/ISSUE_TEMPLATE/----feature-request.md
+++ b/.github/ISSUE_TEMPLATE/----feature-request.md
@@ -2,7 +2,7 @@
 name: "\U0001F6E0️ Feature request"
 about: Suggest an idea to improve appsmith
 title: "[Feature]"
-labels: ''
+labels: Enhancement
 assignees: Nikhil-Nandagopal
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
index c9820c7041..4694040b0e 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -4,7 +4,6 @@ about: Create a bug report to help us improve appsmith
 title: "[Bug]"
 labels: Bug, Needs Triaging
 assignees: Nikhil-Nandagopal
-
 ---
 
 ## Description
@@ -12,13 +11,17 @@ assignees: Nikhil-Nandagopal
 [What happened]
 
 ### Steps to reproduce the behaviour:
+
 Add steps to reproduce this behaviour, include console / network logs & screenshots
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
 ### Important Details
- - Version: [Cloud / Self-Hosted vx.x]
- - OS: [e.g.MacOSX]
- - Browser [e.g. chrome, safari]
+
+- Version: [Cloud / Self-Hosted vx.x]
+- OS: [e.g.MacOSX]
+- Browser [e.g. chrome, safari]
+- Environment [production, release, deploy preview]
diff --git a/.github/ISSUE_TEMPLATE/---epic.md b/.github/ISSUE_TEMPLATE/---epic.md
index 2a132b4026..ebd598123a 100644
--- a/.github/ISSUE_TEMPLATE/---epic.md
+++ b/.github/ISSUE_TEMPLATE/---epic.md
@@ -4,6 +4,7 @@ about: Describe the problem, solution and related issues
 title: "[Epic]"
 labels: Epic, Product Note
 assignees: Nikhil-Nandagopal
+
 ---
 
 # Objective
diff --git a/.github/config.json b/.github/config.json
index 48b03bac49..cbc906c204 100644
--- a/.github/config.json
+++ b/.github/config.json
@@ -170,6 +170,10 @@
       "color": "50ba23",
       "description": ""
     },
+    "Import-Export-App": {
+      "name": "Import-Export-App",
+      "color": "50ba23"
+    },
     "JS": {
       "name": "JS",
       "color": "ffc1c2",
@@ -619,6 +623,11 @@
                 "type": "hasLabel",
                 "value": true
               },
+              {
+                "label": "iFrame",
+                "type": "hasLabel",
+                "value": true
+              },
               {
                 "label": "Widgets",
                 "type": "hasLabel",
@@ -648,6 +657,11 @@
                 "type": "hasLabel",
                 "label": "UI Building",
                 "value": true
+              },
+              {
+                "type": "hasLabel",
+                "label": "UI Performance",
+                "value": true
               }
             ]
           },
@@ -664,6 +678,11 @@
                 "label": "Debugger",
                 "value": true
               },
+              {
+                "type": "hasLabel",
+                "label": "Import-Export-App",
+                "value": true
+              },
               {
                 "type": "hasLabel",
                 "label": "Omnibar",
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index df2e2f8f51..162b9ead0c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,10 +3,12 @@
 > Use this template to quickly create a well written pull request. Delete all quotes before creating the pull request.
 
 ## Description
-> Please include a summary of the changes and which issue has been fixed. Please also include relevant motivation 
+
+> Please include a summary of the changes and which issue has been fixed. Please also include relevant motivation
 > and context. List any dependencies that are required for this change.
 
 Fixes # (issue)
+
 > if no issue exists, please create an issue and ask the maintainers about this first
 
 ## Type of change
@@ -20,7 +22,7 @@ Fixes # (issue)
 
 ## How Has This Been Tested?
 
-> Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce. 
+> Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce.
 > Please also list any relevant details for your test configuration.
 
 - Test A
diff --git a/.github/release-drafter-template.yml b/.github/release-drafter-template.yml
index ff28150475..e087624d0a 100644
--- a/.github/release-drafter-template.yml
+++ b/.github/release-drafter-template.yml
@@ -9,6 +9,9 @@ categories:
       - 'Bug'
   - title: '📙 Documentation'
     label: 'Documentation'
+# Any PR with the label 'skip-changelog' will not be inserted into the release notes
+exclude-labels:
+  - 'skip-changelog'
 change-template: '- $TITLE (#$NUMBER)'
 change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
 version-resolver:
@@ -25,4 +28,4 @@ version-resolver:
 template: |
   ## What's new?
 
-  $CHANGES
\ No newline at end of file
+  $CHANGES
diff --git a/.github/workflows/build-rts.yml b/.github/workflows/build-rts.yml
index 6ee9672092..9fc4aaca53 100644
--- a/.github/workflows/build-rts.yml
+++ b/.github/workflows/build-rts.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
   push:
-    branches: [release, master]
+    branches: [release, release-frozen, master]
     # Only trigger if files have changed in this specific path
     paths:
       - "app/rts/**"
@@ -68,6 +68,14 @@ jobs:
           echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
           docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}}
 
+      # Build release-frozen Docker image and push to Docker Hub
+      - name: Push release-frozen image to Docker Hub
+        if: success() && github.ref == 'refs/heads/release-frozen'
+        run: |
+          docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} .
+          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}}
+
       # Build master Docker image and push to Docker Hub
       - name: Push master image to Docker Hub with commit tag
         if: success() && github.ref == 'refs/heads/master'
diff --git a/.github/workflows/client-test.yml b/.github/workflows/client-test.yml
index e55457c5d2..d6f2b89ac4 100644
--- a/.github/workflows/client-test.yml
+++ b/.github/workflows/client-test.yml
@@ -13,7 +13,7 @@ on:
 
   # trigger for pushes to release and master
   push:
-    branches: [release, master]
+    branches: [release, release-frozen, master]
     paths:
       - "app/client/**"
       - "!app/client/cypress/manual_TestSuite/**"
@@ -27,13 +27,11 @@ jobs:
   build:
     # If the build has been triggered manually via workflow_dispatch or via a push to protected branches
     # then we don't check for the PR approved state
-    # Only PR approvals of internally created PRs should trigger this workflow
     if: |
-      github.event_name == 'workflow_dispatch' || 
-      github.event_name == 'push' || 
-      (github.event_name == 'pull_request_review' && 
-      github.event.review.state == 'approved' && 
-      github.event.pull_request.head.repo.full_name == github.repository)
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'push' ||
+      (github.event_name == 'pull_request_review' &&
+      github.event.review.state == 'approved')
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -116,6 +114,7 @@ jobs:
             REACT_APP_VERSION_ID=${{ steps.vars.outputs.version }} \
             REACT_APP_VERSION_RELEASE_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ') \
             REACT_APP_GOOGLE_ANALYTICS_ID=${{ secrets.GOOGLE_TAG_MANAGER_ID }} \
+            REACT_APP_SHOW_ONBOARDING_FORM=true \
             yarn build
 
       # Upload the build artifact so that it can be used by the test & deploy job in the workflow
@@ -197,7 +196,22 @@ jobs:
           path: app/client/build
 
       - name: Pull release server docker container and start it locally
-        if: github.ref == 'refs/heads/release' || github.event.pull_request.base.ref == 'release'
+        if: github.ref == 'refs/heads/release' || github.event.pull_request.base.ref == 'release' || github.event.pull_request.head.ref == 'release'
+        shell: bash
+        run: |
+          docker run -d --net=host --name appsmith-internal-server -p 8080:8080 \
+            --env APPSMITH_MONGODB_URI=mongodb://localhost:27017/appsmith \
+            --env APPSMITH_REDIS_URL=redis://localhost:6379 \
+            --env APPSMITH_ENCRYPTION_PASSWORD=password \
+            --env APPSMITH_ENCRYPTION_SALT=salt \
+            --env APPSMITH_IS_SELF_HOSTED=false \
+            --env APPSMITH_CLOUD_SERVICES_BASE_URL=https://release-cs.appsmith.com \
+            --env APPSMITH_CLOUD_SERVICES_USERNAME= \
+            --env APPSMITH_CLOUD_SERVICES_PASSWORD= \
+            ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:release
+
+      - name: Pull release-frozen server docker container and start it locally
+        if: github.ref == 'refs/heads/release-frozen' || github.event.pull_request.head.ref == 'release-frozen'
         shell: bash
         run: |
           docker run -d --net=host --name appsmith-internal-server -p 8080:8080 \
@@ -209,10 +223,10 @@ jobs:
             --env APPSMITH_CLOUD_SERVICES_BASE_URL= \
             --env APPSMITH_CLOUD_SERVICES_USERNAME= \
             --env APPSMITH_CLOUD_SERVICES_PASSWORD= \
-            ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:release
+            ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:release-frozen
 
       - name: Pull master server docker container and start it locally
-        if: github.ref == 'refs/heads/master' || github.event.pull_request.base.ref == 'master'
+        if: github.ref == 'refs/heads/master'
         shell: bash
         run: |
           docker run -d --net=host --name appsmith-internal-server -p 8080:8080 \
@@ -221,7 +235,7 @@ jobs:
             --env APPSMITH_ENCRYPTION_PASSWORD=password \
             --env APPSMITH_ENCRYPTION_SALT=salt \
             --env APPSMITH_IS_SELF_HOSTED=false \
-            --env APPSMITH_CLOUD_SERVICES_BASE_URL= \
+            --env APPSMITH_CLOUD_SERVICES_BASE_URL=https://release-cs.appsmith.com \
             --env APPSMITH_CLOUD_SERVICES_USERNAME= \
             --env APPSMITH_CLOUD_SERVICES_PASSWORD= \
             ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:nightly
@@ -287,7 +301,7 @@ jobs:
   ui-test-result:
     needs: ui-test
     # Only run if the ui-test with matrices step is successful
-    if: success()
+    if: always()
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -295,6 +309,19 @@ jobs:
     steps:
       - run: echo "All ui-test matrices completed"
 
+      - name: Return status for ui-matrix
+        run: |
+          if [[ "${{ needs.ui-test.result }}" == "success" ]]; then
+            echo "Integration tests completed successfully!";
+            exit 0;
+          elif [[ "${{ needs.ui-test.result }}" == "skipped" ]]; then
+            echo "Integration tests were skipped";
+            exit 1;
+          else
+            echo "Integration tests have failed";
+            exit 1;
+          fi
+
   package:
     needs: ui-test
     runs-on: ubuntu-latest
@@ -302,7 +329,7 @@ jobs:
       run:
         working-directory: app/client
     # Run this job only if all the previous steps are a success and the reference if the release or master branch
-    if: success() && (github.ref == 'refs/heads/release' || github.ref == 'refs/heads/master')
+    if: (success() && github.ref == 'refs/heads/release') || github.ref == 'refs/heads/master'
 
     steps:
       # Checkout the code
@@ -336,6 +363,14 @@ jobs:
           echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
           docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.branch_name.outputs.tag}}
 
+      # Build release-frozen Docker image and push to Docker Hub
+      - name: Push release-frozen image to Docker Hub
+        if: success() && github.ref == 'refs/heads/release-frozen' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+        run: |
+          docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.branch_name.outputs.tag}} .
+          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.branch_name.outputs.tag}}
+
       # Build master Docker image and push to Docker Hub
       - name: Push production image to Docker Hub with commit tag
         if: success() && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
diff --git a/.github/workflows/external-client-test.yml b/.github/workflows/external-client-test.yml
index f83389788e..28523fdbca 100644
--- a/.github/workflows/external-client-test.yml
+++ b/.github/workflows/external-client-test.yml
@@ -71,6 +71,7 @@ jobs:
       - name: Build and test
         env:
           APPSMITH_MONGODB_URI: "mongodb://localhost:27017/mobtools"
+          APPSMITH_CLOUD_SERVICES_BASE_URL: "https://release-cs.appsmith.com"
           APPSMITH_REDIS_URL: "redis://127.0.0.1:6379"
           APPSMITH_ENCRYPTION_PASSWORD: "password"
           APPSMITH_ENCRYPTION_SALT: "salt"
@@ -199,7 +200,7 @@ jobs:
             if(check.length == 0) {
               const head_sha = pull.head.sha;
               const { data: completed_at } = await github.checks.create({
-                owner: context.repo.owner, 
+                owner: context.repo.owner,
                 repo: context.repo.repo,
                 head_sha: head_sha,
                 name: process.env.job,
@@ -294,7 +295,24 @@ jobs:
           path: app/client/build
 
       - name: Pull release server docker container and start it locally
-        if: github.ref == 'refs/heads/release' || github.event.pull_request.base.ref == 'release'
+        if: github.ref == 'refs/heads/release' || github.event.pull_request.base.ref == 'release'|| github.event.pull_request.head.ref == 'release'
+        shell: bash
+        run: |
+          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+
+          docker run -d --net=host --name appsmith-internal-server -p 8080:8080 \
+            --env APPSMITH_MONGODB_URI=mongodb://localhost:27017/appsmith \
+            --env APPSMITH_REDIS_URL=redis://localhost:6379 \
+            --env APPSMITH_ENCRYPTION_PASSWORD=password \
+            --env APPSMITH_ENCRYPTION_SALT=salt \
+            --env APPSMITH_IS_SELF_HOSTED=false \
+            --env APPSMITH_CLOUD_SERVICES_BASE_URL=https://release-cs.appsmith.com \
+            --env APPSMITH_CLOUD_SERVICES_USERNAME= \
+            --env APPSMITH_CLOUD_SERVICES_PASSWORD= \
+            ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:release
+
+      - name: Pull release-frozen server docker container and start it locally
+        if: github.ref == 'refs/heads/release-frozen' || github.event.pull_request.head.ref == 'release-frozen'
         shell: bash
         run: |
           echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
@@ -308,10 +326,10 @@ jobs:
             --env APPSMITH_CLOUD_SERVICES_BASE_URL= \
             --env APPSMITH_CLOUD_SERVICES_USERNAME= \
             --env APPSMITH_CLOUD_SERVICES_PASSWORD= \
-            ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:release
+            ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:release-frozen
 
       - name: Pull master server docker container and start it locally
-        if: github.ref == 'refs/heads/master' || github.event.pull_request.base.ref == 'master'
+        if: github.ref == 'refs/heads/master'
         shell: bash
         run: |
           echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
@@ -322,7 +340,7 @@ jobs:
             --env APPSMITH_ENCRYPTION_PASSWORD=password \
             --env APPSMITH_ENCRYPTION_SALT=salt \
             --env APPSMITH_IS_SELF_HOSTED=false \
-            --env APPSMITH_CLOUD_SERVICES_BASE_URL= \
+            --env APPSMITH_CLOUD_SERVICES_BASE_URL=https://release-cs.appsmith.com \
             --env APPSMITH_CLOUD_SERVICES_USERNAME= \
             --env APPSMITH_CLOUD_SERVICES_PASSWORD= \
             ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:nightly
@@ -426,7 +444,7 @@ jobs:
             if(check.length == 0) {
               const head_sha = pull.head.sha;
               const { data: completed_at } = await github.checks.create({
-                owner: context.repo.owner, 
+                owner: context.repo.owner,
                 repo: context.repo.repo,
                 head_sha: head_sha,
                 name: process.env.job,
@@ -461,45 +479,9 @@ jobs:
       run:
         working-directory: app/client
     # Run this job only if all the previous steps are a success and the reference if the release or master branch
-    if: success() && (github.ref == 'refs/heads/release' || github.ref == 'refs/heads/master')
+    if: success() && (github.ref == 'refs/heads/release' || github.ref == 'refs/heads/release-frozen' || github.ref == 'refs/heads/master')
 
     steps:
-      # Check out merge commit
-      - name: Fork based /ok-to-test checkout
-        uses: actions/checkout@v2
-        with:
-          ref: "refs/pull/${{ github.event.client_payload.pull_request.number }}/merge"
-
-      - name: Download the react build artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: build
-          path: app/client/build
-
-      # Here, the GITHUB_REF is of type /refs/head/<branch_name>. We extract branch_name from this by removing the
-      # first 11 characters. This can be used to build images for several branches
-      - name: Get the version to tag the Docker image
-        id: branch_name
-        run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
-
-      # Build release Docker image and push to Docker Hub
-      - name: Push release image to Docker Hub
-        if: success() && github.ref == 'refs/heads/release' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
-        run: |
-          docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.branch_name.outputs.tag}} .
-          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.branch_name.outputs.tag}}
-
-      # Build master Docker image and push to Docker Hub
-      - name: Push production image to Docker Hub with commit tag
-        if: success() && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
-        run: |
-          docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${GITHUB_SHA} .
-          docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly .
-          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${GITHUB_SHA}
-          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly
-
       # Update check run called "package"
       - name: Mark package job as complete
         uses: actions/github-script@v1
@@ -531,7 +513,7 @@ jobs:
             if(check.length == 0) {
               const head_sha = pull.head.sha;
               const { data: completed_at } = await github.checks.create({
-                owner: context.repo.owner, 
+                owner: context.repo.owner,
                 repo: context.repo.repo,
                 head_sha: head_sha,
                 name: process.env.job,
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index 3ac0df6d93..e4e8110d4e 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
   push:
-    branches: [release, master]
+    branches: [release, release-frozen, master]
     # Only trigger if files have changed in this specific path
     paths:
       - "app/server/**"
@@ -83,6 +83,7 @@ jobs:
       - name: Build and test
         env:
           APPSMITH_MONGODB_URI: "mongodb://localhost:27017/mobtools"
+          APPSMITH_CLOUD_SERVICES_BASE_URL: "https://release-cs.appsmith.com"
           APPSMITH_REDIS_URL: "redis://127.0.0.1:6379"
           APPSMITH_ENCRYPTION_PASSWORD: "password"
           APPSMITH_ENCRYPTION_SALT: "salt"
@@ -102,6 +103,14 @@ jobs:
           echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
           docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}}
 
+      # Build release-frozen Docker image and push to Docker Hub
+      - name: Push release-frozen image to Docker Hub
+        if: success() && github.ref == 'refs/heads/release-frozen'
+        run: |
+          docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}} .
+          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}}
+
       # Build master Docker image and push to Docker Hub
       - name: Push master image to Docker Hub with commit tag
         if: success() && github.ref == 'refs/heads/master'
diff --git a/LICENSE b/LICENSE
index b09cd7856d..572020df3c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2021 Appsmith Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index 2f0080c996..78bb17e222 100644
--- a/README.md
+++ b/README.md
@@ -1,114 +1,128 @@
-<p align="center">
-    <img src="https://github.com/appsmithOrg/appsmith/blob/release/static/appsmith_logo_white.png" alt="Appsmith.com logo" width="400"/>
-    <br>
-    <i> Build and self-host all your internal apps.</i>
-  <br>
-</p>
+<a href="https://app.appsmith.com/signup/?utm_source=github&utm_medium=social&utm_content=website&utm_campaign=null&utm_term=website"><img src="static/images/git-banner.png" width="100%" alt="Appsmith - The Frontend Tool for Any Backend"></a>
 
-<p align="center">
-    <a href="https://app.appsmith.com/signup?utm_source=github&utm_medium=social&utm_content=website&utm_campaign=null&utm_term=website"><strong>Try Online Sandbox</strong></a>
-</p>
-<p align="center">
-  <a href="https://docs.appsmith.com/">Documentation</a>
-  ·
+<h3 align="center">
+  <b><a href="https://app.appsmith.com/signup/?utm_source=github&utm_medium=social&utm_content=website&utm_campaign=null&utm_term=website">Get Started</a></b>
+  •
+  <a href="https://docs.appsmith.com/?utm_source=github&utm_medium=social&utm_content=appsmith_docs&utm_campaign=null&utm_term=appsmith_docs">Docs</a>
+  •
+  <a href="https://community.appsmith.com/">Community</a>
+  •
+  <a href="https://github.com/appsmithorg/appsmith/tree/update/readme#tutorials">Tutorials</a>
+  •
+  <a href="https://app.appsmith.com/applications/602b8aef12ba0d29d3ec151c/pages/602b8aef12ba0d29d3ec151e">Events</a>
+  •
+  <a href="https://www.youtube.com/appsmith">Youtube</a>
+  •
   <a href="https://discord.gg/rBTTVJp">Discord</a>
-  ·
-  <a href="./office_hours.md">Office Hours</a>  
-  <br>
-  <br>
-</p>
+  •
+  <a href="./appsmith_templates.md">Templates</a> 
+  </h3>
 
----
-
-<div>    
-Appsmith is a JavaScript-based visual development platform to build and launch internal tools quickly. Drag-and-drop pre-built widgets, and connect them using JavaScript to create interactive pages. Connect UI to your APIs and Databases to build complex workflows in minutes.<br/><br/>
-
-**UI Components**: Table, Chart, Form, Map, Image, Video, and many more.<br/>
-**API Support**: REST APIs, OAuth 2.0, CURL<br/>
-**Database Support**: PostgreSQL, MongoDB, MySQL, Firestore, S3, Redshift, Elastic Search, DynamoDB, Redis, and MSFT SQL Server<br/>
-**Hosting**: Cloud-hosted & On-premise
-
-Already familiar with Appsmith? [Quickly start building on your own](#%EF%B8%8F-quickstart).
-
-</div>
-
-<img src="https://github.com/appsmithOrg/appsmith/blob/release/static/UI.gif">
 <p align="center">
-  <img src="https://github.com/appsmithOrg/appsmith/blob/release/static/Query2.png" width="270">
-  <img src="https://github.com/appsmithOrg/appsmith/blob/release/static/API2.png" width="270">
-  <img src="https://github.com/appsmithOrg/appsmith/blob/release/static/Share5.png" width="270">
+Turn any datasource into an internal app in minutes. Appsmith lets you drag-and-drop components to build dashboards, write logic with JavaScript objects and connect to any API, database or GraphQL source.
+<br />
+<br>
+<img src="static/images/integrations.png" width="320px">
+<img width="783" alt="MVC-Github-Readme" src="https://user-images.githubusercontent.com/1650391/124094578-d1618480-da50-11eb-839b-c702c2574f15.png">
+
+</p>
+<br>
+
+## Quick Start
+
+The fastest way to start with Appsmith is the cloud-hosted version. When you're ready, you can also host it yourself.
+
+- Start building apps _immediately_ with [Appsmith Cloud](https://app.appsmith.com/signup/?utm_source=github&utm_medium=social&utm_content=website&utm_campaign=null&utm_term=website)
+- Install locally or on a private instance with [Docker](https://docs.appsmith.com/setup/docker?utm_source=github&utm_medium=social&utm_content=appsmith_docs&utm_campaign=null&utm_term=appsmith_docs) _(Recommended)_
+- Deploy on a [Kubernetes](https://docs.appsmith.com/setup/kubernetes?utm_source=github&utm_medium=social&utm_content=appsmith_docs&utm_campaign=null&utm_term=appsmith_docs) cluster
+- Deploy to [AWS with an AMI](https://docs.appsmith.com/setup/aws-ami?utm_source=github&utm_medium=social&utm_content=appsmith_docs&utm_campaign=null&utm_term=appsmith_docs) on the marketplace
+- One-click deploy to [Heroku](https://docs.appsmith.com/setup/heroku?utm_source=github&utm_medium=social&utm_content=appsmith_docs&utm_campaign=null&utm_term=appsmith_docs)
+
+<br><a href="https://www.youtube.com/watch?v=mzqK0QIZRLs" target="_blank"><img src="static/images/build-tool.png" alt="Build an Internal Tool with Appsmith" width="410px" /></a>
+
+## Features
+
+<p>
+  <img src="static/animations/widgets.gif" width="100%">
 </p>
 
-## 🏭 Features
+Use [ready components](https://docs.appsmith.com/widget-reference/button) to build workflows in record time. Drag common elements like tables, charts, forms and more right into your app.
 
-- **5-minute setup**: Deploy Appsmith on your server, or use our cloud version to start building in 5 minutes. [Quick Start](#%EF%B8%8F-quickstart)
-- **Frontend as a service**: Drag-and-drop from pre-built UI widgets like table, form, and image, to build sophisticated **dashboards** and **workflows, without writing HTML/CSS**. Write JavaScript anywhere to transform data, and dynamically control widget-properties.
-- **Database CRUD**: Query & update your database directly by connecting it to the UI. Connect to **PostgreSQL, MongoDB, MySQL & more!**
-- **Trigger APIs**: Connect to REST APIs to build custom apps.
-- **Security**: DB Credentials are AES 256 encrypted and no data is stored by appsmith. Deploy behind your private VPC for additional security!
-- **One-click deployment**: Managed deployment of your apps with a click of a button.
-- **Access-control**: Assign users different roles & control who can edit / view your applications.
-- **Supports OAuth**: Allow users to authenticate via Google Auth or GitHub Auth.
+_Includes text, forms, inputs, buttons, tables, images, charts, checkboxes, switches, radio buttons, datepickers, dropdowns, filepickers, containers, maps, modals, rich text editors, tabs & video._ <br>
 
-## 📺 Demo
+<p>
+  <img src="static/animations/running-api.gif" width="100%">
+</p>
 
-Unsure if Appsmith is for you? [Watch it in action here!](http://bit.ly/appsmith-demo-github)
+Appsmith automagically works using any DB, Rest API or GraphQL as a datasource, with support for OAuth 2.0 and CURL. Here's a list of all our [pre-built integrations](https://docs.appsmith.com/core-concepts/connecting-to-data-sources/connecting-to-databases).
 
-But if you’d rather check out some real applications that can be built with Appsmith, check below:
+_Currently works with PostgreSQL, MongoDB, MySQL, Firestore, S3, Redshift, Elastic Search, DynamoDB, Redis, and MSFT SQL Server._ <br>
 
-- [Customer Support Dashboard](https://bit.ly/cs-dashboard-appsmith)
-- [Job Application Tracker](https://bit.ly/3hbYtTi)
+<p>
+  <img src="static/animations/javascript.gif" width="100%">
+</p>
 
-## 🏃‍♀️ Quickstart
+We'll run JS anywhere! Code interactions between elements, update datasources or manipulate SQL queries—[we'll parse JS anywhere](https://docs.appsmith.com/core-concepts/writing-code).<br>
 
-The following steps introduce you to building a simple user-list dashboard on Appsmith.
+<p>
+  <img src="static/animations/invite.gif" width="100%">
+</p>
 
-1. [Sign up on Appsmith Cloud](https://app.appsmith.com/signup?utm_source=github&utm_medium=social&utm_content=website&utm_campaign=null&utm_term=website) or [Deploy Appsmith](https://docs.appsmith.com/setup).
-2. Create a new app within the organization that has already been created for you.
-3. Click on the `+` icon next to the `Queries` section to add a new query in the mock database
-   1. Name the query `usersQuery`.
-   2. Write the query `select * from users limit 5;`.
-   3. Run the query.
-4. Click on the `+` icon next to the `Widgets` section and drag a table onto the screen
-5. Link the table data property to the `usersQuery` using JavaScript `{{usersQuery.data}}`
-6. Hit the Deploy button and checkout the view mode of the app.
+[Push a button](https://docs.appsmith.com/core-concepts/access-control) to deploy & share apps with your team, or privately invite your team using OAuth 2.0. Each member can be assigned a role with access to certain parts of the app.<br>
 
-Congratulations 🎉 You just built your first app on Appsmith!
-Connect your own data to build apps for your team. [Read more here.](https://docs.appsmith.com/core-concepts)
+#### 🔑 Solid 256-bit Encryption
 
-## 📚 Tutorials
+Appsmith apps are [secure by default](https://docs.appsmith.com/security). All connections are TLS-encrypted, and credentials are encrypted with AES-256—so we can't see any of your data. For added security, try our [self-hosted options](https://docs.appsmith.com/setup).<br><br>
 
-1. [Building an Admin Panel on MongoDB using Appsmith](https://blog.appsmith.com/building-an-admin-panel-with-mongodb-using-appsmith) ([Video](https://www.youtube.com/watch?v=tisUaIgI86k))
-2. [Building a Customer Support Dashboard in Appsmith](https://www.youtube.com/watch?v=-O_6OLREEzo&t=272s)
-3. [Building a Store Catalogue Management System using Appsmith and GraphQL](https://blog.appsmith.com/building-a-store-catalogue-management-system-using-appsmith-and-graphql)
-4. [Running CI/CD Jobs Manually using Appsmith](https://blog.appsmith.com/how-to-run-manual-jobs-in-gitlab-cicd) ([Video](https://www.youtube.com/watch?v=CYdeJcD4I8A))
-5. [Building a Calendly Clone in Appsmith](https://blog.appsmith.com/how-to-build-a-calendly-clone-in-30-minutes)
-6. [Building Internal Tools with Appsmith](https://youtu.be/eYYYfuW-kEE) `Community`
-7. [Building an Issue Tracker with Appsmith](https://dev.to/pjmantoss/how-to-build-an-issue-tracker-with-appsmith-204e) `Community`
+#### 🎙 Transparent Support
 
-## 📕 Support & Troubleshooting
+Issues are inevitable. When you have one, our entire team is around to help—
 
-If you encountered a bug or need help troubleshooting an issue, you can use one of the following channels:
+- 💬 Talk to us on [Discord](https://discord.gg/rBTTVJp)
+- 📄 Find a solution in our [Documentation](https://docs.appsmith.com)
+- ⚠️ Open an issue right here on [GitHub](https://github.com/appsmithorg/appsmith/issues/new/choose)
+- 👾 Ask for help on our [Forum](https://community.appsmith.com)
+- Join our Beta users program and give us feedback <a href = "https://www.notion.so/Betasmith-Join-the-Appsmith-Beta-Community-5c288dfd57bd4c4781c3bf02ddf9aa8a">Betasmith Community</a>. Be a part of the community that will help shape the future of Appsmith.
 
-- Self Help: [Documentation](https://docs.appsmith.com)
-- Community Support: [Discord](https://discord.gg/rBTTVJp)
-- Issue & bug tracking: [GitHub Issues](https://github.com/appsmithorg/appsmith/issues/new/choose)
+## Demos
 
-## 🧑‍🤝‍🧑 Contributing
+Check out some real applications that can be built with Appsmith:
 
-If you're interested in contributing to Appsmith:
+- 👩‍💻 [Customer Support Dashboard](https://app.appsmith.com/applications/5f2aeb2580ca1f6faaed4e4a/pages/5f2d61b580ca1f6faaed4e79/?utm_source=github&utm_medium=direct&utm_content=appsmith_apps&utm_campaign=null&utm_term=appsmith_apps)
+- 🗓️ [Calendly in Appsmith](https://app.appsmith.com/applications/600186605b452f525458d6d2/pages/600186605b452f525458d6d4/?utm_source=github&utm_medium=direct&utm_content=appsmith_apps&utm_campaign=null&utm_term=appsmith_apps)
+- 💸 [Fundraising CRM](https://app.appsmith.com/applications/6098bdc65864501cc39c3d2f/pages/6098bdc65864501cc39c3d31/?utm_source=github&utm_medium=direct&utm_content=appsmith_apps&utm_campaign=null&utm_term=appsmith_apps)
+- 📄 [Application Tracking System App](https://app.appsmith.com/applications/5f43bce13697fd5df1c52ce4/pages/5f43c39c3697fd5df1c52d50/?utm_source=github&utm_medium=direct&utm_content=appsmith_apps&utm_campaign=null&utm_term=appsmith_apps)
 
-1. Start by reading our [Contribution Guide](https://github.com/appsmithorg/appsmith/blob/master/CONTRIBUTING.md).
-2. Learn how to set up your local environment, in our [developer-guide](https://github.com/appsmithorg/appsmith/blob/master/contributions/CodeContributionsGuidelines.md#-setup-for-local-development).
-3. Explore our list of [good first issues](https://github.com/appsmithorg/appsmith/issues?q=is%3Aissue+is%3Aopen+label%3A%22Good+First+Issue%22).
+- 🌟 Made something cool? [Share it with the community](https://discord.gg/Tx395War)
+  <br><br>
 
-We are committed to fostering an open and welcoming environment in the community. Please read our [Code of Conduct](CODE_OF_CONDUCT.md).
+## Tutorials
 
-## 📑 License
+Here are the latest tutorials and videos for you to learn more about Appsmith:
 
-The Appsmith platform is available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) (Apache-2.0).
+1. [Build an Investor CRM using Appsmith on Google Sheets](https://blog.appsmith.com/build-an-investor-crm-using-appsmith-on-google-sheets-1)
+2. [Building an Admin Panel on MongoDB using Appsmith](https://blog.appsmith.com/building-an-admin-panel-with-mongodb-using-appsmith) ([Video](https://www.youtube.com/watch?v=tisUaIgI86k))
+3. [Building a Discount Management Dashboard With Postgres](https://blog.appsmith.com/building-a-discount-management-dashboard-with-postgres)
+4. [Building a Customer Support Dashboard in Appsmith](https://www.youtube.com/watch?v=-O_6OLREEzo)
+5. [Building a Store Catalogue Management System using Appsmith and GraphQL](https://blog.appsmith.com/building-a-store-catalogue-management-system-using-appsmith-and-graphql)
+6. [Using the Notion API to Build a Content Management System](https://blog.appsmith.com/using-the-notion-api-to-build-a-content-management-system)
+7. [How to run manual jobs in Gitlab CI/CD](https://blog.appsmith.com/how-to-run-manual-jobs-in-gitlab-cicd) ([Video](https://www.youtube.com/watch?v=CYdeJcD4I8A))
+8. [Building a Calendly Clone in Appsmith](https://blog.appsmith.com/how-to-build-a-calendly-clone-in-30-minutes)
+9. [Building Internal Tools with Appsmith](https://youtu.be/eYYYfuW-kEE) `Community`
+10. [Building an Issue Tracker with Appsmith](https://dev.to/pjmantoss/how-to-build-an-issue-tracker-with-appsmith-204e) `Community`
 
-## Contributors
+Visit our [blog](https://blog.appsmith.com/) to explore more.
+
+## Contribute
+
+We love our contributors! We're committed to fostering an open and welcoming environment in the community. If you'd like to contribute anything from a bug-fix to a feature update, start here—
+
+- 📖 Read our [Contribution Guide](https://github.com/appsmithorg/appsmith/blob/master/CONTRIBUTING.md)
+- 🧩 [Set up your local environment](https://github.com/appsmithorg/appsmith/blob/master/contributions/CodeContributionsGuidelines.md#-setup-for-local-development)
+- 👾 Explore some [good first issues](https://github.com/appsmithorg/appsmith/issues?q=is%3Aissue+is%3Aopen+label%3A%22Good+First+Issue%22)
+- 📕 Read our [Code of Conduct](CODE_OF_CONDUCT.md)
+
+#### Top Contributors (36)
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove / modify this section -->
 <!-- prettier-ignore-start -->
@@ -161,6 +175,7 @@ The Appsmith platform is available under the [Apache License 2.0](https://www.ap
   </tr>
   <tr>
     <td align="center"><a href="http://www.navdeepsingh.in/"><img src="https://avatars.githubusercontent.com/u/2968787?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Navdeep Singh</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=navdeepsingh" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/aswathkk"><img src="https://avatars.githubusercontent.com/u/10436935?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aswath K</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=aswathkk" title="Code">💻</a></td>
   </tr>
 </table>
 
@@ -168,3 +183,7 @@ The Appsmith platform is available under the [Apache License 2.0](https://www.ap
 <!-- prettier-ignore-end -->
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
+
+## License
+
+Appsmith is available under the [Apache License 2.0](https://github.com/appsmithorg/appsmith/blob/release/LICENSE). Use it wisely.
diff --git a/app.json b/app.json
index d6bf73c26b..1a1fb89536 100644
--- a/app.json
+++ b/app.json
@@ -98,6 +98,21 @@
         "value": "",
         "required": false
       },
+      "APPSMITH_RECAPTCHA_SITE_KEY": {
+        "description" : "Google reCAPTCHA v3 site key, it is required if you wish to enable protection against spam/abusive users. Read more at: https://developers.google.com/recaptcha/docs/v3",
+        "value": "",
+        "required": false
+      },
+      "APPSMITH_RECAPTCHA_SECRET_KEY": {
+        "description" : "Google reCAPTCHA v3 verification secret key, it is required if you wish to enable spam protection in your backend server.",
+        "value": "",
+        "required": false
+      },
+      "APPSMITH_RECAPTCHA_ENABLED": {
+        "description" : "Boolean config to enable or disable Google reCAPTCHA v3 verification feature. If set to true, both site key and secret key should be provided.",
+        "value": "",
+        "required": false
+      },
       "APPSMITH_DISABLE_TELEMETRY": {
         "description" : "We want to be transparent and request that you share anonymous usage data with us. This data is purely statistical in nature and helps us understand your needs & provide better support to your self-hosted instance. You can read more about what information is collected in our documentation https://docs.appsmith.com/v/v1.2.1/setup/telemetry",
         "value": "false"
diff --git a/app/client/.eslintrc.json b/app/client/.eslintrc.json
index fe0ab77466..7cf9b9c110 100644
--- a/app/client/.eslintrc.json
+++ b/app/client/.eslintrc.json
@@ -1,7 +1,7 @@
 // This JSON file configures the eslint plugin. It supports comments as well as per the JSON5 spec
 {
   "parser": "@typescript-eslint/parser",
-  "plugins": ["react", "@typescript-eslint", "prettier", "react-hooks"],
+  "plugins": ["react", "@typescript-eslint", "prettier", "react-hooks","sort-destructure-keys"],
   "extends": [
     "plugin:react/recommended", // Uses the recommended rules from @eslint-plugin-react
     "plugin:@typescript-eslint/recommended",
@@ -34,7 +34,8 @@
     "react/self-closing-comp": "error",
     "react/jsx-sort-props": "error",
     "react/jsx-fragments": "error",
-    "react/jsx-no-useless-fragment": "error"
+    "react/jsx-no-useless-fragment": "error",
+    "sort-destructure-keys/sort-destructure-keys": ["error", {"caseSensitive": false}]
   },
   "settings": {
     "react": {
diff --git a/app/client/README.md b/app/client/README.md
index 2a275ea504..4a5ba02f8e 100755
--- a/app/client/README.md
+++ b/app/client/README.md
@@ -6,4 +6,4 @@
 
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
 
-For details on setting up your development machine, please refer to the [Setup Guide](https://github.com/appsmithorg/appsmith/blob/release/contributions/ClientSetup.md)
+For details on setting up your development machine, please refer to the [Setup Guide](../../contributions/ClientSetup.md)
diff --git a/app/client/build.sh b/app/client/build.sh
index c668865fc0..2f625ec5c4 100755
--- a/app/client/build.sh
+++ b/app/client/build.sh
@@ -6,7 +6,7 @@ GIT_SHA=$(eval git rev-parse HEAD)
 echo $GIT_SHA
 echo "Sentry Auth Token: $SENTRY_AUTH_TOKEN"
 
-REACT_APP_SENTRY_RELEASE=$GIT_SHA EXTEND_ESLINT=true craco --max-old-space-size=4096 build --config craco.build.config.js
+REACT_APP_SENTRY_RELEASE=$GIT_SHA REACT_APP_CLIENT_LOG_LEVEL=ERROR EXTEND_ESLINT=true craco --max-old-space-size=4096 build --config craco.build.config.js
 
 rm ./build/static/js/*.js.map
 echo "build finished"
diff --git a/app/client/cypress.json b/app/client/cypress.json
index 92d8371d5f..6ecfd0080f 100644
--- a/app/client/cypress.json
+++ b/app/client/cypress.json
@@ -4,6 +4,7 @@
   "requestTimeout": 21000,
   "pageLoadTimeout": 20000,
   "video": true,
+  "videoUploadOnPasses": false,
   "reporter": "mochawesome",
   "reporterOptions": {
     "reportDir": "results",
@@ -18,4 +19,4 @@
     "runMode": 2,
     "openMode": 0
   }
-}
\ No newline at end of file
+}
diff --git a/app/client/cypress/fixtures/CanvasResizeDsl.json b/app/client/cypress/fixtures/CanvasResizeDsl.json
index 0ade4a1ac2..f26b52f98f 100644
--- a/app/client/cypress/fixtures/CanvasResizeDsl.json
+++ b/app/client/cypress/fixtures/CanvasResizeDsl.json
@@ -7,7 +7,7 @@
         "detachFromLayout": true,
         "widgetId": "0",
         "topRow": 0,
-        "bottomRow": 2960,
+        "bottomRow": 740,
         "containerStyle": "none",
         "snapRows": 33,
         "parentRowSpace": 1,
diff --git a/app/client/cypress/fixtures/DividerDsl.json b/app/client/cypress/fixtures/DividerDsl.json
new file mode 100644
index 0000000000..36c0065140
--- /dev/null
+++ b/app/client/cypress/fixtures/DividerDsl.json
@@ -0,0 +1,48 @@
+{
+  "dsl": {
+    "widgetName": "MainContainer",
+    "backgroundColor": "none",
+    "rightColumn": 1280,
+    "snapColumns": 64,
+    "detachFromLayout": true,
+    "widgetId": "0",
+    "topRow": 0,
+    "bottomRow": 1300,
+    "containerStyle": "none",
+    "snapRows": 125,
+    "parentRowSpace": 1,
+    "type": "CANVAS_WIDGET",
+    "canExtend": true,
+    "version": 23,
+    "minHeight": 1310,
+    "parentColumnSpace": 1,
+    "dynamicTriggerPathList": [],
+    "dynamicBindingPathList": [],
+    "leftColumn": 0,
+    "children": [
+      {
+        "widgetName": "Divider1",
+        "rightColumn": 23,
+        "widgetId": "i5kplngd19",
+        "topRow": 25,
+        "bottomRow": 75,
+        "parentRowSpace": 10,
+        "isVisible": true,
+        "type": "DIVIDER_WIDGET",
+        "version": 1,
+        "parentId": "0",
+        "isLoading": false,
+        "parentColumnSpace": 19.75,
+        "dynamicTriggerPathList": [],
+        "leftColumn": 15,
+        "dynamicBindingPathList": [],
+        "orientation": "horizontal",
+        "capType": "nc",
+        "capSide": -1,
+        "strokeStyle": "solid",
+        "dividerColor": "black",
+        "thickness": 2
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/Mapdsl.json b/app/client/cypress/fixtures/Mapdsl.json
index 490ab5f87b..2f75e8c860 100644
--- a/app/client/cypress/fixtures/Mapdsl.json
+++ b/app/client/cypress/fixtures/Mapdsl.json
@@ -144,7 +144,7 @@
                 "parentRowSpace": 38,
                 "leftColumn": 3,
                 "rightColumn": 11,
-                "topRow": 0,
+                "topRow": 1,
                 "bottomRow": 12,
                 "parentId": "yt4ouwn0sk",
                 "widgetId": "673etzjyv9",
diff --git a/app/client/cypress/fixtures/application-file.json b/app/client/cypress/fixtures/application-file.json
new file mode 100644
index 0000000000..5a1193ac1d
--- /dev/null
+++ b/app/client/cypress/fixtures/application-file.json
@@ -0,0 +1,174 @@
+{
+    "exportedApplication": {
+        "userPermissions": [
+            "canComment:applications",
+            "manage:applications",
+            "read:applications",
+            "publish:applications",
+            "makePublic:applications"
+        ],
+        "name": "testing app - pk",
+        "isPublic": false,
+        "appIsExample": false,
+        "color": "#FE9F44",
+        "icon": "heart",
+        "new": true
+    },
+    "datasourceList": [],
+    "pageList": [
+        {
+            "userPermissions": [
+                "read:pages",
+                "manage:pages"
+            ],
+            "unpublishedPage": {
+                "name": "Page1",
+                "layouts": [
+                    {
+                        "id": "60a77186cdbfc9440388285c",
+                        "userPermissions": [],
+                        "dsl": {
+                            "widgetName": "MainContainer",
+                            "backgroundColor": "none",
+                            "rightColumn": 1118,
+                            "snapColumns": 16,
+                            "detachFromLayout": true,
+                            "widgetId": "0",
+                            "topRow": 0,
+                            "bottomRow": 1280,
+                            "containerStyle": "none",
+                            "snapRows": 33,
+                            "parentRowSpace": 1,
+                            "type": "CANVAS_WIDGET",
+                            "canExtend": true,
+                            "version": 18,
+                            "minHeight": 1292,
+                            "parentColumnSpace": 1,
+                            "dynamicTriggerPathList": [],
+                            "dynamicBindingPathList": [],
+                            "leftColumn": 0,
+                            "children": [
+                                {
+                                    "widgetName": "Button1",
+                                    "rightColumn": 4,
+                                    "isDefaultClickDisabled": true,
+                                    "widgetId": "g7jf8v3wkq",
+                                    "buttonStyle": "PRIMARY_BUTTON",
+                                    "topRow": 0,
+                                    "bottomRow": 1,
+                                    "parentRowSpace": 40,
+                                    "isVisible": true,
+                                    "type": "BUTTON_WIDGET",
+                                    "version": 1,
+                                    "parentId": "0",
+                                    "isLoading": false,
+                                    "parentColumnSpace": 67.375,
+                                    "leftColumn": 2,
+                                    "text": "Submit",
+                                    "isDisabled": false
+                                },
+                                {
+                                    "widgetName": "Chart1",
+                                    "rightColumn": 8,
+                                    "allowHorizontalScroll": false,
+                                    "widgetId": "ow55pc4z0z",
+                                    "topRow": 5,
+                                    "bottomRow": 13,
+                                    "parentRowSpace": 40,
+                                    "isVisible": true,
+                                    "type": "CHART_WIDGET",
+                                    "version": 1,
+                                    "parentId": "0",
+                                    "isLoading": false,
+                                    "chartData": {
+                                        "pftw37090s": {
+                                            "seriesName": "Sales",
+                                            "data": [
+                                                {
+                                                    "x": "Mon",
+                                                    "y": 10000
+                                                },
+                                                {
+                                                    "x": "Tue",
+                                                    "y": 12000
+                                                },
+                                                {
+                                                    "x": "Wed",
+                                                    "y": 32000
+                                                },
+                                                {
+                                                    "x": "Thu",
+                                                    "y": 28000
+                                                },
+                                                {
+                                                    "x": "Fri",
+                                                    "y": 14000
+                                                },
+                                                {
+                                                    "x": "Sat",
+                                                    "y": 19000
+                                                },
+                                                {
+                                                    "x": "Sun",
+                                                    "y": 36000
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    "yAxisName": "Total Order Revenue $",
+                                    "parentColumnSpace": 67.375,
+                                    "chartName": "Last week's revenue",
+                                    "leftColumn": 2,
+                                    "xAxisName": "Last Week",
+                                    "chartType": "LINE_CHART"
+                                }
+                            ]
+                        },
+                        "layoutOnLoadActions": [],
+                        "new": false
+                    }
+                ],
+                "userPermissions": []
+            },
+            "publishedPage": {
+                "name": "Page1",
+                "layouts": [
+                    {
+                        "id": "60a77186cdbfc9440388285c",
+                        "userPermissions": [],
+                        "dsl": {
+                            "widgetName": "MainContainer",
+                            "backgroundColor": "none",
+                            "rightColumn": 1224,
+                            "snapColumns": 16,
+                            "detachFromLayout": true,
+                            "widgetId": "0",
+                            "topRow": 0,
+                            "bottomRow": 1254,
+                            "containerStyle": "none",
+                            "snapRows": 33,
+                            "parentRowSpace": 1,
+                            "type": "CANVAS_WIDGET",
+                            "canExtend": true,
+                            "version": 4,
+                            "minHeight": 1292,
+                            "parentColumnSpace": 1,
+                            "dynamicBindingPathList": [],
+                            "leftColumn": 0,
+                            "children": []
+                        },
+                        "new": false
+                    }
+                ],
+                "userPermissions": []
+            },
+            "new": true
+        }
+    ],
+    "publishedDefaultPageName": "Page1",
+    "unpublishedDefaultPageName": "Page1",
+    "actionList": [],
+    "decryptedFields": {},
+    "publishedLayoutmongoEscapedWidgets": {},
+    "unpublishedLayoutmongoEscapedWidgets": {}
+}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/basicDsl.json b/app/client/cypress/fixtures/basicDsl.json
new file mode 100644
index 0000000000..a3932623ec
--- /dev/null
+++ b/app/client/cypress/fixtures/basicDsl.json
@@ -0,0 +1 @@
+{"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":966,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":320,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":23,"minHeight":1292,"parentColumnSpace":1,"dynamicBindingPathList":[],"leftColumn":0,"children":[{"isVisible":true,"inputType":"TEXT","label":"","widgetName":"Input1","version":1,"resetOnSubmit":true,"isRequired":false,"isDisabled":false,"type":"INPUT_WIDGET","isLoading":false,"parentColumnSpace":14.84375,"parentRowSpace":10,"leftColumn":23,"rightColumn":43,"topRow":8,"bottomRow":12,"parentId":"0","widgetId":"ihviqc47ev"}],"dynamicTriggerPathList":[]}}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/chartUpdatedDsl.json b/app/client/cypress/fixtures/chartUpdatedDsl.json
new file mode 100644
index 0000000000..20a57d6a5c
--- /dev/null
+++ b/app/client/cypress/fixtures/chartUpdatedDsl.json
@@ -0,0 +1,184 @@
+{
+    "dsl": {
+        "widgetName": "MainContainer",
+        "backgroundColor": "none",
+        "rightColumn": 966,
+        "snapColumns": 64,
+        "detachFromLayout": true,
+        "widgetId": "0",
+        "topRow": 0,
+        "bottomRow": 5168,
+        "containerStyle": "none",
+        "snapRows": 129,
+        "parentRowSpace": 1,
+        "type": "CANVAS_WIDGET",
+        "canExtend": true,
+        "version": 20,
+        "minHeight": 450,
+        "parentColumnSpace": 1,
+        "dynamicBindingPathList": [],
+        "leftColumn": 0,
+        "children": [
+            {
+                "backgroundColor": "#FFFFFF",
+                "widgetName": "Container1",
+                "rightColumn": 32,
+                "orientation": "VERTICAL",
+                "snapColumns": 16,
+                "widgetId": "mxbaasg65u",
+                "containerStyle": "card",
+                "topRow": 0,
+                "bottomRow": 36,
+                "parentRowSpace": 38,
+                "isVisible": true,
+                "type": "CONTAINER_WIDGET",
+                "version": 1,
+                "isLoading": false,
+                "parentColumnSpace": 75.25,
+                "dynamicBindingPathList": [],
+                "leftColumn": 0,
+                "children": [
+                    {
+                        "backgroundColor": "transparent",
+                        "widgetName": "59gdivzv7s",
+                        "rightColumn": 2408,
+                        "orientation": "VERTICAL",
+                        "snapColumns": 16,
+                        "detachFromLayout": true,
+                        "widgetId": "bxekwxgc1i",
+                        "containerStyle": "none",
+                        "topRow": 0,
+                        "bottomRow": 20,
+                        "parentRowSpace": 1,
+                        "isVisible": true,
+                        "type": "CANVAS_WIDGET",
+                        "canExtend": false,
+                        "version": 1,
+                        "isLoading": false,
+                        "parentColumnSpace": 1,
+                        "leftColumn": 0,
+                        "dynamicBindingPathList": [],
+                        "children": []
+                    }
+                ]
+            },
+            {
+                "backgroundColor": "#FFFFFF",
+                "widgetName": "Container3",
+                "rightColumn": 64,
+                "orientation": "VERTICAL",
+                "snapColumns": 16,
+                "widgetId": "i331vll2mg",
+                "containerStyle": "card",
+                "topRow": 36,
+                "bottomRow": 92,
+                "parentRowSpace": 38,
+                "isVisible": true,
+                "type": "CONTAINER_WIDGET",
+                "version": 1,
+                "isLoading": false,
+                "parentColumnSpace": 75.25,
+                "dynamicBindingPathList": [],
+                "leftColumn": 0,
+                "children": [
+                    {
+                        "backgroundColor": "transparent",
+                        "widgetName": "rhfg2vf1n5",
+                        "rightColumn": 4816,
+                        "orientation": "VERTICAL",
+                        "snapColumns": 16,
+                        "detachFromLayout": true,
+                        "widgetId": "rglduihhzk",
+                        "containerStyle": "none",
+                        "topRow": 0,
+                        "bottomRow": 20,
+                        "parentRowSpace": 1,
+                        "isVisible": true,
+                        "type": "CANVAS_WIDGET",
+                        "canExtend": false,
+                        "version": 1,
+                        "isLoading": false,
+                        "parentColumnSpace": 1,
+                        "leftColumn": 0,
+                        "dynamicBindingPathList": [],
+                        "children": [
+                            {
+                                "isVisible": true,
+                                "widgetName": "Chart1",
+                                "chartType": "LINE_CHART",
+                                "chartName": "Last week's revenue",
+                                "allowHorizontalScroll": false,
+                                "version": 1,
+                                "chartData": {
+                                    "q4pm3w97mo": {
+                                        "seriesName": "Sales",
+                                        "data": ""
+                                    }
+                                },
+                                "xAxisName": "Last Week",
+                                "yAxisName": "Total Order Revenue $",
+                                "type": "CHART_WIDGET",
+                                "isLoading": false,
+                                "parentColumnSpace": 14.59375,
+                                "parentRowSpace": 10,
+                                "leftColumn": 20,
+                                "rightColumn": 44,
+                                "topRow": 16,
+                                "bottomRow": 48,
+                                "parentId": "rglduihhzk",
+                                "widgetId": "snzfh3qjo8",
+                                "dynamicBindingPathList": [],
+                                "dynamicTriggerPathList": []
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "backgroundColor": "#FFFFFF",
+                "widgetName": "Container4",
+                "rightColumn": 64,
+                "orientation": "VERTICAL",
+                "snapColumns": 16,
+                "widgetId": "qznzsquf70",
+                "containerStyle": "card",
+                "topRow": 0,
+                "bottomRow": 36,
+                "parentRowSpace": 38,
+                "isVisible": true,
+                "type": "CONTAINER_WIDGET",
+                "version": 1,
+                "isLoading": false,
+                "parentColumnSpace": 75.25,
+                "dynamicBindingPathList": [],
+                "leftColumn": 32,
+                "children": [
+                    {
+                        "backgroundColor": "transparent",
+                        "widgetName": "3bn6uv0vy4",
+                        "rightColumn": 2408,
+                        "orientation": "VERTICAL",
+                        "snapColumns": 16,
+                        "detachFromLayout": true,
+                        "widgetId": "7vm5mdu8ey",
+                        "containerStyle": "none",
+                        "topRow": 0,
+                        "bottomRow": 1368,
+                        "parentRowSpace": 1,
+                        "isVisible": true,
+                        "type": "CANVAS_WIDGET",
+                        "canExtend": false,
+                        "version": 1,
+                        "isLoading": false,
+                        "parentColumnSpace": 1,
+                        "leftColumn": 0,
+                        "dynamicBindingPathList": [],
+                        "children": [
+                            null
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/debuggerDependencyDsl.json b/app/client/cypress/fixtures/debuggerDependencyDsl.json
new file mode 100644
index 0000000000..d023180e24
--- /dev/null
+++ b/app/client/cypress/fixtures/debuggerDependencyDsl.json
@@ -0,0 +1,58 @@
+{
+    "dsl": {
+      "widgetName": "MainContainer",
+      "backgroundColor": "none",
+      "rightColumn": 1224,
+      "snapColumns": 16,
+      "detachFromLayout": true,
+      "widgetId": "0",
+      "topRow": 0,
+      "bottomRow": 1280,
+      "containerStyle": "none",
+      "snapRows": 33,
+      "parentRowSpace": 1,
+      "type": "CANVAS_WIDGET",
+      "canExtend": true,
+      "version": 9,
+      "minHeight": 1292,
+      "parentColumnSpace": 1,
+      "dynamicBindingPathList": [],
+      "leftColumn": 0,
+      "children": [
+        {
+            "isVisible": true,
+            "text": "Submit",
+            "buttonStyle": "PRIMARY_BUTTON",
+            "widgetName": "Button1",
+            "isDisabled": false,
+            "isDefaultClickDisabled": true,
+            "type": "BUTTON_WIDGET",
+            "isLoading": false,
+            "parentColumnSpace": 74,
+            "parentRowSpace": 40,
+            "leftColumn": 5,
+            "rightColumn": 7,
+            "topRow": 2,
+            "bottomRow": 3,
+            "parentId": "0",
+            "widgetId": "3qg87le9t4"
+        },
+        {
+            "isVisible": true,
+            "inputType": "TEXT",
+            "label": "",
+            "widgetName": "Input1",
+            "type": "INPUT_WIDGET",
+            "isLoading": false,
+            "parentColumnSpace": 74,
+            "parentRowSpace": 40,
+            "leftColumn": 2,
+            "rightColumn": 7,
+            "topRow": 0,
+            "bottomRow": 1,
+            "parentId": "0",
+            "widgetId": "2lhsjdd5sg"
+        }
+      ]
+    }
+  }
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/debuggerTableDsl.json b/app/client/cypress/fixtures/debuggerTableDsl.json
new file mode 100644
index 0000000000..afaed3b2cf
--- /dev/null
+++ b/app/client/cypress/fixtures/debuggerTableDsl.json
@@ -0,0 +1,42 @@
+{
+    "dsl": {
+      "widgetName": "MainContainer",
+      "backgroundColor": "none",
+      "rightColumn": 1224,
+      "snapColumns": 16,
+      "detachFromLayout": true,
+      "widgetId": "0",
+      "topRow": 0,
+      "bottomRow": 1280,
+      "containerStyle": "none",
+      "snapRows": 33,
+      "parentRowSpace": 1,
+      "type": "CANVAS_WIDGET",
+      "canExtend": true,
+      "version": 9,
+      "minHeight": 1292,
+      "parentColumnSpace": 1,
+      "dynamicBindingPathList": [],
+      "leftColumn": 0,
+      "children": [
+        {
+          "isVisible": true,
+          "label": "Data",
+          "widgetName": "Table1",
+          "searchKey": "",
+          "tableData": "{{TestApi.data.users}}",
+          "type": "TABLE_WIDGET",
+          "isLoading": false,
+          "parentColumnSpace": 74,
+          "parentRowSpace": 40,
+          "leftColumn": 1,
+          "rightColumn": 9,
+          "topRow": 7,
+          "bottomRow": 14,
+          "parentId": "0",
+          "widgetId": "7miqot30xy",
+          "dynamicBindingPathList": []
+        }
+      ]
+    }
+  }
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/displayWidgetDsl.json b/app/client/cypress/fixtures/displayWidgetDsl.json
index 01da343433..e2fbfa257b 100644
--- a/app/client/cypress/fixtures/displayWidgetDsl.json
+++ b/app/client/cypress/fixtures/displayWidgetDsl.json
@@ -14,7 +14,6 @@
        "type": "CANVAS_WIDGET",
        "canExtend": true,
        "dynamicBindingPathList": [],
-       "version": 4,
        "minHeight": 1292,
        "parentColumnSpace": 1,
        "leftColumn": 0,
diff --git a/app/client/cypress/fixtures/example.json b/app/client/cypress/fixtures/example.json
index 26d6dd6c75..053ecc28a5 100644
--- a/app/client/cypress/fixtures/example.json
+++ b/app/client/cypress/fixtures/example.json
@@ -201,50 +201,60 @@
       "orderAmount": 9.99
     }
   ],
-  "ChartCustomConfig": {"type": "area2d",
-    "dataSource": {
-      "chart": {
-        "caption": "Countries With Most Oil Reserves [2017-18]",
-        "subCaption": "In MMbbl = One Million barrels",
-        "xAxisName": "Country",
-        "yAxisName": "Reserves (MMbbl)",
-        "numberSuffix": "K"
-      },
-      "data": [
-        {
-          "label": "Venezuela",
-          "value": "290"
-        },
-        {
-          "label": "Saudi",
-          "value": "260"
-        },
-        {
-          "label": "Canada",
-          "value": "180"
-        },
-        {
-          "label": "Iran",
-          "value": "140"
-        },
-        {
-          "label": "Russia",
-          "value": "115"
-        },
-        {
-          "label": "UAE",
-          "value": "100"
-        },
-        {
-          "label": "US",
-          "value": "30"
-        },
-        {
-          "label": "China",
-          "value": "30"
-        }
-      ]
-    }},
+  "ChartCustomConfig": {
+      "type":"column2d",
+      "dataSource":{
+          "chart":{
+            "caption":"Monthly revenue for last year",
+            "subCaption":"Harry's SuperMart",
+            "xAxisName":"Month",
+            "yAxisName":"Revenues (In USD)",
+            "numberPrefix":"$",
+            "theme":"fusion"
+          },
+          "data":[
+            {
+                "label":"Jan",
+                "value":"420000"
+            },
+            {
+                "label":"Feb",
+                "value":"810000"
+            },
+            {
+                "label":"Mar",
+                "value":"720000"
+            },
+            {
+                "label":"Apr",
+                "value":"550000"
+            },
+            {
+                "label":"May",
+                "value":"910000"
+            },
+            {
+                "label":"Jun",
+                "value":"256000"
+            },
+            {
+                "label":"Jul",
+                "value":"512000"
+            }
+          ],
+          "trendlines":[
+            {
+                "line":[
+                  {
+                      "startvalue":"700000",
+                      "valueOnRight":"1",
+                      "displayvalue":"Monthly Target"
+                  }
+                ]
+            }
+          ]
+      }
+    },
   "TableInputWithNull": [
     {
       "id": 2381224,
diff --git a/app/client/cypress/fixtures/formInputTableDsl.json b/app/client/cypress/fixtures/formInputTableDsl.json
index 1c731ed338..71eba21877 100644
--- a/app/client/cypress/fixtures/formInputTableDsl.json
+++ b/app/client/cypress/fixtures/formInputTableDsl.json
@@ -110,7 +110,9 @@
                 "topRow": 3,
                 "bottomRow": 4,
                 "parentId": "4lvpg75cy5",
-                "widgetId": "vwe9oyg9x1"
+                "widgetId": "vwe9oyg9x1",
+                "defaultText": "{{Input1.text}}",
+                "dynamicBindingPathList": [{"key": "defaultText"}]
               }
             ],
             "blueprint": {
diff --git a/app/client/cypress/fixtures/formdsl.json b/app/client/cypress/fixtures/formdsl.json
index 866f2a0255..f8859c48a5 100644
--- a/app/client/cypress/fixtures/formdsl.json
+++ b/app/client/cypress/fixtures/formdsl.json
@@ -199,7 +199,7 @@
                   "backgroundColor": "Gray",
                   "rightColumn": 11,
                   "widgetId": "z62mnh15y5",
-                  "topRow": 0,
+                  "topRow": 1,
                   "bottomRow": 13,
                   "parentRowSpace": 38,
                   "isVisible": true,
diff --git a/app/client/cypress/fixtures/listdsl.json b/app/client/cypress/fixtures/listdsl.json
index 25c0fb517a..e0aab6c6ec 100644
--- a/app/client/cypress/fixtures/listdsl.json
+++ b/app/client/cypress/fixtures/listdsl.json
@@ -13,7 +13,7 @@
     "parentRowSpace": 1,
     "type": "CANVAS_WIDGET",
     "canExtend": true,
-    "version": 9,
+    "version": 23,
     "minHeight": 1292,
     "parentColumnSpace": 1,
     "dynamicBindingPathList": [],
@@ -25,7 +25,7 @@
         "backgroundColor": "",
         "gridType": "vertical",
         "gridGap": 0,
-        "items": "[\n  {\n    \"id\": 1,\n    \"email\": \"michael.lawson@reqres.in\",\n    \"first_name\": \"Michael\",\n    \"last_name\": \"Lawson\",\n    \"avatar\": \"https://reqres.in/img/faces/7-image.jpg\"\n  },\n  {\n    \"id\": 2,\n    \"email\": \"lindsay.ferguson@reqres.in\",\n    \"first_name\": \"Lindsay\",\n    \"last_name\": \"Ferguson\",\n    \"avatar\": \"https://reqres.in/img/faces/8-image.jpg\"\n  },\n {\n    \"id\": 3,\n    \"email\": \"brock.lesnar@reqres.in\",\n    \"first_name\": \"Brock\",\n    \"last_name\": \"Lesnar\",\n    \"avatar\": \"https://reqres.in/img/faces/8-image.jpg\"\n  }\n]",
+        "listData": "[\n  {\n    \"id\": 1,\n    \"email\": \"michael.lawson@reqres.in\",\n    \"first_name\": \"Michael\",\n    \"last_name\": \"Lawson\",\n    \"avatar\": \"https://reqres.in/img/faces/7-image.jpg\"\n  },\n  {\n    \"id\": 2,\n    \"email\": \"lindsay.ferguson@reqres.in\",\n    \"first_name\": \"Lindsay\",\n    \"last_name\": \"Ferguson\",\n    \"avatar\": \"https://reqres.in/img/faces/8-image.jpg\"\n  },\n {\n    \"id\": 3,\n    \"email\": \"brock.lesnar@reqres.in\",\n    \"first_name\": \"Brock\",\n    \"last_name\": \"Lesnar\",\n    \"avatar\": \"https://reqres.in/img/faces/8-image.jpg\"\n  }\n]",
         "widgetName": "List1",
         "children": [
           {
@@ -60,9 +60,9 @@
                         "parentColumnSpace": 32,
                         "parentRowSpace": 40,
                         "leftColumn": 2,
-                        "rightColumn": 6,
+                        "rightColumn": 24,
                         "topRow": 0,
-                        "bottomRow": 1,
+                        "bottomRow": 16,
                         "parentId": "dinv2tsatk",
                         "widgetId": "k6ct7dxg4w"
                       },
@@ -73,15 +73,15 @@
                         "widgetName":"Button1",
                         "isDisabled":false,
                         "isDefaultClickDisabled":true,
-                        "version":1,
+                        "version":26,
                         "type":"BUTTON_WIDGET",
                         "isLoading":false,
                         "parentColumnSpace":29.25,
                         "parentRowSpace":40,
-                        "leftColumn":6,
-                        "rightColumn":8,
+                        "leftColumn":24,
+                        "rightColumn": 32,
                         "topRow":1,
-                        "bottomRow":2,
+                        "bottomRow":8,
                         "parentId":"dinv2tsatk",
                         "widgetId":"fuw9p7cuek"
                      }
@@ -105,9 +105,9 @@
                 "type": "CONTAINER_WIDGET",
                 "isLoading": false,
                 "leftColumn": 0,
-                "rightColumn": 16,
+                "rightColumn": 64,
                 "topRow": 0,
-                "bottomRow": 4,
+                "bottomRow": 16,
                 "parentId": "0pvmmqr77m",
                 "widgetId": "4ruj7xl5ri"
               }
@@ -130,9 +130,9 @@
         "parentColumnSpace": 74,
         "parentRowSpace": 40,
         "leftColumn": 0,
-        "rightColumn": 8,
+        "rightColumn": 32,
         "topRow": 0,
-        "bottomRow": 10,
+        "bottomRow": 40,
         "parentId": "0",
         "widgetId": "5bwz8xcvhj",
         "dynamicBindingPathList": [],
diff --git a/app/client/cypress/fixtures/listwidgetdsl.json b/app/client/cypress/fixtures/listwidgetdsl.json
new file mode 100644
index 0000000000..5415a2211c
--- /dev/null
+++ b/app/client/cypress/fixtures/listwidgetdsl.json
@@ -0,0 +1,275 @@
+{
+    "dsl": {
+        "widgetName": "MainContainer",
+        "backgroundColor": "none",
+        "rightColumn": 966,
+        "snapColumns": 16,
+        "detachFromLayout": true,
+        "widgetId": "0",
+        "topRow": 0,
+        "bottomRow": 800,
+        "containerStyle": "none",
+        "snapRows": 33,
+        "parentRowSpace": 1,
+        "type": "CANVAS_WIDGET",
+        "canExtend": true,
+        "version": 18,
+        "minHeight": 240,
+        "parentColumnSpace": 1,
+        "dynamicTriggerPathList": [],
+        "dynamicBindingPathList": [],
+        "leftColumn": 0,
+        "children": [
+            {
+                "isVisible": true,
+                "backgroundColor": "",
+                "itemBackgroundColor": "white",
+                "gridType": "vertical",
+                "enhancements": true,
+                "gridGap": 0,
+                "listData": "",
+                "widgetName": "List1",
+                "children": [
+                    {
+                        "isVisible": true,
+                        "widgetName": "Canvas1",
+                        "version": 1,
+                        "containerStyle": "none",
+                        "canExtend": false,
+                        "detachFromLayout": true,
+                        "dropDisabled": true,
+                        "noPad": true,
+                        "children": [
+                            {
+                                "isVisible": true,
+                                "backgroundColor": "white",
+                                "widgetName": "Container1",
+                                "containerStyle": "card",
+                                "children": [
+                                    {
+                                        "isVisible": true,
+                                        "widgetName": "Canvas2",
+                                        "version": 1,
+                                        "containerStyle": "none",
+                                        "canExtend": false,
+                                        "detachFromLayout": true,
+                                        "children": [
+                                            {
+                                                "isVisible": true,
+                                                "defaultImage": "https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png",
+                                                "imageShape": "RECTANGLE",
+                                                "maxZoomLevel": 1,
+                                                "image": "{{currentItem.img}}",
+                                                "widgetName": "Image1",
+                                                "version": 1,
+                                                "dynamicBindingPathList": [
+                                                    {
+                                                        "key": "image"
+                                                    }
+                                                ],
+                                                "dynamicTriggerPathList": [],
+                                                "type": "IMAGE_WIDGET",
+                                                "isLoading": false,
+                                                "leftColumn": 0,
+                                                "rightColumn": 4,
+                                                "topRow": 0,
+                                                "bottomRow": 3,
+                                                "parentId": "muh6tmsm1f",
+                                                "widgetId": "vr29m4code"
+                                            },
+                                            {
+                                                "isVisible": true,
+                                                "text": "{{currentItem.name}}",
+                                                "fontSize": "PARAGRAPH",
+                                                "fontStyle": "BOLD",
+                                                "textAlign": "LEFT",
+                                                "textColor": "#231F20",
+                                                "widgetName": "Text1",
+                                                "version": 1,
+                                                "textStyle": "HEADING",
+                                                "dynamicBindingPathList": [
+                                                    {
+                                                        "key": "text"
+                                                    }
+                                                ],
+                                                "dynamicTriggerPathList": [],
+                                                "type": "TEXT_WIDGET",
+                                                "isLoading": false,
+                                                "leftColumn": 4,
+                                                "rightColumn": 10,
+                                                "topRow": 0,
+                                                "bottomRow": 1,
+                                                "parentId": "muh6tmsm1f",
+                                                "widgetId": "envgv9f2j9"
+                                            },
+                                            {
+                                                "isVisible": true,
+                                                "text": "{{currentItem.num}}",
+                                                "fontSize": "PARAGRAPH",
+                                                "fontStyle": "BOLD",
+                                                "textAlign": "LEFT",
+                                                "textColor": "#231F20",
+                                                "widgetName": "Text2",
+                                                "version": 1,
+                                                "textStyle": "BODY",
+                                                "dynamicBindingPathList": [
+                                                    {
+                                                        "key": "text"
+                                                    }
+                                                ],
+                                                "dynamicTriggerPathList": [],
+                                                "type": "TEXT_WIDGET",
+                                                "isLoading": false,
+                                                "leftColumn": 4,
+                                                "rightColumn": 10,
+                                                "topRow": 1,
+                                                "bottomRow": 2,
+                                                "parentId": "muh6tmsm1f",
+                                                "widgetId": "37xbmi0bbz"
+                                            }
+                                        ],
+                                        "minHeight": null,
+                                        "type": "CANVAS_WIDGET",
+                                        "isLoading": false,
+                                        "parentColumnSpace": 1,
+                                        "parentRowSpace": 1,
+                                        "leftColumn": 0,
+                                        "rightColumn": null,
+                                        "topRow": 0,
+                                        "bottomRow": null,
+                                        "parentId": "5q9jzp3d17",
+                                        "widgetId": "muh6tmsm1f"
+                                    }
+                                ],
+                                "version": 1,
+                                "dragDisabled": true,
+                                "isDeletable": false,
+                                "disallowCopy": true,
+                                "disablePropertyPane": true,
+                                "type": "CONTAINER_WIDGET",
+                                "isLoading": false,
+                                "leftColumn": 0,
+                                "rightColumn": 16,
+                                "topRow": 0,
+                                "bottomRow": 4,
+                                "parentId": "qt3cziyljx",
+                                "widgetId": "5q9jzp3d17"
+                            }
+                        ],
+                        "minHeight": 400,
+                        "type": "CANVAS_WIDGET",
+                        "isLoading": false,
+                        "parentColumnSpace": 1,
+                        "parentRowSpace": 1,
+                        "leftColumn": 0,
+                        "rightColumn": 463,
+                        "topRow": 0,
+                        "bottomRow": 400,
+                        "parentId": "wmuvmnfqm0",
+                        "widgetId": "qt3cziyljx"
+                    }
+                ],
+                "type": "LIST_WIDGET",
+                "isLoading": false,
+                "parentColumnSpace": 57.875,
+                "parentRowSpace": 40,
+                "leftColumn": 4,
+                "rightColumn": 12,
+                "topRow": 8,
+                "bottomRow": 18,
+                "parentId": "0",
+                "widgetId": "wmuvmnfqm0",
+                "dynamicBindingPathList": [
+                    {
+                        "key": "template.Image1.image"
+                    },
+                    {
+                        "key": "template.Text1.text"
+                    },
+                    {
+                        "key": "template.Text2.text"
+                    }
+                ],
+                "template": {
+                    "Image1": {
+                        "isVisible": true,
+                        "defaultImage": "https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png",
+                        "imageShape": "RECTANGLE",
+                        "maxZoomLevel": 1,
+                        "image": "{{List1.listData.map((currentItem) => currentItem.img)}}",
+                        "widgetName": "Image1",
+                        "version": 1,
+                        "dynamicBindingPathList": [
+                            {
+                                "key": "image"
+                            }
+                        ],
+                        "dynamicTriggerPathList": [],
+                        "type": "IMAGE_WIDGET",
+                        "isLoading": false,
+                        "leftColumn": 0,
+                        "rightColumn": 4,
+                        "topRow": 0,
+                        "bottomRow": 3,
+                        "parentId": "muh6tmsm1f",
+                        "widgetId": "vr29m4code"
+                    },
+                    "Text1": {
+                        "isVisible": true,
+                        "text": "{{List1.listData.map((currentItem) => currentItem.name)}}",
+                        "fontSize": "PARAGRAPH",
+                        "fontStyle": "BOLD",
+                        "textAlign": "LEFT",
+                        "textColor": "#231F20",
+                        "widgetName": "Text1",
+                        "version": 1,
+                        "textStyle": "HEADING",
+                        "dynamicBindingPathList": [
+                            {
+                                "key": "text"
+                            }
+                        ],
+                        "dynamicTriggerPathList": [],
+                        "type": "TEXT_WIDGET",
+                        "isLoading": false,
+                        "leftColumn": 4,
+                        "rightColumn": 10,
+                        "topRow": 0,
+                        "bottomRow": 1,
+                        "parentId": "muh6tmsm1f",
+                        "widgetId": "envgv9f2j9"
+                    },
+                    "Text2": {
+                        "isVisible": true,
+                        "text": "{{List1.listData.map((currentItem) => currentItem.num)}}",
+                        "fontSize": "PARAGRAPH",
+                        "fontStyle": "BOLD",
+                        "textAlign": "LEFT",
+                        "textColor": "#231F20",
+                        "widgetName": "Text2",
+                        "version": 1,
+                        "textStyle": "BODY",
+                        "dynamicBindingPathList": [
+                            {
+                                "key": "text"
+                            }
+                        ],
+                        "dynamicTriggerPathList": [],
+                        "type": "TEXT_WIDGET",
+                        "isLoading": false,
+                        "leftColumn": 4,
+                        "rightColumn": 10,
+                        "topRow": 1,
+                        "bottomRow": 2,
+                        "parentId": "muh6tmsm1f",
+                        "widgetId": "37xbmi0bbz"
+                    }
+                },
+                "childAutoComplete": {
+                    "currentItem": {}
+                },
+                "dynamicTriggerPathList": []
+            }
+        ]
+    }
+}
diff --git a/app/client/cypress/fixtures/tableResizedColumnsDsl.json b/app/client/cypress/fixtures/tableResizedColumnsDsl.json
new file mode 100644
index 0000000000..85ea1b6a2a
--- /dev/null
+++ b/app/client/cypress/fixtures/tableResizedColumnsDsl.json
@@ -0,0 +1,505 @@
+{
+  "dsl": {
+    "widgetName": "MainContainer",
+    "backgroundColor": "none",
+    "rightColumn": 1280,
+    "snapColumns": 64,
+    "detachFromLayout": true,
+    "widgetId": "0",
+    "topRow": 0,
+    "bottomRow": 1310,
+    "containerStyle": "none",
+    "snapRows": 125,
+    "parentRowSpace": 1,
+    "type": "CANVAS_WIDGET",
+    "canExtend": true,
+    "version": 23,
+    "minHeight": 1320,
+    "parentColumnSpace": 1,
+    "dynamicTriggerPathList": [],
+    "dynamicBindingPathList": [],
+    "leftColumn": 0,
+    "children": [
+      {
+        "backgroundColor": "#ffffff",
+        "widgetName": "Container1",
+        "rightColumn": 64,
+        "widgetId": "sc2tsag5jw",
+        "containerStyle": "card",
+        "topRow": 0,
+        "bottomRow": 6,
+        "parentRowSpace": 10,
+        "isVisible": true,
+        "type": "CONTAINER_WIDGET",
+        "version": 1,
+        "parentId": "0",
+        "isLoading": false,
+        "parentColumnSpace": 16.432031249999998,
+        "dynamicTriggerPathList": [],
+        "leftColumn": 0,
+        "dynamicBindingPathList": [],
+        "children": [
+          {
+            "widgetName": "Canvas1",
+            "rightColumn": 525.8249999999999,
+            "detachFromLayout": true,
+            "widgetId": "v615d41hf1",
+            "containerStyle": "none",
+            "topRow": 0,
+            "bottomRow": 400,
+            "parentRowSpace": 1,
+            "isVisible": true,
+            "canExtend": false,
+            "type": "CANVAS_WIDGET",
+            "version": 1,
+            "parentId": "sc2tsag5jw",
+            "minHeight": 400,
+            "isLoading": false,
+            "parentColumnSpace": 1,
+            "leftColumn": 0,
+            "children": []
+          }
+        ]
+      },
+      {
+        "image": "https://source.unsplash.com/mGFHA_0TWnA/2048x620",
+        "widgetName": "Image1",
+        "rightColumn": 64,
+        "widgetId": "ah4cbb9o2e",
+        "topRow": 6,
+        "bottomRow": 39,
+        "parentRowSpace": 10,
+        "isVisible": true,
+        "type": "IMAGE_WIDGET",
+        "version": 1,
+        "parentId": "0",
+        "isLoading": false,
+        "maxZoomLevel": 1,
+        "parentColumnSpace": 16.432031249999998,
+        "dynamicTriggerPathList": [],
+        "imageShape": "RECTANGLE",
+        "leftColumn": 0,
+        "dynamicBindingPathList": [],
+        "defaultImage": "https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"
+      },
+      {
+        "backgroundColor": "#FFFFFF",
+        "widgetName": "Container2",
+        "rightColumn": 64,
+        "widgetId": "0oh55q30ji",
+        "containerStyle": "card",
+        "topRow": 39,
+        "bottomRow": 85,
+        "parentRowSpace": 10,
+        "isVisible": true,
+        "type": "CONTAINER_WIDGET",
+        "version": 1,
+        "parentId": "0",
+        "isLoading": false,
+        "shouldScrollContents": false,
+        "parentColumnSpace": 16.432031249999998,
+        "dynamicTriggerPathList": [],
+        "leftColumn": 0,
+        "dynamicBindingPathList": [],
+        "children": [
+          {
+            "widgetName": "Canvas2",
+            "rightColumn": 525.8249999999999,
+            "detachFromLayout": true,
+            "widgetId": "9kax26wjp6",
+            "containerStyle": "none",
+            "topRow": 0,
+            "bottomRow": 460,
+            "parentRowSpace": 1,
+            "isVisible": true,
+            "canExtend": false,
+            "type": "CANVAS_WIDGET",
+            "version": 1,
+            "parentId": "0oh55q30ji",
+            "minHeight": 400,
+            "isLoading": false,
+            "parentColumnSpace": 1,
+            "dynamicTriggerPathList": [],
+            "leftColumn": 0,
+            "dynamicBindingPathList": [],
+            "children": [
+              {
+                "widgetName": "Table2",
+                "columnOrder": [
+                  "data",
+                  "customColumn3",
+                  "customColumn4",
+                  "customColumn5",
+                  "customColumn6",
+                  "page_id",
+                  "customColumn2",
+                  "customColumn7",
+                  "customColumn8"
+                ],
+                "dynamicPropertyPathList": [],
+                "topRow": 4,
+                "bottomRow": 44,
+                "parentRowSpace": 10,
+                "type": "TABLE_WIDGET",
+                "parentColumnSpace": 16.182031249999998,
+                "dynamicTriggerPathList": [
+                  {
+                    "key": "primaryColumns.customColumn2.onClick"
+                  }
+                ],
+                "dynamicBindingPathList": [
+                  {
+                    "key": "tableData"
+                  },
+                  {
+                    "key": "primaryColumns.data.computedValue"
+                  },
+                  {
+                    "key": "primaryColumns.page_id.computedValue"
+                  },
+                  {
+                    "key": "primaryColumns.customColumn3.computedValue"
+                  },
+                  {
+                    "key": "primaryColumns.customColumn4.computedValue"
+                  },
+                  {
+                    "key": "primaryColumns.customColumn5.computedValue"
+                  },
+                  {
+                    "key": "primaryColumns.customColumn6.computedValue"
+                  },
+                  {
+                    "key": "primaryColumns.customColumn7.computedValue"
+                  },
+                  {
+                    "key": "primaryColumns.customColumn8.computedValue"
+                  },
+                  {
+                    "key": "primaryColumns.customColumn2.buttonLabel"
+                  }
+                ],
+                "leftColumn": 0,
+                "primaryColumns": {
+                  "customColumn7": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.author?.email})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 8,
+                    "isVisible": true,
+                    "label": "Author",
+                    "columnType": "text",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn7",
+                    "buttonLabelColor": "#FFFFFF",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "page_id": {
+                    "isDerived": false,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.page_id})}}",
+                    "textSize": "PARAGRAPH2",
+                    "index": 1,
+                    "isVisible": false,
+                    "label": "page_id",
+                    "columnType": "text",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "page_id",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn8": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.updated_at?.date.start})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 9,
+                    "isVisible": true,
+                    "label": "Last Updated",
+                    "inputFormat": "YYYY-MM-DD",
+                    "columnType": "date",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn8",
+                    "buttonLabelColor": "#FFFFFF",
+                    "outputFormat": "LL",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "data": {
+                    "isDerived": false,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return '#' + currentRow.data.id?.number})}}",
+                    "textSize": "PARAGRAPH2",
+                    "index": 0,
+                    "isVisible": true,
+                    "label": "ID",
+                    "fontStyle": "BOLD",
+                    "columnType": "text",
+                    "horizontalAlignment": "RIGHT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "data",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn2": {
+                    "isDerived": true,
+                    "computedValue": "",
+                    "onClick": "{{showModal('Modal2')}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "#38AFF4",
+                    "index": 9,
+                    "isVisible": true,
+                    "label": "Re-Estimate",
+                    "buttonLabel": "{{Table2.sanitizedTableData.map((currentRow) => { return 'Update'})}}",
+                    "columnType": "button",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn2",
+                    "buttonLabelColor": "#F6F7F8",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn3": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.estimate?.number})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 4,
+                    "isVisible": true,
+                    "label": "Estimate(SP)",
+                    "columnType": "number",
+                    "horizontalAlignment": "RIGHT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn3",
+                    "buttonLabelColor": "#FFFFFF",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn4": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.issue_type?.select.name})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 5,
+                    "isVisible": true,
+                    "label": "Issue Type",
+                    "columnType": "text",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn4",
+                    "buttonLabelColor": "#FFFFFF",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn5": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.issue_url?.url})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 6,
+                    "isVisible": true,
+                    "label": "Issue URL",
+                    "columnType": "url",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn5",
+                    "buttonLabelColor": "#FFFFFF",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn6": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.created_at?.date.start})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 7,
+                    "isVisible": true,
+                    "label": "Created At",
+                    "inputFormat": "YYYY-MM-DD",
+                    "columnType": "date",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn6",
+                    "buttonLabelColor": "#FFFFFF",
+                    "outputFormat": "LL",
+                    "verticalAlignment": "CENTER"
+                  }
+                },
+                "derivedColumns": {
+                  "customColumn7": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.author?.email})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 8,
+                    "isVisible": true,
+                    "label": "Author",
+                    "columnType": "text",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn7",
+                    "buttonLabelColor": "#FFFFFF",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn8": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.updated_at?.date.start})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 9,
+                    "isVisible": true,
+                    "label": "Last Updated",
+                    "inputFormat": "YYYY-MM-DD",
+                    "columnType": "date",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn8",
+                    "buttonLabelColor": "#FFFFFF",
+                    "outputFormat": "LL",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn2": {
+                    "isDerived": true,
+                    "computedValue": "",
+                    "onClick": "{{showModal('Modal2')}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "#38AFF4",
+                    "index": 9,
+                    "isVisible": true,
+                    "label": "Re-Estimate",
+                    "buttonLabel": "{{Table1.sanitizedTableData.map((currentRow) => { return 'Update'})}}",
+                    "columnType": "button",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn2",
+                    "buttonLabelColor": "#F6F7F8",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn3": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.estimate?.number})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 4,
+                    "isVisible": true,
+                    "label": "Estimate(SP)",
+                    "columnType": "number",
+                    "horizontalAlignment": "RIGHT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn3",
+                    "buttonLabelColor": "#FFFFFF",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn4": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.issue_type?.select.name})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 5,
+                    "isVisible": true,
+                    "label": "Issue Type",
+                    "columnType": "text",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn4",
+                    "buttonLabelColor": "#FFFFFF",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn5": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.issue_url?.url})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 6,
+                    "isVisible": true,
+                    "label": "Issue URL",
+                    "columnType": "url",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn5",
+                    "buttonLabelColor": "#FFFFFF",
+                    "verticalAlignment": "CENTER"
+                  },
+                  "customColumn6": {
+                    "isDerived": true,
+                    "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => { return currentRow.data.created_at?.date.start})}}",
+                    "textSize": "PARAGRAPH2",
+                    "buttonStyle": "rgb(3, 179, 101)",
+                    "index": 7,
+                    "isVisible": true,
+                    "label": "Created At",
+                    "inputFormat": "YYYY-MM-DD",
+                    "columnType": "date",
+                    "horizontalAlignment": "LEFT",
+                    "width": 150,
+                    "enableFilter": true,
+                    "enableSort": true,
+                    "id": "customColumn6",
+                    "buttonLabelColor": "#FFFFFF",
+                    "outputFormat": "LL",
+                    "verticalAlignment": "CENTER"
+                  }
+                },
+                "rightColumn": 64,
+                "textSize": "PARAGRAPH2",
+                "widgetId": "efhhtr442b",
+                "tableData": "{{[]}}",
+                "isVisible": true,
+                "label": "Data",
+                "searchKey": "",
+                "version": 1,
+                "parentId": "9kax26wjp6",
+                "isLoading": false,
+                "horizontalAlignment": "LEFT",
+                "verticalAlignment": "CENTER",
+                "columnSizeMap": {
+                  "parent": 136,
+                  "issue_url": 174,
+                  "data": 72,
+                  "author": 174,
+                  "issue_type": 109,
+                  "created_at": 117,
+                  "customColumn1": 122,
+                  "customColumn2": 110,
+                  "customColumn3": 110,
+                  "customColumn4": 112,
+                  "customColumn5": 320,
+                  "task": 245,
+                  "estimate": 109,
+                  "step": 62,
+                  "id": 60,
+                  "status": 75
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/tableWidgetDsl.json b/app/client/cypress/fixtures/tableWidgetDsl.json
index 349f604903..9929225f5e 100644
--- a/app/client/cypress/fixtures/tableWidgetDsl.json
+++ b/app/client/cypress/fixtures/tableWidgetDsl.json
@@ -67,7 +67,11 @@
                 "bottomRow": 10,
                 "parentId": "tyiwk4xuq0",
                 "widgetId": "5up3r2iuvs",
-                "dynamicBindingPathList": []
+                "dynamicTriggerPathList": [{
+                  "key": "onSearchTextChanged"
+                }],
+                "onSearchTextChanged": "{{Api1.run()}}",
+                "selectedRow": "{{Table1.tableData[Table1.selectedRowIndex]}}"
               }
             ],
             "widgetId": "tyiwk4xuq0",
diff --git a/app/client/cypress/fixtures/tabsWithWidgetDsl.json b/app/client/cypress/fixtures/tabsWithWidgetDsl.json
new file mode 100644
index 0000000000..f736348b0b
--- /dev/null
+++ b/app/client/cypress/fixtures/tabsWithWidgetDsl.json
@@ -0,0 +1,208 @@
+{
+    "dsl": {
+        "widgetName": "MainContainer",
+        "backgroundColor": "none",
+        "rightColumn": 966,
+        "snapColumns": 16,
+        "detachFromLayout": true,
+        "widgetId": "0",
+        "topRow": 0,
+        "bottomRow": 1280,
+        "containerStyle": "none",
+        "snapRows": 33,
+        "parentRowSpace": 1,
+        "type": "CANVAS_WIDGET",
+        "canExtend": true,
+        "version": 18,
+        "minHeight": 1292,
+        "parentColumnSpace": 1,
+        "dynamicTriggerPathList": [],
+        "dynamicBindingPathList": [],
+        "leftColumn": 0,
+        "children": [
+            {
+                "isVisible": true,
+                "shouldScrollContents": false,
+                "widgetName": "Tabs1",
+                "tabsObj": {
+                    "tab1": {
+                        "label": "Tab 1",
+                        "id": "tab1",
+                        "widgetId": "78u8fmjgom",
+                        "isVisible": true,
+                        "index": 0
+                    },
+                    "tab2": {
+                        "label": "Tab 2",
+                        "id": "tab2",
+                        "widgetId": "tch1asw4ti",
+                        "isVisible": true,
+                        "index": 1
+                    }
+                },
+                "shouldShowTabs": true,
+                "defaultTab": "Tab 1",
+                "version": 2,
+                "type": "TABS_WIDGET",
+                "isLoading": false,
+                "parentColumnSpace": 57.875,
+                "parentRowSpace": 40,
+                "leftColumn": 3,
+                "rightColumn": 15,
+                "topRow": 1,
+                "bottomRow": 10,
+                "parentId": "0",
+                "widgetId": "wqb436vlj8",
+                "children": [
+                    {
+                        "type": "CANVAS_WIDGET",
+                        "tabId": "tab1",
+                        "tabName": "Tab 1",
+                        "widgetId": "78u8fmjgom",
+                        "parentId": "wqb436vlj8",
+                        "detachFromLayout": true,
+                        "children": [
+                            {
+                                "isVisible": true,
+                                "isDisabled": false,
+                                "datePickerType": "DATE_PICKER",
+                                "label": "",
+                                "dateFormat": "YYYY-MM-DD HH:mm",
+                                "widgetName": "DatePicker1",
+                                "defaultDate": "2021-05-09T10:22:42.862Z",
+                                "version": 2,
+                                "isRequired": false,
+                                "type": "DATE_PICKER_WIDGET2",
+                                "isLoading": false,
+                                "parentColumnSpace": 40.90625,
+                                "parentRowSpace": 40,
+                                "leftColumn": 2,
+                                "rightColumn": 7,
+                                "topRow": 0,
+                                "bottomRow": 1,
+                                "parentId": "78u8fmjgom",
+                                "widgetId": "opw72wgf4p"
+                            },
+                            {
+                                "isVisible": true,
+                                "text": "Label",
+                                "fontSize": "PARAGRAPH",
+                                "fontStyle": "BOLD",
+                                "textAlign": "LEFT",
+                                "textColor": "#231F20",
+                                "widgetName": "Text1",
+                                "version": 1,
+                                "type": "TEXT_WIDGET",
+                                "isLoading": false,
+                                "parentColumnSpace": 40.90625,
+                                "parentRowSpace": 40,
+                                "leftColumn": 2,
+                                "rightColumn": 6,
+                                "topRow": 2,
+                                "bottomRow": 3,
+                                "parentId": "78u8fmjgom",
+                                "widgetId": "vnm91359up"
+                            },
+                            {
+                                "isVisible": true,
+                                "text": "Submit",
+                                "buttonStyle": "PRIMARY_BUTTON",
+                                "widgetName": "Button1",
+                                "isDisabled": false,
+                                "isDefaultClickDisabled": true,
+                                "version": 1,
+                                "type": "BUTTON_WIDGET",
+                                "isLoading": false,
+                                "parentColumnSpace": 40.90625,
+                                "parentRowSpace": 40,
+                                "leftColumn": 3,
+                                "rightColumn": 5,
+                                "topRow": 4,
+                                "bottomRow": 5,
+                                "parentId": "78u8fmjgom",
+                                "widgetId": "lu7vjd5tq3"
+                            }
+                        ],
+                        "parentRowSpace": 1,
+                        "parentColumnSpace": 1,
+                        "leftColumn": 0,
+                        "rightColumn": 463,
+                        "topRow": 0,
+                        "bottomRow": 280,
+                        "isLoading": false,
+                        "widgetName": "Canvas1",
+                        "renderMode": "CANVAS"
+                    },
+                    {
+                        "type": "CANVAS_WIDGET",
+                        "tabId": "tab2",
+                        "tabName": "Tab 2",
+                        "widgetId": "tch1asw4ti",
+                        "parentId": "wqb436vlj8",
+                        "detachFromLayout": true,
+                        "children": [
+                            {
+                                "isVisible": true,
+                                "label": "Label",
+                                "defaultCheckedState": true,
+                                "widgetName": "Checkbox1",
+                                "version": 1,
+                                "alignWidget": "LEFT",
+                                "isDisabled": false,
+                                "isRequired": false,
+                                "type": "CHECKBOX_WIDGET",
+                                "isLoading": false,
+                                "parentColumnSpace": 40.90625,
+                                "parentRowSpace": 40,
+                                "leftColumn": 3,
+                                "rightColumn": 6,
+                                "topRow": 0,
+                                "bottomRow": 1,
+                                "parentId": "tch1asw4ti",
+                                "widgetId": "l7ahbr0vww"
+                            },
+                            {
+                                "isVisible": true,
+                                "label": "",
+                                "options": [
+                                    {
+                                        "label": "Yes",
+                                        "value": "Y"
+                                    },
+                                    {
+                                        "label": "No",
+                                        "value": "N"
+                                    }
+                                ],
+                                "defaultOptionValue": "Y",
+                                "widgetName": "RadioGroup1",
+                                "version": 1,
+                                "isRequired": false,
+                                "isDisabled": false,
+                                "type": "RADIO_GROUP_WIDGET",
+                                "isLoading": false,
+                                "parentColumnSpace": 40.90625,
+                                "parentRowSpace": 40,
+                                "leftColumn": 8,
+                                "rightColumn": 11,
+                                "topRow": 0,
+                                "bottomRow": 2,
+                                "parentId": "tch1asw4ti",
+                                "widgetId": "k4vwuehj29"
+                            }
+                        ],
+                        "parentRowSpace": 1,
+                        "parentColumnSpace": 1,
+                        "leftColumn": 0,
+                        "rightColumn": 463,
+                        "topRow": 0,
+                        "bottomRow": 160,
+                        "isLoading": false,
+                        "widgetName": "Canvas2",
+                        "renderMode": "CANVAS"
+                    }
+                ]
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/testdata.json b/app/client/cypress/fixtures/testdata.json
index 622aac0aae..af51c97ad5 100644
--- a/app/client/cypress/fixtures/testdata.json
+++ b/app/client/cypress/fixtures/testdata.json
@@ -112,8 +112,8 @@
   "currentRowWithIdOutside": "#{{currentRow.email}}",
   "currentRowWithIdInside": "{{\"#\" + currentRow.email}}",
   "defaultdataBinding": "{'Test','This'}",
-  "dropdownErrorMsg": "This value does not evaluate to type \"Array<{ label: string, value: string }>\". Transform it using JS inside '{{ }}'",
-  "tableWidgetErrorMsg": "This value does not evaluate to type \"Array<Object>\". Transform it using JS inside '{{ }}'",
+  "dropdownErrorMsg": "This value does not evaluate to type \"Array<{ label: string, value: string }>\".",
+  "tableWidgetErrorMsg": "This value does not evaluate to type \"Array<Object>\".",
   "bindingDataPoint": "{{JSON.stringify(Chart1.selectedDataPoint)}}",
   "bindChartData": "{{Chart1.selectedDataPoint",
   "appUrl": "https://oauth.mocklab.io/userinfo",
@@ -121,5 +121,7 @@
   "clientSecret": "505dac16a21681f277b5fde97445be18",
   "accessTokenUrl": "https://oauth.mocklab.io/oauth/token",
   "oauthResponse": "169444434892406",
-  "authorizationURL": "https://oauth.mocklab.io/oauth/authorize"
+  "authorizationURL": "https://oauth.mocklab.io/oauth/authorize",
+  "basicURl": "https://envyenksqii9nf3.m.pipedream.net",
+  "methodWithQueryParam": "users?q=mimeType='application/vnd.google-apps.spreadsheet'"
 }
diff --git a/app/client/cypress/fixtures/widgetSelection.json b/app/client/cypress/fixtures/widgetSelection.json
new file mode 100644
index 0000000000..2347e0629b
--- /dev/null
+++ b/app/client/cypress/fixtures/widgetSelection.json
@@ -0,0 +1,209 @@
+{
+    "dsl": {
+      "widgetName": "MainContainer",
+      "backgroundColor": "none",
+      "rightColumn": 1270,
+      "snapColumns": 64,
+      "detachFromLayout": true,
+      "widgetId": "0",
+      "topRow": 0,
+      "bottomRow": 820,
+      "containerStyle": "none",
+      "snapRows": 125,
+      "parentRowSpace": 1,
+      "type": "CANVAS_WIDGET",
+      "canExtend": true,
+      "version": 23,
+      "minHeight": 830,
+      "parentColumnSpace": 1,
+      "dynamicTriggerPathList": [],
+      "dynamicBindingPathList": [],
+      "leftColumn": 0,
+      "children": [
+        {
+          "widgetName": "Chart1",
+          "rightColumn": 26,
+          "allowHorizontalScroll": false,
+          "widgetId": "ypstklohw5",
+          "topRow": 4,
+          "bottomRow": 36,
+          "parentRowSpace": 10,
+          "isVisible": true,
+          "type": "CHART_WIDGET",
+          "version": 1,
+          "parentId": "0",
+          "isLoading": false,
+          "chartData": {
+            "3jzahcrorq": {
+              "seriesName": "Sales",
+              "data": [
+                {
+                  "x": "Mon",
+                  "y": 10000
+                },
+                {
+                  "x": "Tue",
+                  "y": 12000
+                },
+                {
+                  "x": "Wed",
+                  "y": 32000
+                },
+                {
+                  "x": "Thu",
+                  "y": 28000
+                },
+                {
+                  "x": "Fri",
+                  "y": 14000
+                },
+                {
+                  "x": "Sat",
+                  "y": 19000
+                },
+                {
+                  "x": "Sun",
+                  "y": 36000
+                }
+              ]
+            }
+          },
+          "yAxisName": "Total Order Revenue $",
+          "parentColumnSpace": 19.65625,
+          "chartName": "Last week's revenue",
+          "leftColumn": 2,
+          "xAxisName": "Last Week",
+          "customFusionChartConfig": {
+            "type": "column2d",
+            "dataSource": {
+              "chart": {
+                "caption": "Last week's revenue",
+                "xAxisName": "Last Week",
+                "yAxisName": "Total Order Revenue $",
+                "theme": "fusion"
+              },
+              "data": [
+                {
+                  "label": "Mon",
+                  "value": 10000
+                },
+                {
+                  "label": "Tue",
+                  "value": 12000
+                },
+                {
+                  "label": "Wed",
+                  "value": 32000
+                },
+                {
+                  "label": "Thu",
+                  "value": 28000
+                },
+                {
+                  "label": "Fri",
+                  "value": 14000
+                },
+                {
+                  "label": "Sat",
+                  "value": 19000
+                },
+                {
+                  "label": "Sun",
+                  "value": 36000
+                }
+              ],
+              "trendlines": [
+                {
+                  "line": [
+                    {
+                      "startvalue": "38000",
+                      "valueOnRight": "1",
+                      "displayvalue": "Weekly Target"
+                    }
+                  ]
+                }
+              ]
+            }
+          },
+          "chartType": "LINE_CHART"
+        },
+        {
+          "backgroundColor": "#FFFFFF",
+          "widgetName": "Container1",
+          "rightColumn": 62,
+          "widgetId": "6y21iarlp4",
+          "containerStyle": "card",
+          "topRow": 11,
+          "bottomRow": 51,
+          "parentRowSpace": 10,
+          "isVisible": true,
+          "type": "CONTAINER_WIDGET",
+          "version": 1,
+          "parentId": "0",
+          "isLoading": false,
+          "parentColumnSpace": 19.65625,
+          "leftColumn": 30,
+          "children": [
+            {
+              "widgetName": "Canvas1",
+              "rightColumn": 629,
+              "detachFromLayout": true,
+              "widgetId": "jqasr1uss5",
+              "containerStyle": "none",
+              "topRow": 0,
+              "bottomRow": 400,
+              "parentRowSpace": 1,
+              "isVisible": true,
+              "canExtend": false,
+              "type": "CANVAS_WIDGET",
+              "version": 1,
+              "parentId": "6y21iarlp4",
+              "minHeight": 400,
+              "isLoading": false,
+              "parentColumnSpace": 1,
+              "leftColumn": 0,
+              "children": []
+            }
+          ]
+        },
+        {
+          "image": "",
+          "widgetName": "Image1",
+          "rightColumn": 22,
+          "widgetId": "1t50avy6f1",
+          "topRow": 58,
+          "bottomRow": 70,
+          "parentRowSpace": 10,
+          "isVisible": true,
+          "type": "IMAGE_WIDGET",
+          "version": 1,
+          "parentId": "0",
+          "isLoading": false,
+          "maxZoomLevel": 1,
+          "parentColumnSpace": 19.65625,
+          "imageShape": "RECTANGLE",
+          "leftColumn": 6,
+          "defaultImage": "https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"
+        },
+        {
+          "widgetName": "Button1",
+          "rightColumn": 18,
+          "isDefaultClickDisabled": true,
+          "widgetId": "41wgbhd5vp",
+          "buttonStyle": "PRIMARY_BUTTON",
+          "topRow": 44,
+          "bottomRow": 48,
+          "parentRowSpace": 10,
+          "isVisible": true,
+          "type": "BUTTON_WIDGET",
+          "version": 1,
+          "parentId": "0",
+          "isLoading": false,
+          "parentColumnSpace": 19.65625,
+          "leftColumn": 10,
+          "text": "Submit",
+          "isDisabled": false
+        }
+      ]
+    }
+  }
\ No newline at end of file
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/ExecutionParams_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/ExecutionParams_spec.js
index 6e4a234a3b..4a50dfc688 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/ExecutionParams_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/ExecutionParams_spec.js
@@ -31,8 +31,12 @@ describe("API Panel Test Functionality", function() {
     cy.contains(".t--datasource-name", datasourceName)
       .find(queryLocators.createQuery)
       .click();
-
     cy.get(queryLocators.templateMenu).click();
+    cy.get(queryLocators.settings).click({ force: true });
+    cy.get(queryLocators.switch)
+      .last()
+      .click({ force: true });
+    cy.get(queryLocators.query).click({ force: true });
     cy.get(".CodeMirror textarea")
       .first()
       .focus()
@@ -43,6 +47,7 @@ describe("API Panel Test Functionality", function() {
     cy.WaitAutoSave();
     cy.runQuery();
   });
+
   it("Will pass execution params", function() {
     // Bind the table
     cy.SearchEntityandOpen("Table1");
@@ -78,7 +83,6 @@ describe("API Panel Test Functionality", function() {
 
     // Publish the app
     cy.PublishtheApp();
-    cy.wait("@postExecute");
 
     // Assert on load data in table
     cy.readTabledataPublish("0", "1").then((cellData) => {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_Edit_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_Edit_spec.js
index d46a3b1ec0..7ffd0131ad 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_Edit_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_Edit_spec.js
@@ -7,11 +7,9 @@ describe("API Panel Test Functionality", function() {
     cy.NavigateToAPI_Panel();
     cy.log("Navigation to API Panel screen successful");
     cy.CreateAPI("FirstAPI");
-    cy.get("textarea").should(
-      "have.attr",
-      "placeholder",
-      "https://mock-api.appsmith.com/users",
-    );
+    cy.get(".CodeMirror-placeholder")
+      .first()
+      .should("have.text", "https://mock-api.appsmith.com/users");
     cy.log("Creation of FirstAPI Action successful");
     cy.enterDatasourceAndPath(testdata.baseUrl, testdata.methods);
     cy.SaveAndRunAPI();
@@ -29,14 +27,24 @@ describe("API Panel Test Functionality", function() {
     cy.NavigateToAPI_Panel();
     cy.CreateAPI("CrashTestAPI");
     cy.SelectAction(testdata.postAction);
-    cy.xpath(apiwidget.headerKey)
+    cy.get(apiwidget.headerKey)
       .first()
-      .focus({ force: true })
-      .type("{uparrow}", { force: true })
-      .type("{ctrl}{shift}{downarrow}", { force: true })
-      .type("{backspace}", { force: true });
+      .click({ force: true })
+      .type("{uparrow}", { parseSpecialCharSequences: true })
+      .type("{ctrl}{shift}{downarrow}", { parseSpecialCharSequences: true })
+      .type("{backspace}", { parseSpecialCharSequences: true });
     // assert so that this fails
-    cy.xpath(apiwidget.headerKey).should("be.visible");
-    cy.xpath(apiwidget.headerKey).should("have.value", "");
+    cy.get(apiwidget.headerKey).should("be.visible");
+    cy.get(apiwidget.headerKey).should("have.value", "");
+  });
+
+  it("Should correctly parse query params", function() {
+    cy.NavigateToAPI_Panel();
+    cy.CreateAPI("APIWithQueryParams");
+    cy.enterDatasourceAndPath(testdata.baseUrl, testdata.methodWithQueryParam);
+    cy.ValidateQueryParams({
+      key: "q",
+      value: "mimeType='application/vnd.google-apps.spreadsheet'",
+    });
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_RequestBody_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_RequestBody_spec.js
index e7bcd32a12..0651e60673 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_RequestBody_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_RequestBody_spec.js
@@ -12,7 +12,7 @@ describe("API Panel request body", function() {
     cy.contains(apiEditor.bodyTab).click();
     cy.contains(testdata.apiFormDataBodyType).click();
 
-    cy.xpath(apiwidget.formEncoded).should("be.visible");
+    cy.get(apiwidget.formEncoded).should("be.visible");
 
     cy.DeleteAPI();
   });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_Unique_name_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_Unique_name_spec.js
index 8e784f5f56..48655115a4 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_Unique_name_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_Unique_name_spec.js
@@ -3,9 +3,15 @@ describe("Name uniqueness test", function() {
     cy.log("Login Successful");
     cy.NavigateToAPI_Panel();
     cy.log("Navigation to API Panel screen successful");
-    cy.CreateAPI("UniqueName");
+    cy.CreateAPI("Uni");
     cy.log("Creation of UniqueName Action successful");
-    cy.CreationOfUniqueAPIcheck("UniqueName");
+  });
+
+  it("Validate Unique Name", () => {
+    cy.CreationOfUniqueAPIcheck("Uni");
+  });
+
+  it("Validate download apiname check", () => {
     cy.CreationOfUniqueAPIcheck("download");
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/DuplicateApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/DuplicateApplication_spec.js
index e824916c33..f9aba00e65 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/DuplicateApplication_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/DuplicateApplication_spec.js
@@ -1,8 +1,10 @@
-const dsl = require("../../../../fixtures/displayWidgetDsl.json");
+const dsl = require("../../../../fixtures/basicDsl.json");
 const homePage = require("../../../../locators/HomePage.json");
 const commonlocators = require("../../../../locators/commonlocators.json");
-const explorerlocators = require("../../../../locators/explorerlocators.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
+
 let duplicateApplicationDsl;
+let parentApplicationDsl;
 
 describe("Duplicate application", function() {
   before(() => {
@@ -10,12 +12,20 @@ describe("Duplicate application", function() {
   });
 
   it("Check whether the duplicate application has the same dsl as the original", function() {
-    cy.get(commonlocators.homeIcon).click({ force: true });
     const appname = localStorage.getItem("AppName");
+    cy.SearchEntityandOpen("Input1");
+    cy.intercept("PUT", "/api/v1/layouts/*/pages/*").as("inputUpdate");
+    cy.get(widgetsPage.defaultInput).type("A");
+    cy.get(commonlocators.editPropCrossButton).click({ force: true });
+    cy.wait("@inputUpdate").then((response) => {
+      parentApplicationDsl = response.response.body.data.dsl;
+    });
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(2000);
+    cy.NavigateToHome();
     cy.get(homePage.searchInput).type(appname);
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000);
-
     cy.get(homePage.applicationCard)
       .first()
       .trigger("mouseover");
@@ -23,17 +33,20 @@ describe("Duplicate application", function() {
       .first()
       .click({ force: true });
     cy.get(homePage.duplicateApp).click({ force: true });
-
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(4000);
     cy.wait("@getPage").should(
       "have.nested.property",
       "response.body.responseMeta.status",
       200,
     );
     cy.get("@getPage").then((httpResponse) => {
-      const data = httpResponse.response.body.data;
-      duplicateApplicationDsl = data.layouts[0].dsl;
-
-      expect(duplicateApplicationDsl).to.deep.equal(dsl.dsl);
+      duplicateApplicationDsl = httpResponse.response.body.data.layouts[0].dsl;
+      cy.log(JSON.stringify(duplicateApplicationDsl));
+      cy.log(JSON.stringify(parentApplicationDsl));
+      expect(JSON.stringify(duplicateApplicationDsl)).to.deep.equal(
+        JSON.stringify(parentApplicationDsl),
+      );
     });
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ExportApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ExportApplication_spec.js
new file mode 100644
index 0000000000..3b58ec8dde
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ExportApplication_spec.js
@@ -0,0 +1,159 @@
+const dsl = require("../../../../fixtures/displayWidgetDsl.json");
+const homePage = require("../../../../locators/HomePage.json");
+const commonlocators = require("../../../../locators/commonlocators.json");
+
+describe("Export application as a JSON file", function() {
+  let orgid;
+  let appid;
+  let currentUrl;
+  let newOrganizationName;
+  let appname;
+
+  before(() => {
+    cy.addDsl(dsl);
+  });
+
+  it("Check if exporting app flow works as expected", function() {
+    cy.get(commonlocators.homeIcon).click({ force: true });
+    appname = localStorage.getItem("AppName");
+    cy.get(homePage.searchInput).type(appname);
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(2000);
+
+    cy.get(homePage.applicationCard)
+      .first()
+      .trigger("mouseover");
+    cy.get(homePage.appMoreIcon)
+      .first()
+      .click({ force: true });
+    cy.get(homePage.exportAppFromMenu).click({ force: true });
+    cy.get(homePage.toastMessage).should("contain", "Successfully exported");
+    cy.LogOut();
+  });
+
+  it("User with admin access,should be able to export the app", function() {
+    cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+    cy.NavigateToHome();
+    cy.generateUUID().then((uid) => {
+      orgid = uid;
+      appid = uid;
+      localStorage.setItem("OrgName", orgid);
+      cy.createOrg();
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+      });
+      cy.CreateAppForOrg(orgid, appid);
+      cy.wait("@getPagesForCreateApp").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
+      cy.get("h2").contains("Drag and drop a widget here");
+      cy.get(homePage.shareApp).click({ force: true });
+      cy.shareApp(Cypress.env("TESTUSERNAME1"), homePage.adminRole);
+
+      cy.LogOut();
+
+      cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
+      cy.NavigateToHome();
+      cy.wait(2000);
+      cy.log({ appid });
+      cy.get(homePage.searchInput).type(appid);
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(2000);
+
+      cy.get(homePage.applicationCard)
+        .first()
+        .trigger("mouseover");
+      cy.get(homePage.appMoreIcon)
+        .first()
+        .click({ force: true });
+      cy.get(homePage.exportAppFromMenu).should("be.visible");
+    });
+    cy.LogOut();
+  });
+
+  it("User with developer access,should not be able to export the app", function() {
+    cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+    cy.NavigateToHome();
+    cy.generateUUID().then((uid) => {
+      orgid = uid;
+      appid = uid;
+      localStorage.setItem("OrgName", orgid);
+      cy.createOrg();
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+      });
+      cy.CreateAppForOrg(orgid, appid);
+      cy.wait("@getPagesForCreateApp").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
+      cy.get("h2").contains("Drag and drop a widget here");
+      cy.get(homePage.shareApp).click({ force: true });
+      cy.shareApp(Cypress.env("TESTUSERNAME1"), homePage.developerRole);
+
+      cy.LogOut();
+
+      cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
+      cy.NavigateToHome();
+      cy.wait(2000);
+      cy.log({ appid });
+      cy.get(homePage.searchInput).type(appid);
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(2000);
+
+      cy.get(homePage.applicationCard)
+        .first()
+        .trigger("mouseover");
+      cy.get(homePage.appMoreIcon)
+        .first()
+        .click({ force: true });
+      cy.get(homePage.exportAppFromMenu).should("not.exist");
+    });
+    cy.LogOut();
+  });
+
+  it("User with viewer access,should not be able to export the app", function() {
+    cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+    cy.NavigateToHome();
+    cy.generateUUID().then((uid) => {
+      orgid = uid;
+      appid = uid;
+      localStorage.setItem("OrgName", orgid);
+      cy.createOrg();
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+      });
+      cy.CreateAppForOrg(orgid, appid);
+      cy.wait("@getPagesForCreateApp").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
+      cy.get("h2").contains("Drag and drop a widget here");
+      cy.get(homePage.shareApp).click({ force: true });
+      cy.shareApp(Cypress.env("TESTUSERNAME1"), homePage.viewerRole);
+
+      cy.LogOut();
+
+      cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
+      cy.NavigateToHome();
+      cy.wait(2000);
+      cy.log({ appid });
+      cy.get(homePage.searchInput).type(appid);
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(2000);
+
+      cy.get(homePage.applicationCard)
+        .first()
+        .trigger("mouseover");
+      cy.get(homePage.appEditIcon).should("not.exist");
+    });
+    cy.LogOut();
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ForkApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ForkApplication_spec.js
index f0d29008c1..9cc80fe443 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ForkApplication_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ForkApplication_spec.js
@@ -1,7 +1,10 @@
-const dsl = require("../../../../fixtures/displayWidgetDsl.json");
+const dsl = require("../../../../fixtures/basicDsl.json");
 const homePage = require("../../../../locators/HomePage.json");
 const commonlocators = require("../../../../locators/commonlocators.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
+
 let forkedApplicationDsl;
+let parentApplicationDsl;
 
 describe("Fork application across orgs", function() {
   before(() => {
@@ -9,12 +12,20 @@ describe("Fork application across orgs", function() {
   });
 
   it("Check if the forked application has the same dsl as the original", function() {
-    cy.get(commonlocators.homeIcon).click({ force: true });
     const appname = localStorage.getItem("AppName");
+    cy.SearchEntityandOpen("Input1");
+    cy.intercept("PUT", "/api/v1/layouts/*/pages/*").as("inputUpdate");
+    cy.get(widgetsPage.defaultInput).type("A");
+    cy.get(commonlocators.editPropCrossButton).click({ force: true });
+    cy.wait("@inputUpdate").then((response) => {
+      parentApplicationDsl = response.response.body.data.dsl;
+    });
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(2000);
+    cy.NavigateToHome();
     cy.get(homePage.searchInput).type(appname);
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000);
-
     cy.get(homePage.applicationCard)
       .first()
       .trigger("mouseover");
@@ -28,6 +39,8 @@ describe("Fork application across orgs", function() {
       .last()
       .click({ force: true });
     cy.get(homePage.forkAppOrgButton).click({ force: true });
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(4000);
     cy.wait("@postForkAppOrg").then((httpResponse) => {
       expect(httpResponse.status).to.equal(200);
     });
@@ -35,8 +48,11 @@ describe("Fork application across orgs", function() {
     cy.get("@getPage").then((httpResponse) => {
       const data = httpResponse.response.body.data;
       forkedApplicationDsl = data.layouts[0].dsl;
-
-      expect(forkedApplicationDsl).to.deep.equal(dsl.dsl);
+      cy.log(JSON.stringify(forkedApplicationDsl));
+      cy.log(JSON.stringify(parentApplicationDsl));
+      expect(JSON.stringify(forkedApplicationDsl)).to.contain(
+        JSON.stringify(parentApplicationDsl),
+      );
     });
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/UpdateApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/UpdateApplication_spec.js
index cca7436c89..fa111127a3 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/UpdateApplication_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/UpdateApplication_spec.js
@@ -100,12 +100,13 @@ describe("Update Application", function() {
     );
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000);
-
+    cy.get(homePage.searchInput).type(veryLongAppName);
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(2000);
     cy.get(homePage.applicationCard)
       .first()
       .find(homePage.applicationCardName)
       .trigger("mouseover");
-
     cy.get(".bp3-popover-target.bp3-popover-open").should("have.length", 1);
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_API_with_List_Widget_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_API_with_List_Widget_spec.js
new file mode 100644
index 0000000000..4015b794e4
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_API_with_List_Widget_spec.js
@@ -0,0 +1,94 @@
+const commonlocators = require("../../../../locators/commonlocators.json");
+const dsl = require("../../../../fixtures/listwidgetdsl.json");
+const pages = require("../../../../locators/Pages.json");
+const apiPage = require("../../../../locators/ApiEditor.json");
+const publishPage = require("../../../../locators/publishWidgetspage.json");
+
+describe("Test Create Api and Bind to Table widget", function() {
+  let apiData;
+  let valueToTest;
+  before(() => {
+    cy.addDsl(dsl);
+  });
+
+  it("Test_Add users api and execute api", function() {
+    cy.createAndFillApi(this.data.userApi, "/users");
+    cy.RunAPI();
+    cy.get(apiPage.responseBody)
+      .contains("name")
+      .siblings("span")
+      .invoke("text")
+      .then((text) => {
+        valueToTest = `${text
+          .match(/"(.*)"/)[0]
+          .split('"')
+          .join("")}`;
+        cy.log(valueToTest);
+        apiData = valueToTest;
+        cy.log("val1:" + valueToTest);
+      });
+  });
+
+  it("Test_Validate the Api data is updated on List widget", function() {
+    cy.SearchEntityandOpen("List1");
+    cy.getCodeMirror().then(($cm) => {
+      cy.get(".CodeMirror textarea")
+        .first()
+        .type(`{{Api1.data.users}}`, {
+          force: true,
+          parseSpecialCharSequences: false,
+        });
+    });
+    cy.get(commonlocators.editPropCrossButton).click({ force: true });
+    cy.get(".t--draggable-textwidget span").should("have.length", 4);
+
+    cy.get(".t--draggable-textwidget span")
+      .first()
+      .invoke("text")
+      .then((text) => {
+        expect(text).to.equal(valueToTest);
+      });
+    cy.PublishtheApp();
+    cy.get(".t--widget-textwidget span").should("have.length", 4);
+    cy.get(".t--widget-textwidget span")
+      .first()
+      .invoke("text")
+      .then((text) => {
+        expect(text).to.equal(valueToTest);
+      });
+  });
+
+  it("Test_Validate the list widget ", function() {
+    cy.get(publishPage.backToEditor).click({ force: true });
+    cy.SearchEntityandOpen("List1");
+
+    cy.getCodeMirror().then(($cm) => {
+      cy.get(".CodeMirror textarea")
+        .last()
+        .type(`50`, {
+          force: true,
+          parseSpecialCharSequences: false,
+        });
+    });
+    cy.get(commonlocators.editPropCrossButton).click({ force: true });
+    cy.get(".t--draggable-textwidget span").should("have.length", 2);
+    cy.get(".t--draggable-textwidget span")
+      .first()
+      .invoke("text")
+      .then((text) => {
+        expect(text).to.equal(valueToTest);
+      });
+    cy.PublishtheApp();
+    cy.get(".t--widget-textwidget span").should("have.length", 2);
+    cy.get(".t--widget-textwidget span")
+      .first()
+      .invoke("text")
+      .then((text) => {
+        expect(text).to.equal(valueToTest);
+      });
+  });
+
+  afterEach(() => {
+    // put your clean up code if any
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_InputWidget_Table_Sorting_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_InputWidget_Table_Sorting_spec.js
index adab4c0052..7583ac1814 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_InputWidget_Table_Sorting_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_InputWidget_Table_Sorting_spec.js
@@ -28,6 +28,7 @@ describe("Binding the Table and input Widget", function() {
     cy.get(".draggable-header ")
       .first()
       .click({ force: true });
+    cy.wait(1000);
     cy.readTabledataPublish("0", "0").then((tabData) => {
       const tabValue = tabData;
       expect(tabValue).to.be.equal("6788734");
@@ -40,6 +41,7 @@ describe("Binding the Table and input Widget", function() {
     cy.get(".draggable-header ")
       .first()
       .click({ force: true });
+    cy.wait(1000);
     cy.readTabledataPublish("0", "0").then((tabData) => {
       const tabValue = tabData;
       expect(tabValue).to.be.equal("2381224");
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_TableTextPagination_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_TableTextPagination_spec.js
index 4b128ed56b..707a039195 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_TableTextPagination_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_TableTextPagination_spec.js
@@ -46,19 +46,18 @@ describe("Test Create Api and Bind to Table widget", function() {
 
   it("Table-Text, Validate Publish Mode on Server Side Pagination of Paginate with Table Page No", function() {
     cy.PublishtheApp();
+    // Make sure onPageLoad action has run before validating the data
+    cy.wait("@postExecute");
     cy.ValidatePublishTableData("1");
     cy.get(commonlocators.tableNextPage).click({ force: true });
-    cy.wait("@postExecute").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
+    // Make sure net page action is run
+    cy.wait("@postExecute");
     cy.validateToastMessage("done");
     cy.ValidatePublishTableData("11");
-    cy.get(publishPage.backToEditor).click({ force: true });
   });
 
   it("Test_Add Paginate with Response URL and Execute the Api", function() {
+    cy.get(publishPage.backToEditor).click({ force: true });
     /** Create Api2 of Paginate with Response URL*/
     cy.createAndFillApi(this.data.paginationUrl, "users");
     cy.RunAPI();
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_TableWidget_selectedRow_Input_widget_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_TableWidget_selectedRow_Input_widget_spec.js
index 44bc0ccf73..cac307625a 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_TableWidget_selectedRow_Input_widget_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_TableWidget_selectedRow_Input_widget_spec.js
@@ -22,17 +22,6 @@ describe("Binding the table widget and input Widget", function() {
     );
   });
 
-  it("Input widget test with default value from table widget", function() {
-    cy.SearchEntityandOpen("Input2");
-    cy.get(widgetsPage.defaultInput).type(testdata.defaultRowIndexBinding);
-    cy.get(commonlocators.editPropCrossButton).click({ force: true });
-    cy.wait("@updateLayout").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-  });
-
   it("validation of data displayed in input widgets based on selected row", function() {
     cy.SearchEntityandOpen("Table1");
     cy.get(commonlocators.deflautSelectedRow)
@@ -47,10 +36,6 @@ describe("Binding the table widget and input Widget", function() {
         .first()
         .invoke("attr", "value")
         .should("contain", tabValue);
-      cy.get(publish.inputWidget + " " + "input")
-        .last()
-        .invoke("attr", "value")
-        .should("contain", 2);
     });
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_tableApi_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_tableApi_spec.js
index d65d22e80d..fb8eeb6b6e 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_tableApi_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_tableApi_spec.js
@@ -3,6 +3,7 @@ const dsl = require("../../../../fixtures/tableWidgetDsl.json");
 const pages = require("../../../../locators/Pages.json");
 const apiPage = require("../../../../locators/ApiEditor.json");
 const publishPage = require("../../../../locators/publishWidgetspage.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
 
 describe("Test Create Api and Bind to Table widget", function() {
   let apiData;
@@ -43,6 +44,18 @@ describe("Test Create Api and Bind to Table widget", function() {
     cy.readTabledataPublish("0", "1").then((tabData) => {
       expect(apiData).to.eq(`\"${tabData}\"`);
     });
+    cy.get(commonlocators.backToEditor).click();
+  });
+
+  it("Validate onSearchTextChanged function is called when configured for search text", function() {
+    cy.SearchEntityandOpen("Table1");
+    cy.get(".t--widget-tablewidget .t--search-input")
+      .first()
+      .type("Currey");
+    cy.wait(5000);
+    cy.readTabledataPublish("0", "1").then((tabData) => {
+      expect(apiData).to.eq(`\"${tabData}\"`);
+    });
   });
 
   afterEach(() => {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Widgets_form_input_table_default_validation.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Widgets_form_input_table_default_validation.js
index 11f615bf69..d9181f25b4 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Widgets_form_input_table_default_validation.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Widgets_form_input_table_default_validation.js
@@ -22,18 +22,6 @@ describe("Binding the multiple input Widget", function() {
     );
   });
 
-  it("Binding second input widget with first input widget and validating", function() {
-    cy.SearchEntityandOpen("Input2");
-    cy.get(widgetsPage.defaultInput).type(testdata.defaultMoustacheData);
-    cy.get(commonlocators.editPropCrossButton).click({ force: true });
-    cy.wait("@updateLayout").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-    cy.reload();
-  });
-
   it("validation of data displayed in all widgets based on row selected", function() {
     cy.isSelectRow(1);
     cy.readTabledataPublish("1", "0").then((tabData) => {
@@ -45,10 +33,10 @@ describe("Binding the multiple input Widget", function() {
         .first()
         .invoke("attr", "value")
         .should("contain", tabValue);
-      cy.get(publish.inputWidget + " " + "input")
-        .last()
-        .invoke("attr", "value")
-        .should("contain", tabValue);
+      //       cy.get(publish.inputWidget + " " + "input")
+      //         .last()
+      //         .invoke("attr", "value")
+      //         .should("contain", tabValue);
     });
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/aTobAndbToaBasictest_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/aTobAndbToaBasictest_spec.js
index 2243383267..9909e7e9a7 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/aTobAndbToaBasictest_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/aTobAndbToaBasictest_spec.js
@@ -31,7 +31,6 @@ describe("aTob and bToa library tests ", function() {
       "response.body.responseMeta.status",
       200,
     );
-    cy.reload();
   });
 
   it("publish widget and validate the data displayed in input widgets value for aToB and bToa", function() {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/loadashBasictest_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/loadashBasictest_spec.js
index 19618536e1..6d30dabefc 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/loadashBasictest_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/loadashBasictest_spec.js
@@ -31,7 +31,6 @@ describe("Loadash basic test with input Widget", function() {
       "response.body.responseMeta.status",
       200,
     );
-    cy.reload();
   });
 
   it("publish widget and validate the data displayed in input widgets from loadash function", function() {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/momentBasictest_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/momentBasictest_spec.js
index 2b6ff63311..19fdd3942e 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/momentBasictest_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/momentBasictest_spec.js
@@ -31,7 +31,6 @@ describe("Moment basic test with input Widget", function() {
       "response.body.responseMeta.status",
       200,
     );
-    cy.reload();
   });
 
   it("publish widget and validate the data displayed in input widgets", function() {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Canvas/Resize_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Canvas/Resize_spec.js
index 6e3009fe9a..1f969e2c13 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Canvas/Resize_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Canvas/Resize_spec.js
@@ -7,10 +7,17 @@ describe("Canvas Resize", function() {
   });
   it("Deleting bottom widget should resize canvas", function() {
     const InitHeight = "2960px";
-    const FinalHeight = "1292px";
     cy.get(commonlocators.dropTarget).should("have.css", "height", InitHeight);
     cy.openPropertyPane("textwidget");
+    cy.intercept("PUT", "/api/v1/layouts/*/pages/*").as("deleteUpdate");
     cy.get(commonlocators.deleteWidget).click();
-    cy.get(commonlocators.dropTarget).should("have.css", "height", FinalHeight);
+    cy.wait("@deleteUpdate").then((response) => {
+      const dsl = response.response.body.data.dsl;
+      cy.get(commonlocators.dropTarget).should(
+        "have.css",
+        "height",
+        `${dsl.bottomRow}px`,
+      );
+    });
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Inspect_Element_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Inspect_Element_spec.js
new file mode 100644
index 0000000000..f565c11a99
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Inspect_Element_spec.js
@@ -0,0 +1,16 @@
+const dsl = require("../../../../fixtures/debuggerDependencyDsl.json");
+
+describe("Inspect Entity", function() {
+  before(() => {
+    cy.addDsl(dsl);
+  });
+  it("Check whether depedencies and references are shown correctly", function() {
+    cy.openPropertyPane("inputwidget");
+    cy.testJsontext("defaulttext", "{{Button1.text}}");
+
+    cy.get(".t--debugger").click();
+    cy.contains(".react-tabs__tab", "Inspect Entity").click();
+    cy.contains(".t--dependencies-item", "Button1").click();
+    cy.contains(".t--references-item", "Input1");
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js
index e884caf535..992fe23a68 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js
@@ -1,4 +1,6 @@
 const dsl = require("../../../../fixtures/buttondsl.json");
+const commonlocators = require("../../../../locators/commonlocators.json");
+const debuggerLocators = require("../../../../locators/Debugger.json");
 
 describe("Debugger logs", function() {
   before(() => {
@@ -11,4 +13,18 @@ describe("Debugger logs", function() {
     cy.get(".t--debugger").click();
     cy.get(".t--debugger-log-state").contains("Test");
   });
+
+  it("Reset debugger state", function() {
+    cy.get(".t--property-control-visible")
+      .find(".t--js-toggle")
+      .click();
+    cy.testJsontext("visible", "Test");
+
+    cy.get(commonlocators.homeIcon).click({ force: true });
+    cy.generateUUID().then((id) => {
+      cy.CreateAppInFirstListedOrg(id);
+
+      cy.contains(debuggerLocators.debuggerIcon, 0);
+    });
+  });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js
new file mode 100644
index 0000000000..2fd3a73d96
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js
@@ -0,0 +1,23 @@
+const dsl = require("../../../../fixtures/debuggerTableDsl.json");
+const explorer = require("../../../../locators/explorerlocators.json");
+const debuggerLocators = require("../../../../locators/Debugger.json");
+const testdata = require("../../../../fixtures/testdata.json");
+
+describe("Check debugger logs state when there are onPageLoad actions", function() {
+  before(() => {
+    cy.addDsl(dsl);
+  });
+  it("Check debugger logs state when there are onPageLoad actions", function() {
+    cy.openPropertyPane("tablewidget");
+    cy.testJsontext("tabledata", "{{TestApi.data.users}}");
+    cy.NavigateToAPI_Panel();
+    cy.CreateAPI("TestApi");
+    cy.enterDatasourceAndPath(testdata.baseUrl, testdata.methods);
+    cy.SaveAndRunAPI();
+
+    cy.get(explorer.addWidget).click();
+
+    cy.reload();
+    cy.contains(debuggerLocators.debuggerIcon, 0);
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Widget_Error_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Widget_Error_spec.js
new file mode 100644
index 0000000000..b90c506c6f
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Widget_Error_spec.js
@@ -0,0 +1,25 @@
+const dsl = require("../../../../fixtures/buttondsl.json");
+const debuggerLocators = require("../../../../locators/Debugger.json");
+
+describe("Widget error state", function() {
+  before(() => {
+    cy.addDsl(dsl);
+  });
+  it("Check widget error state", function() {
+    cy.openPropertyPane("buttonwidget");
+
+    cy.get(".t--property-control-visible")
+      .find(".t--js-toggle")
+      .click();
+    cy.testJsontext("visible", "Test");
+
+    cy.contains(".t--widget-error-count", 1);
+  });
+
+  it("Check if the current value is shown in the debugger", function() {
+    cy.get(debuggerLocators.debuggerIcon).click();
+    cy.contains(".react-tabs__tab", "Errors").click();
+
+    cy.get(debuggerLocators.debuggerLogState).contains("Test");
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Chart_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Chart_spec.js
index 261a1741fe..d730e42151 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Chart_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Chart_spec.js
@@ -1,8 +1,10 @@
 const commonlocators = require("../../../../locators/commonlocators.json");
 const viewWidgetsPage = require("../../../../locators/ViewWidgets.json");
 const publish = require("../../../../locators/publishWidgetspage.json");
-const dsl = require("../../../../fixtures/displayWidgetDsl.json");
+const dsl = require("../../../../fixtures/chartUpdatedDsl.json");
 const pages = require("../../../../locators/Pages.json");
+const modalWidgetPage = require("../../../../locators/ModalWidget.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
 
 describe("Chart Widget Functionality", function() {
   before(() => {
@@ -13,7 +15,8 @@ describe("Chart Widget Functionality", function() {
     cy.openPropertyPane("chartwidget");
   });
 
-  it("Chart Widget Functionality", function() {
+  it("Fill the Chart Widget Properties.", function() {
+    //changing the Chart Name
     /**
      * @param{Text} Random Text
      * @param{ChartWidget}Mouseover
@@ -24,6 +27,7 @@ describe("Chart Widget Functionality", function() {
       viewWidgetsPage.chartWidget,
       commonlocators.containerInnerText,
     );
+    //changing the Chart Title
     /**
      * @param{Text} Random Input Value
      */
@@ -32,23 +36,77 @@ describe("Chart Widget Functionality", function() {
       .contains("App Sign Up")
       .should("have.text", "App Sign Up");
 
-    cy.get(viewWidgetsPage.chartType)
-      .last()
-      .click({ force: true });
+    //Entering the Chart data
+    cy.testJsontext(
+      "chart-series-data-control",
+      JSON.stringify(this.data.chartInput),
+    );
+    cy.get(".t--propertypane").click("right");
 
-    cy.get(commonlocators.dropdownmenu)
-      .children()
-      .contains("Column Chart")
-      .click();
-    cy.get(viewWidgetsPage.chartType)
-      .last()
-      .should("have.text", "Column Chart");
-    cy.testJsontext("chartseries", JSON.stringify(this.data.chartInput));
+    // Asserting Chart Height
     cy.get(viewWidgetsPage.chartWidget)
       .should("be.visible")
       .and((chart) => {
         expect(chart.height()).to.be.greaterThan(200);
       });
+
+    //Entring the label of x-axis
+    cy.get(viewWidgetsPage.xlabel)
+      .click({ force: true })
+      .type(this.data.command)
+      .type(this.data.plan);
+    //Entring the label of y-axis
+    cy.get(viewWidgetsPage.ylabel)
+      .click({ force: true })
+      .type(this.data.command)
+      .type(this.data.ylabel);
+
+    //Close edit prop
+    cy.get(commonlocators.editPropCrossButton).click({ force: true });
+    cy.PublishtheApp();
+  });
+
+  it("Pie Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.UpdateChartType("Pie Chart");
+
+    //Verifying X-axis labels
+    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .last()
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.PieChartLabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+    cy.PublishtheApp();
+  });
+
+  it("Line Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.UpdateChartType("Line Chart");
+
+    //Verifying X-axis labels
+    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .last()
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.Chartlabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+    cy.PublishtheApp();
+  });
+
+  it("Bar Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.UpdateChartType("Bar Chart");
+
+    //Verifying X-axis labels
     cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
     const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
     [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
@@ -59,74 +117,273 @@ describe("Chart Widget Functionality", function() {
         .eq(k)
         .should("have.text", labels[k]);
     });
-    cy.get(viewWidgetsPage.xlabel)
-      .click({ force: true })
-      .type(this.data.command)
-      .type(this.data.plan);
-    cy.get(viewWidgetsPage.ylabel)
-      .click({ force: true })
-      .type(this.data.command)
-      .type(this.data.ylabel);
-
-    //Close edit prop
-    cy.get(commonlocators.editPropCrossButton).click({ force: true });
+    cy.PublishtheApp();
   });
 
-  it("Chart Widget Functionality To Unchecked Visible Widget", function() {
+  it("Area Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.UpdateChartType("Area Chart");
+
+    //Verifying X-axis labels
+    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .last()
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.Chartlabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+    cy.PublishtheApp();
+  });
+
+  it("Column Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.UpdateChartType("Column Chart");
+
+    //Verifying X-axis labels
+    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .eq(k)
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.Chartlabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+    cy.PublishtheApp();
+  });
+
+  it("Toggle JS - Pie Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.get(widgetsPage.toggleChartType).click({ force: true });
+    cy.testJsontext("charttype", "PIE_CHART");
+
+    //Verifying X-axis labels
+    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .last()
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.PieChartLabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+    cy.PublishtheApp();
+  });
+
+  it("Toggle JS - Line Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.testJsontext("charttype", "LINE_CHART");
+
+    //Verifying X-axis labels
+    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .last()
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.Chartlabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+    cy.PublishtheApp();
+  });
+
+  it("Toggle JS - Bar Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.testJsontext("charttype", "BAR_CHART");
+
+    //Verifying X-axis labels
+    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .eq(k)
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.Chartlabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+    cy.PublishtheApp();
+  });
+
+  it("Toggle JS - Area Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.testJsontext("charttype", "AREA_CHART");
+
+    //Verifying X-axis labels
+    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .last()
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.Chartlabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+    cy.PublishtheApp();
+  });
+
+  it("Toggle JS - Column Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.testJsontext("charttype", "COLUMN_CHART");
+
+    //Verifying X-axis labels
+    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .eq(k)
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.Chartlabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+    cy.PublishtheApp();
+  });
+
+  it("Chart - Show Alert Modal", function() {
+    //creating the Alert Modal and verify Modal name
+    cy.createModal("Alert Modal", this.data.AlertModalName);
+    cy.PublishtheApp();
+    cy.get(widgetsPage.chartPlotGroup)
+      .children()
+      .first()
+      .click();
+    cy.get(modalWidgetPage.modelTextField).should(
+      "have.text",
+      this.data.AlertModalName,
+    );
+  });
+
+  it("Chart - Form Modal Validation", function() {
+    //creating the Form Modal and verify Modal name
+    cy.updateModal("Form Modal", this.data.FormModalName);
+    cy.PublishtheApp();
+    cy.get(widgetsPage.chartPlotGroup)
+      .children()
+      .first()
+      .click();
+    cy.get(modalWidgetPage.modelTextField).should(
+      "have.text",
+      this.data.FormModalName,
+    );
+  });
+
+  it("Chart-Unckeck Visible field Validation", function() {
+    // Making the widget invisible
     cy.togglebarDisable(commonlocators.visibleCheckbox);
     cy.PublishtheApp();
     cy.get(publish.chartWidget).should("not.exist");
-    cy.get(publish.backToEditor).click();
   });
-  it("Chart Widget Functionality To Check Visible Widget", function() {
+
+  it("Chart-Check Visible field Validation", function() {
+    // Making the widget visible
     cy.togglebar(commonlocators.visibleCheckbox);
     cy.PublishtheApp();
     cy.get(publish.chartWidget).should("be.visible");
-    cy.get(publish.backToEditor).click();
   });
+
+  it("Toggle JS - Chart-Unckeck Visible field Validation", function() {
+    //Uncheck the disabled checkbox using JS and validate
+    cy.get(widgetsPage.toggleVisible).click({ force: true });
+    cy.EditWidgetPropertiesUsingJS(widgetsPage.inputToggleVisible, "false");
+    cy.PublishtheApp();
+    cy.get(publish.chartWidget).should("not.exist");
+  });
+
+  it("Toggle JS - Chart-Check Visible field Validation", function() {
+    //Check the disabled checkbox using JS and Validate
+    cy.EditWidgetPropertiesUsingJS(widgetsPage.inputToggleVisible, "true");
+    cy.PublishtheApp();
+    cy.get(publish.chartWidget).should("be.visible");
+  });
+
   it("Chart Widget Functionality To Uncheck Horizontal Scroll Visible", function() {
     cy.togglebarDisable(commonlocators.horizontalScroll);
     cy.PublishtheApp();
     cy.get(publish.horizontalTab).should("not.exist");
-    cy.get(publish.backToEditor).click();
   });
+
   it("Chart Widget Functionality To Check Horizontal Scroll Visible", function() {
     cy.togglebar(commonlocators.horizontalScroll);
     cy.PublishtheApp();
     cy.get(publish.horizontalTab)
       .eq(1)
       .should("exist");
-    cy.get(publish.backToEditor).click();
   });
 
-  it("Chart Widget Custom Config Feature", function() {
-    // Note: This only checks for crashes in custom config
-    cy.get(viewWidgetsPage.chartType)
-      .last()
-      .click({ force: true });
-
-    cy.get(commonlocators.dropdownmenu)
-      .children()
-      .contains("Custom Chart")
-      .click();
-    cy.get(viewWidgetsPage.chartType)
-      .last()
-      .should("have.text", "Custom Chart");
+  it("Custom Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.get(widgetsPage.toggleChartType).click({ force: true });
+    cy.UpdateChartType("Custom Chart");
 
     cy.testJsontext(
       "customfusionchartconfiguration",
       `{{${JSON.stringify(this.data.ChartCustomConfig)}}}`,
     );
-    cy.get(viewWidgetsPage.chartWidget)
-      .should("be.visible")
-      .and((chart) => {
-        expect(chart.height()).to.be.greaterThan(200);
-      });
+
+    //Verifying X-axis labels
     cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .eq(k)
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.Chartlabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+
     //Close edit prop
     cy.get(commonlocators.editPropCrossButton).click();
+    cy.PublishtheApp();
+  });
+
+  it("Toggle JS - Custom Chart Widget Functionality", function() {
+    //changing the Chart type
+    cy.UpdateChartType("Pie Chart");
+    cy.get(widgetsPage.toggleChartType).click({ force: true });
+    cy.testJsontext("charttype", "CUSTOM_FUSION_CHART");
+
+    //Verifying X-axis labels
+    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
+    const labels = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul"];
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
+      cy.get(viewWidgetsPage.rectangleChart)
+        .eq(k)
+        .trigger("mousemove", { force: true });
+      cy.get(viewWidgetsPage.Chartlabel)
+        .eq(k)
+        .should("have.text", labels[k]);
+    });
+
+    //Close edit prop
+    cy.get(commonlocators.editPropCrossButton).click();
+    cy.PublishtheApp();
+  });
+
+  it("Chart-Copy Verification", function() {
+    const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
+    //Copy Chart and verify all properties
+    cy.copyWidget("chartwidget", viewWidgetsPage.chartWidget);
+
+    cy.PublishtheApp();
+  });
+
+  it("Chart-Delete Verification", function() {
+    // Delete the Chart widget
+    cy.deleteWidget(viewWidgetsPage.chartWidget);
+    cy.PublishtheApp();
+    cy.get(viewWidgetsPage.chartWidget).should("not.exist");
+  });
+
+  afterEach(() => {
+    cy.get(publish.backToEditor).click({ force: true });
   });
 });
-afterEach(() => {
-  // put your clean up code if any
-});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Divider_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Divider_spec.js
new file mode 100644
index 0000000000..05bcec35a9
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Divider_spec.js
@@ -0,0 +1,23 @@
+const dsl = require("../../../../fixtures/DividerDsl.json");
+const explorer = require("../../../../locators/explorerlocators.json");
+
+describe("Divider Widget Functionality", function() {
+  beforeEach(() => {
+    cy.addDsl(dsl);
+  });
+
+  it("Add new Divider", () => {
+    cy.get(explorer.addWidget).click();
+    cy.dragAndDropToCanvas("dividerwidget", { x: 300, y: 300 });
+    cy.get(".t--divider-widget").should("exist");
+  });
+
+  it("Open Existing Divider from created Widgets list", () => {
+    cy.get(".bp3-icon-caret-right ~ .t--entity-name:contains(Widgets)").click({
+      multiple: true,
+    });
+    cy.get(".bp3-icon-caret-right ~ .t--entity-name:contains(Divider1)").click({
+      multiple: true,
+    });
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Image_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Image_spec.js
index 747a4e8471..5713afc305 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Image_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Image_spec.js
@@ -23,7 +23,6 @@ describe("Image Widget Functionality", function() {
     );
     cy.get(viewWidgetsPage.defaultImage)
       .click({ force: true })
-      .type(this.data.command)
       .type(this.data.defaultimage);
     /**
      * @param{URL} ImageUrl
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Modal_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Modal_spec.js
index ba257c5ae2..e36c3f6648 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Modal_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Modal_spec.js
@@ -8,7 +8,7 @@ describe("Modal Widget Functionality", function() {
 
   it("Add new Modal", () => {
     cy.get(explorer.addWidget).click();
-    cy.dragAndDropToCanvas("modalwidget", { x: 300, y: -300 });
+    cy.dragAndDropToCanvas("modalwidget", { x: 300, y: 300 });
     cy.get(".t--modal-widget").should("exist");
   });
 
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Column_Resize_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Column_Resize_spec.js
new file mode 100644
index 0000000000..7eb9000870
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Column_Resize_spec.js
@@ -0,0 +1,24 @@
+/* eslint-disable cypress/no-unnecessary-waiting */
+const widgetsPage = require("../../../../locators/Widgets.json");
+const commonlocators = require("../../../../locators/commonlocators.json");
+const publish = require("../../../../locators/publishWidgetspage.json");
+const dsl = require("../../../../fixtures/tableResizedColumnsDsl.json");
+
+describe("Table Widget Functionality with Hidden and Resized Columns", function() {
+  before(() => {
+    cy.addDsl(dsl);
+  });
+
+  it("Table Widget Functionality with Hidden and Resized Columns", function() {
+    cy.PublishtheApp();
+    cy.get(".t--widget-tablewidget")
+      .invoke("outerWidth")
+      .then((tableWidth) => {
+        cy.get(".t--widget-tablewidget .thead .tr")
+          .invoke("outerWidth")
+          .then((width) => {
+            expect(width).to.be.at.least(tableWidth);
+          });
+      });
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Derived_Column_Data_validation_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Derived_Column_Data_validation_spec.js
index 2104fa8e76..d57c23fac3 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Derived_Column_Data_validation_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Derived_Column_Data_validation_spec.js
@@ -43,13 +43,12 @@ describe("Test Create Api and Bind to Table widget", function() {
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(1000);
     cy.toggleJsAndUpdate("tabledata", "Green");
-    cy.get(commonlocators.editPropCrossButton).click();
+    cy.get(".t--property-pane-back-btn").click({ force: true });
     cy.wait("@updateLayout");
     cy.readTabledataValidateCSS("1", "0", "background-color", "rgb(0, 128, 0)");
   });
 
   it("Edit column name and validate test for computed value based on column type selected", function() {
-    cy.SearchEntityandOpen("Table1");
     cy.editColumn("customColumn1");
     cy.readTabledataPublish("1", "9").then((tabData) => {
       const tabValue = tabData;
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_MultiRowSelect_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_MultiRowSelect_spec.js
new file mode 100644
index 0000000000..fc09a9fbe5
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_MultiRowSelect_spec.js
@@ -0,0 +1,46 @@
+const widgetsPage = require("../../../../locators/Widgets.json");
+const dsl = require("../../../../fixtures/tableNewDsl.json");
+
+describe("Table Widget row multi select validation", function() {
+  before(() => {
+    cy.addDsl(dsl);
+  });
+
+  it("Test multi select column shows when enableMultirowselection is true", function() {
+    cy.openPropertyPane("tablewidget");
+    cy.get(widgetsPage.toggleEnableMultirowselection)
+      .first()
+      .click({ force: true });
+    cy.get(".t--table-multiselect-header")
+      .first()
+      .should("be.visible");
+
+    cy.get(".t--table-multiselect")
+      .first()
+      .should("be.visible");
+  });
+
+  it("Test click on header cell selects all row", function() {
+    // click on header check cell
+    cy.get(".t--table-multiselect-header")
+      .first()
+      .click({ force: true });
+    // check if rows selected
+    cy.get(".tr").should("have.class", "selected-row");
+  });
+
+  it("Test click on single row cell changes header select cell state", function() {
+    // un select all rows
+    cy.get(".t--table-multiselect-header")
+      .first()
+      .click({ force: true });
+    // click on first row select box
+    cy.get(".t--table-multiselect")
+      .first()
+      .click({ force: true });
+    // check if header cell is in half check state
+    cy.get(".t--table-multiselect-header-half-check-svg")
+      .first()
+      .should("be.visible");
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Widget_Copy_Paste_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Widget_Copy_Paste_spec.js
index e398325e27..15a1cff837 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Widget_Copy_Paste_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_Widget_Copy_Paste_spec.js
@@ -32,19 +32,24 @@ describe("Test Suite to validate copy/paste table Widget", function() {
       200,
     );
     cy.get(commonlocators.toastAction).should("be.visible");
+
+    //Check after copying new table widget should not have any warnings
+    cy.get('.t--widget-propertypane-toggle [name="warning"]').should(
+      "not.exist",
+    );
     /*
     cy.get(commonlocators.toastAction)
       .contains("UNDO")
       .click({ force: true });
     */
-    cy.GlobalSearchEntity("Table2");
+    cy.GlobalSearchEntity("Table1Copy");
     cy.get(".t--entity-collapse-toggle")
       .last()
       .click();
     cy.get(apiwidget.propertyList).then(function($lis) {
       expect($lis).to.have.length(8);
-      expect($lis.eq(0)).to.contain("{{Table2.selectedRow}}");
-      expect($lis.eq(1)).to.contain("{{Table2.selectedRows}}");
+      expect($lis.eq(0)).to.contain("{{Table1Copy.selectedRow}}");
+      expect($lis.eq(1)).to.contain("{{Table1Copy.selectedRows}}");
     });
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_spec.js
index 1bfbed6a6b..d46969722f 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_spec.js
@@ -3,7 +3,6 @@ const widgetsPage = require("../../../../locators/Widgets.json");
 const commonlocators = require("../../../../locators/commonlocators.json");
 const publish = require("../../../../locators/publishWidgetspage.json");
 const dsl = require("../../../../fixtures/tableWidgetDsl.json");
-const pages = require("../../../../locators/Pages.json");
 
 describe("Table Widget Functionality", function() {
   before(() => {
@@ -83,7 +82,9 @@ describe("Table Widget Functionality", function() {
       cy.wait(5000);
       cy.get(publish.searchInput)
         .first()
-        .clear()
+        .within(() => {
+          return cy.get("input").clear();
+        })
         .type("7434532");
       // eslint-disable-next-line cypress/no-unnecessary-waiting
       cy.wait(1000);
@@ -97,7 +98,9 @@ describe("Table Widget Functionality", function() {
   it("Table Widget Functionality To Filter The Data", function() {
     cy.get(publish.searchInput)
       .first()
-      .clear();
+      .within(() => {
+        return cy.get("input").clear();
+      });
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(1000);
     cy.isSelectRow(1);
@@ -261,16 +264,16 @@ describe("Table Widget Functionality", function() {
       const tabValue = tabData;
       expect(tabValue).to.be.equal("Lindsay Ferguson");
       cy.log("the value is" + tabValue);
-      cy.get(publish.compactMode).click();
-      cy.get(publish.compactOpt)
+      cy.get(publish.rowHeight).click();
+      cy.get(publish.rowHeightOpt)
         .contains("Tall")
         .click();
       cy.scrollTabledataPublish("3", "3").then((tabData) => {
         const tabValue = tabData;
         expect(tabValue).to.be.equal("Byron Fields");
       });
-      cy.get(publish.compactMode).click();
-      cy.get(publish.compactOpt)
+      cy.get(publish.rowHeight).click();
+      cy.get(publish.rowHeightOpt)
         .contains("Short")
         .click();
       cy.readTabledataPublish("4", "3").then((tabData) => {
@@ -282,7 +285,7 @@ describe("Table Widget Functionality", function() {
 
   /*
   To enabled later
-  
+
   it("Table Widget Functionality To Verify The Visiblity mode functionality", function() {
     cy.get(publish.backToEditor)
       .first()
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Text_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Text_spec.js
index 2732da5b7c..e0e0885887 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Text_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Text_spec.js
@@ -36,7 +36,19 @@ describe("Text Widget Functionality", function() {
       .should("have.css", "font-size", "24px");
   });
 
+  it("Text Email Parsing Validation", function() {
+    cy.testCodeMirror("ab.end@domain.com");
+    cy.wait("@updateLayout");
+    cy.PublishtheApp();
+    cy.get(commonlocators.headingTextStyle + " a").should(
+      "have.attr",
+      "href",
+      "mailto:ab.end@domain.com",
+    );
+  });
+
   it("Text-TextStyle Label Validation", function() {
+    cy.testCodeMirror(this.data.TextLabelValue);
     //Changing the Text Style's and validating
     cy.ChangeTextStyle(
       this.data.TextLabel,
@@ -61,33 +73,33 @@ describe("Text Widget Functionality", function() {
       .should("have.css", "font-size", "18px");
   });
 
-  // it("Text widget depends on itself", function() {
-  //   cy.getCodeMirror().then(($cm) => {
-  //     if ($cm.val() !== "") {
-  //       cy.get(".CodeMirror textarea")
-  //         .first()
-  //         .clear({
-  //           force: true,
-  //         });
-  //     }
-  //
-  //     cy.get(".CodeMirror textarea")
-  //       .first()
-  //       .type(`{{${this.data.TextName}}}`, {
-  //         force: true,
-  //         parseSpecialCharSequences: false,
-  //       });
-  //   });
-  //   cy.get(commonlocators.toastBody)
-  //     .first()
-  //     .contains("Cyclic");
-  //
-  //   cy.PublishtheApp();
-  //   cy.get(commonlocators.bodyTextStyle).should(
-  //     "have.text",
-  //     `{{${this.data.TextName}}}`,
-  //   );
-  // });
+  it("Text widget depends on itself", function() {
+    cy.getCodeMirror().then(($cm) => {
+      if ($cm.val() !== "") {
+        cy.get(".CodeMirror textarea")
+          .first()
+          .clear({
+            force: true,
+          });
+      }
+
+      cy.get(".CodeMirror textarea")
+        .first()
+        .type(`{{${this.data.TextName}}}`, {
+          force: true,
+          parseSpecialCharSequences: false,
+        });
+    });
+    cy.get(commonlocators.toastBody)
+      .first()
+      .contains("Cyclic");
+
+    cy.PublishtheApp();
+    cy.get(commonlocators.bodyTextStyle).should(
+      "have.text",
+      `{{${this.data.TextName}}}`,
+    );
+  });
 
   afterEach(() => {
     cy.get(publishPage.backToEditor).click({ force: true });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/video_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/video_spec.js
index 5ee9895da8..1f657612e3 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/video_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/video_spec.js
@@ -51,7 +51,7 @@ describe("Video Widget Functionality", function() {
     cy.get(".CodeMirror textarea")
       .first()
       .blur();
-    cy.get(widgetsPage.autoPlay).click();
+    cy.get(widgetsPage.autoPlay).click({ force: true });
     cy.wait("@updateLayout").should(
       "have.nested.property",
       "response.body.responseMeta.status",
@@ -62,7 +62,7 @@ describe("Video Widget Functionality", function() {
     cy.get(commonlocators.toastMsg).should("be.visible");
     cy.get(commonlocators.toastMsg).contains("Play success");
     */
-    cy.get(widgetsPage.autoPlay).click();
+    cy.get(widgetsPage.autoPlay).click({ force: true });
     cy.wait("@updateLayout").should(
       "have.nested.property",
       "response.body.responseMeta.status",
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DynamicInput/autocomplete_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DynamicInput/autocomplete_spec.js
index 6f2e0eebfd..ecc7c5d252 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DynamicInput/autocomplete_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DynamicInput/autocomplete_spec.js
@@ -6,29 +6,23 @@ const dynamicInputLocators = require("../../../../locators/DynamicInput.json");
 const apiwidget = require("../../../../locators/apiWidgetslocator.json");
 
 describe("Dynamic input autocomplete", () => {
-  beforeEach(() => {
+  before(() => {
     cy.addDsl(dsl);
   });
   it("opens autocomplete for bindings", () => {
     cy.openPropertyPane("buttonwidget");
     cy.get(dynamicInputLocators.input)
       .first()
-      .focus()
-      .type("{ctrl}{shift}{downarrow}")
-      .then(($cm) => {
-        if ($cm.val() !== "") {
-          cy.get(dynamicInputLocators.input)
-            .first()
-            .clear({
-              force: true,
-            });
-        }
-
+      .click({ force: true })
+      .type("{uparrow}", { parseSpecialCharSequences: true })
+      .type("{ctrl}{shift}{downarrow}", { parseSpecialCharSequences: true })
+      .type("{backspace}", { parseSpecialCharSequences: true })
+      .then(() => {
         cy.get(dynamicInputLocators.input)
           .first()
+          .click({ force: true })
           .type("{{", {
-            force: true,
-            parseSpecialCharSequences: false,
+            parseSpecialCharSequences: true,
           });
 
         // Tests if autocomplete will open
@@ -36,15 +30,17 @@ describe("Dynamic input autocomplete", () => {
 
         // Tests if data tree entities are sorted
         cy.get(`${dynamicInputLocators.hints} li`)
-          .first()
-          .should("have.text", "Aditya");
+          .eq(1)
+          .should("have.text", "Aditya.backgroundColor");
 
         // Tests if "No suggestions" message will pop if you type any garbage
         cy.get(dynamicInputLocators.input)
           .first()
-          .type("garbage", {
-            force: true,
-            parseSpecialCharSequences: false,
+          .click({ force: true })
+          .type("{uparrow}", { parseSpecialCharSequences: true })
+          .type("{ctrl}{shift}{downarrow}", { parseSpecialCharSequences: true })
+          .type("{{ garbage", {
+            parseSpecialCharSequences: true,
           })
           .then(() => {
             cy.get(".CodeMirror-Tern-tooltip").should(
@@ -53,21 +49,16 @@ describe("Dynamic input autocomplete", () => {
             );
           });
       });
+    cy.evaluateErrorMessage("ReferenceError: garbage is not defined");
   });
   it("opens current value popup", () => {
-    // Test on widgets pane
-    cy.openPropertyPane("buttonwidget");
-    cy.get(dynamicInputLocators.input)
-      .first()
-      .focus();
-    cy.assertEvaluatedValuePopup("string");
     // Test on api pane
     cy.NavigateToAPI_Panel();
     cy.get(apiwidget.createapi).click({ force: true });
     cy.wait("@createNewApi");
-    cy.xpath(apiwidget.headerValue)
-      .first()
-      .focus();
+    cy.get(apiwidget.headerValue).within(() => {
+      cy.get("textarea").click({ force: true });
+    });
     cy.assertEvaluatedValuePopup("string");
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_DragAndDropWidget_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_DragAndDropWidget_spec.js
index a2d387bd31..ae64c14c37 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_DragAndDropWidget_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_DragAndDropWidget_spec.js
@@ -1,5 +1,6 @@
 const testdata = require("../../../../fixtures/testdata.json");
 const apiwidget = require("../../../../locators/apiWidgetslocator.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
 const explorer = require("../../../../locators/explorerlocators.json");
 const commonlocators = require("../../../../locators/commonlocators.json");
 const formWidgetsPage = require("../../../../locators/FormWidgets.json");
@@ -15,7 +16,8 @@ describe("Entity explorer Drag and Drop widgets testcases", function() {
     cy.get(commonlocators.entityExplorersearch)
       .clear()
       .type("form");
-    cy.dragAndDropToCanvas("formwidget", { x: 300, y: -300 });
+    cy.dragAndDropToCanvas("formwidget", { x: 300, y: 80 });
+    cy.get(formWidgetsPage.formD).click();
     /**
      * @param{Text} Random Text
      * @param{FormWidget}Mouseover
@@ -29,10 +31,13 @@ describe("Entity explorer Drag and Drop widgets testcases", function() {
     /**
      * @param{Text} Random Colour
      */
-    cy.testCodeMirror(this.data.colour);
+    cy.get(widgetsPage.backgroundcolorPicker)
+      .first()
+      .click({ force: true });
+    cy.xpath(widgetsPage.greenColor).click();
     cy.get(formWidgetsPage.formD)
       .should("have.css", "background-color")
-      .and("eq", this.data.rgbValue);
+      .and("eq", "rgb(3, 179, 101)");
     /**
      * @param{toggleButton Css} Assert to be checked
      */
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Query_Datasource_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Query_Datasource_spec.js
index f094bf74d7..01ddf0a9b5 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Query_Datasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Query_Datasource_spec.js
@@ -5,6 +5,7 @@ const datasource = require("../../../../locators/DatasourcesEditor.json");
 const apiwidget = require("../../../../locators/apiWidgetslocator.json");
 const commonlocators = require("../../../../locators/commonlocators.json");
 const explorer = require("../../../../locators/explorerlocators.json");
+const pages = require("../../../../locators/Pages.json");
 
 const pageid = "MyPage";
 let datasourceName;
@@ -59,7 +60,7 @@ describe("Entity explorer tests related to query and datasource", function() {
 
     /* eslint-disable */
     cy.wait(2000);
-    cy.go("back");
+    cy.NavigateToQueryEditor();
 
     cy.contains(".t--datasource-name", datasourceName)
       .find(queryLocators.editDatasourceButton)
@@ -101,10 +102,11 @@ describe("Entity explorer tests related to query and datasource", function() {
       .find(explorer.collapse)
       .click();
     cy.get(apiwidget.propertyList).then(function($lis) {
-      expect($lis).to.have.length(3);
+      expect($lis).to.have.length(4);
       expect($lis.eq(0)).to.contain("{{Query1.isLoading}}");
       expect($lis.eq(1)).to.contain("{{Query1.data}}");
-      expect($lis.eq(2)).to.contain("{{Query1.run()}}");
+      expect($lis.eq(2)).to.contain("{{Query1.responseMeta}}");
+      expect($lis.eq(3)).to.contain("{{Query1.run()}}");
     });
     cy.Createpage(pageid);
     cy.GlobalSearchEntity("Query1");
@@ -120,7 +122,12 @@ describe("Entity explorer tests related to query and datasource", function() {
     cy.runQuery();
 
     cy.deleteQuery();
-
+    cy.get(commonlocators.entityExplorersearch).clear({ force: true });
+    cy.wait(500);
+    cy.NavigateToQueryEditor();
+    cy.get(pages.integrationActiveTab)
+      .should("be.visible")
+      .click({ force: true });
     cy.contains(".t--datasource-name", datasourceName)
       .find(".t--edit-datasource")
       .click();
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Tab_rename_Delete_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Tab_rename_Delete_spec.js
index 178635df67..1b0841806c 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Tab_rename_Delete_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Tab_rename_Delete_spec.js
@@ -31,10 +31,9 @@ describe("Tab widget test", function() {
     cy.RenameEntity(tabname);
     cy.validateMessage(tabname);
     cy.deleteEntity();
-    cy.get(commonlocators.entityExplorersearch).should("be.visible");
     cy.get(commonlocators.entityExplorersearch)
-      .clear()
-      .type("Tab 2");
+      .clear({ force: true })
+      .type("Tab 2", { force: true });
     cy.get(
       commonlocators.entitySearchResult.concat("Tab 2").concat("')"),
     ).should("not.exist");
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Widgets_Copy_Paste_Delete_Undo_Keyboard_Event_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Widgets_Copy_Paste_Delete_Undo_Keyboard_Event_spec.js
index c6627d91bf..2a4774093a 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Widgets_Copy_Paste_Delete_Undo_Keyboard_Event_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Widgets_Copy_Paste_Delete_Undo_Keyboard_Event_spec.js
@@ -28,7 +28,8 @@ describe("Test Suite to validate copy/delete/undo functionalites", function() {
     cy.wait(500);
     cy.get(commonlocators.toastBody)
       .first()
-      .contains("Copied");
+      .contains("Copied")
+      .click();
     cy.get("body").type(`{${modifierKey}}v`, { force: true });
     cy.wait("@updateLayout").should(
       "have.nested.property",
@@ -45,11 +46,11 @@ describe("Test Suite to validate copy/delete/undo functionalites", function() {
     cy.get(commonlocators.toastAction)
       .contains("UNDO")
       .click({ force: true });
-    cy.GlobalSearchEntity("Form1");
+    cy.GlobalSearchEntity("FormTestCopy");
     cy.get(apiwidget.propertyList).then(function($lis) {
       expect($lis).to.have.length(2);
-      expect($lis.eq(0)).to.contain("{{Form1.isVisible}}");
-      expect($lis.eq(1)).to.contain("{{Form1.data}}");
+      expect($lis.eq(0)).to.contain("{{FormTestCopy.isVisible}}");
+      expect($lis.eq(1)).to.contain("{{FormTestCopy.data}}");
     });
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Button_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Button_spec.js
index f7cecc69a4..3309634c54 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Button_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Button_spec.js
@@ -5,6 +5,8 @@ const homePage = require("../../../../locators/HomePage.json");
 const pages = require("../../../../locators/Pages.json");
 const publishPage = require("../../../../locators/publishWidgetspage.json");
 const modalWidgetPage = require("../../../../locators/ModalWidget.json");
+const datasource = require("../../../../locators/DatasourcesEditor.json");
+const queryLocators = require("../../../../locators/QueryEditor.json");
 
 describe("Button Widget Functionality", function() {
   before(() => {
@@ -15,6 +17,20 @@ describe("Button Widget Functionality", function() {
     cy.openPropertyPane("buttonwidget");
   });
 
+  it("Button-Style Validation", function() {
+    //Changing the style of the button from the property pane and verify it's color.
+    // Change to Secondary button sytle
+    cy.changeButtonStyle(2, "rgba(0, 0, 0, 0)", "rgba(0, 0, 0, 0)");
+    cy.get(publishPage.backToEditor).click({ force: true });
+    // Change to Danger button sytle
+    cy.openPropertyPane("buttonwidget");
+    cy.changeButtonStyle(3, "rgb(179, 3, 56)", "rgb(139, 2, 43)");
+    cy.get(publishPage.backToEditor).click({ force: true });
+    // Change to Primary button sytle
+    cy.openPropertyPane("buttonwidget");
+    cy.changeButtonStyle(1, "rgb(3, 179, 101)", "rgb(2, 139, 78)");
+  });
+
   it("Button-Name validation", function() {
     //changing the Button Name
     cy.widgetText(
@@ -71,6 +87,35 @@ describe("Button Widget Functionality", function() {
     );
   });
 
+  it("Toggle JS - Button-Disable Validation", function() {
+    //Check the disabled checkbox by using JS widget and Validate
+    cy.get(widgetsPage.toggleDisable).click({ force: true });
+    cy.EditWidgetPropertiesUsingJS(widgetsPage.inputToggleDisable, "true");
+    cy.validateDisableWidget(
+      widgetsPage.buttonWidget,
+      commonlocators.disabledField,
+    );
+    cy.PublishtheApp();
+    cy.validateDisableWidget(
+      publishPage.buttonWidget,
+      commonlocators.disabledField,
+    );
+  });
+
+  it("Toggle JS - Button-Enable Validation", function() {
+    //Uncheck the disabled checkbox and validate
+    cy.EditWidgetPropertiesUsingJS(widgetsPage.inputToggleDisable, "false");
+    cy.validateEnableWidget(
+      widgetsPage.buttonWidget,
+      commonlocators.disabledField,
+    );
+    cy.PublishtheApp();
+    cy.validateEnableWidget(
+      publishPage.buttonWidget,
+      commonlocators.disabledField,
+    );
+  });
+
   it("Button-Unckeck Visible field Validation", function() {
     //Uncheck the disabled checkbox and validate
     cy.UncheckWidgetProperties(commonlocators.visibleCheckbox);
@@ -85,6 +130,21 @@ describe("Button Widget Functionality", function() {
     cy.get(publishPage.buttonWidget).should("be.visible");
   });
 
+  it("Toggle JS - Button-Unckeck Visible field Validation", function() {
+    //Uncheck the disabled checkbox using JS and validate
+    cy.get(widgetsPage.toggleVisible).click({ force: true });
+    cy.EditWidgetPropertiesUsingJS(widgetsPage.inputToggleVisible, "false");
+    cy.PublishtheApp();
+    cy.get(publishPage.buttonWidget).should("not.exist");
+  });
+
+  it("Toggle JS - Button-Check Visible field Validation", function() {
+    //Check the disabled checkbox using JS and Validate
+    cy.EditWidgetPropertiesUsingJS(widgetsPage.inputToggleVisible, "true");
+    cy.PublishtheApp();
+    cy.get(publishPage.buttonWidget).should("be.visible");
+  });
+
   it("Button-AlertModal Validation", function() {
     //creating the Alert Modal and verify Modal name
     cy.createModal("Alert Modal", this.data.AlertModalName);
@@ -107,6 +167,124 @@ describe("Button Widget Functionality", function() {
     );
   });
 
+  it("Button-CallAnApi Validation", function() {
+    //creating an api and calling it from the onClickAction of the button widget.
+    // Creating the api
+    cy.NavigateToAPI_Panel();
+    cy.CreateAPI("buttonApi");
+    cy.log("Creation of buttonApi Action successful");
+    cy.enterDatasourceAndPath(this.data.paginationUrl, "users?page=4&size=3");
+    cy.SaveAndRunAPI();
+
+    // Going to HomePage where the button widget is located and opeing it's property pane.
+    cy.get(widgetsPage.NavHomePage).click({ force: true });
+    cy.reload();
+    cy.openPropertyPane("buttonwidget");
+
+    // Adding the api in the onClickAction of the button widget.
+    cy.addAPIFromLightningMenu("buttonApi");
+    // Filling the messages for success/failure in the onClickAction of the button widget.
+    cy.onClickActions("Success", "Error");
+
+    cy.PublishtheApp();
+
+    // Clicking the button to verify the success message
+    cy.get(publishPage.buttonWidget).click();
+    cy.get(widgetsPage.apiCallToast).should("have.text", "Success");
+  });
+
+  it("Button-Call-Query Validation", function() {
+    //creating a query and calling it from the onClickAction of the button widget.
+    // Creating a mock query
+    // cy.CreateMockQuery("Query1");
+    let postgresDatasourceName;
+
+    cy.startRoutesForDatasource();
+    cy.NavigateToDatasourceEditor();
+    cy.get(datasource.PostgreSQL).click();
+    cy.generateUUID().then((uid) => {
+      postgresDatasourceName = uid;
+
+      cy.get(".t--edit-datasource-name").click();
+      cy.get(".t--edit-datasource-name input")
+        .clear()
+        .type(postgresDatasourceName, { force: true })
+        .should("have.value", postgresDatasourceName)
+        .blur();
+    });
+    cy.wait("@saveDatasource").should(
+      "have.nested.property",
+      "response.body.responseMeta.status",
+      200,
+    );
+    cy.fillPostgresDatasourceForm();
+    cy.saveDatasource();
+
+    cy.CreateMockQuery("Query1");
+
+    // Going to HomePage where the button widget is located and opeing it's property pane.
+    cy.get(widgetsPage.NavHomePage).click({ force: true });
+    cy.reload();
+    cy.openPropertyPane("buttonwidget");
+
+    // Adding the query in the onClickAction of the button widget.
+    cy.addQueryFromLightningMenu("Query1");
+    // Filling the messages for success/failure in the onClickAction of the button widget.
+    cy.onClickActions("Success", "Error");
+
+    cy.PublishtheApp();
+
+    // Clicking the button to verify the success message
+    cy.get(publishPage.buttonWidget).click();
+    cy.get(widgetsPage.apiCallToast).should("have.text", "Success");
+  });
+
+  it("Toggle JS - Button-CallAnApi Validation", function() {
+    //creating an api and calling it from the onClickAction of the button widget.
+    // calling the existing api
+    cy.get(widgetsPage.toggleOnClick).click({ force: true });
+    cy.testJsontext(
+      "onclick",
+      "{{buttonApi.run(() => showAlert('Success','success'), () => showAlert('Error','error'))}}",
+    );
+
+    cy.PublishtheApp();
+
+    // Clicking the button to verify the success message
+    cy.get(publishPage.buttonWidget).click();
+    cy.get(widgetsPage.apiCallToast).should("have.text", "Success");
+  });
+
+  it("Toggle JS - Button-Call-Query Validation", function() {
+    //creating a query and calling it from the onClickAction of the button widget.
+    // Creating a mock query
+    cy.testJsontext(
+      "onclick",
+      "{{Query1.run(() => showAlert('Success','success'), () => showAlert('Error','error'))}}",
+    );
+
+    cy.PublishtheApp();
+
+    // Clicking the button to verify the success message
+    cy.get(publishPage.buttonWidget).click();
+    cy.get(widgetsPage.apiCallToast).should("have.text", "Success");
+  });
+
+  it("Button-Copy Verification", function() {
+    const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
+    //Copy button and verify all properties
+    cy.copyWidget("buttonwidget", widgetsPage.buttonWidget);
+
+    cy.PublishtheApp();
+  });
+
+  it("Button-Delete Verification", function() {
+    // Delete the button widget
+    cy.deleteWidget(widgetsPage.buttonWidget);
+    cy.PublishtheApp();
+    cy.get(widgetsPage.buttonWidget).should("not.exist");
+  });
+
   afterEach(() => {
     cy.get(publishPage.backToEditor).click({ force: true });
   });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckBox_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckBox_spec.js
index e987207b66..f3503292c7 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckBox_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckBox_spec.js
@@ -81,7 +81,7 @@ describe("Checkbox Widget Functionality", function() {
     cy.get(publish.checkboxWidget).click();
     cy.get(widgetsPage.formButtonWidget)
       .contains("Submit")
-      .should("have.attr", "disabled");
+      .should("have.class", "bp3-disabled");
 
     cy.get(publish.checkboxWidget).click();
     cy.get(widgetsPage.formButtonWidget)
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_spec.js
index 1f8676f85c..0208539c48 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_spec.js
@@ -74,13 +74,44 @@ describe("DatePicker Widget Property pane tests with js bindings", function() {
     cy.get(".t--property-control-defaultdate .bp3-input").type("2020-02-01");
     cy.closePropertyPane();
     cy.openPropertyPane("datepickerwidget2");
-    cy.get(formWidgetsPage.toggleJsMinDate).click();
+    cy.get(formWidgetsPage.toggleJsMinDate).click({ force: true });
     cy.get(".t--property-control-mindate .bp3-input").type("2020-01-01");
-    cy.get(formWidgetsPage.toggleJsMaxDate).click();
+    cy.get(formWidgetsPage.toggleJsMaxDate).click({ force: true });
     cy.get(".t--property-control-maxdate .bp3-input").type("2020-02-10");
     cy.closePropertyPane();
   });
 
+  it("Datepicker input value changes to work with selected date formats", function() {
+    cy.openPropertyPane("datepickerwidget2");
+    cy.get(".t--property-control-mindate .bp3-input")
+      .clear()
+      .type("2021-01-01");
+    cy.closePropertyPane();
+    cy.openPropertyPane("datepickerwidget2");
+    cy.get(".t--property-control-maxdate .bp3-input")
+      .clear()
+      .type("2021-10-10");
+    cy.closePropertyPane();
+    cy.openPropertyPane("datepickerwidget2");
+    cy.get(".t--property-control-defaultdate .bp3-input").clear();
+    cy.selectDateFormat("DD/MM/YYYY HH:mm");
+    cy.get(formWidgetsPage.toggleJsDefaultDate).click();
+    cy.testJsontext(
+      "defaultdate",
+      '{{moment("04/05/2021 05:25", "DD/MM/YYYY HH:mm").toISOString()}}',
+    );
+    cy.get(".t--draggable-datepickerwidget2 .bp3-input")
+      .clear({
+        force: true,
+      })
+      .type("04/05/2021 06:25");
+    cy.selectDateFormat("LLL");
+    cy.wait("@updateLayout");
+    cy.get(".t--draggable-textwidget .bp3-ui-text")
+      .first()
+      .should("have.text", "May 4, 2021 6:25 AM");
+  });
+
   it("Datepicker default date validation with js binding", function() {
     cy.PublishtheApp();
     // eslint-disable-next-line cypress/no-unnecessary-waiting
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/FormWidget_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/FormWidget_spec.js
index 50bef3f6c9..70cef20567 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/FormWidget_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/FormWidget_spec.js
@@ -3,6 +3,7 @@ const formWidgetsPage = require("../../../../locators/FormWidgets.json");
 const publish = require("../../../../locators/publishWidgetspage.json");
 const dsl = require("../../../../fixtures/formdsl.json");
 const pages = require("../../../../locators/Pages.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
 
 describe("Form Widget Functionality", function() {
   before(() => {
@@ -23,10 +24,13 @@ describe("Form Widget Functionality", function() {
     /**
      * @param{Text} Random Colour
      */
-    cy.testCodeMirror(this.data.colour);
+    cy.get(widgetsPage.backgroundcolorPicker)
+      .first()
+      .click({ force: true });
+    cy.xpath(widgetsPage.greenColor).click();
     cy.get(formWidgetsPage.formD)
       .should("have.css", "background-color")
-      .and("eq", this.data.rgbValue);
+      .and("eq", "rgb(3, 179, 101)");
     /**
      * @param{toggleButton Css} Assert to be checked
      */
@@ -40,7 +44,7 @@ describe("Form Widget Functionality", function() {
   it("Form Widget Functionality To Verify The Colour", function() {
     cy.get(formWidgetsPage.formD)
       .should("have.css", "background-color")
-      .and("eq", this.data.rgbValue);
+      .and("eq", "rgb(3, 179, 101)");
   });
   it("Form Widget Functionality To Unchecked Visible Widget", function() {
     cy.get(publish.backToEditor).click();
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Radio_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Radio_spec.js
index cf11fdd239..32b67709b9 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Radio_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Radio_spec.js
@@ -49,7 +49,6 @@ describe("Radio Widget Functionality", function() {
     cy.get(formWidgetsPage.radioOnSelectionChangeDropdown)
       .get(commonlocators.dropdownSelectButton)
       .click({ force: true })
-      .type(this.data.command)
       .type("2");
     cy.PublishtheApp();
   });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/RichTextEditor_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/RichTextEditor_spec.js
index 6f186627f0..3377ba5c83 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/RichTextEditor_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/RichTextEditor_spec.js
@@ -29,17 +29,6 @@ describe("RichTextEditor Widget Functionality", function() {
       "h1",
       "This is a Heading",
     );
-
-    // validate after reload
-    cy.reload(true);
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(2000);
-    cy.validateHTMLText(
-      formWidgetsPage.richTextEditorWidget,
-      "h1",
-      "This is a Heading",
-    );
-
     cy.PublishtheApp();
     cy.validateHTMLText(
       publishPage.richTextEditorWidget,
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GlobalSearch/GlobalSearch_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GlobalSearch/GlobalSearch_spec.js
index 3f60f9e819..19986c87ad 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GlobalSearch/GlobalSearch_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GlobalSearch/GlobalSearch_spec.js
@@ -42,8 +42,8 @@ describe("GlobalSearch", function() {
       .its("store")
       .invoke("getState")
       .then((state) => {
-        const { selectedWidget } = state.ui.widgetDragResize;
-        expect(selectedWidget).to.be.equal(table.widgetId);
+        const { lastSelectedWidget } = state.ui.widgetDragResize;
+        expect(lastSelectedWidget).to.be.equal(table.widgetId);
       });
   });
 
@@ -119,5 +119,6 @@ describe("GlobalSearch", function() {
           expect(loc.pathname).includes(expectedPage.pageId);
         });
       });
+    cy.NavigateToHome();
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/LayoutWidgets/Tab_new_scenario_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/LayoutWidgets/Tab_new_scenario_spec.js
new file mode 100644
index 0000000000..4dddb88105
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/LayoutWidgets/Tab_new_scenario_spec.js
@@ -0,0 +1,40 @@
+const commonlocators = require("../../../../locators/commonlocators.json");
+const Layoutpage = require("../../../../locators/Layout.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
+const publish = require("../../../../locators/publishWidgetspage.json");
+const dsl = require("../../../../fixtures/tabsWithWidgetDsl.json");
+const pages = require("../../../../locators/Pages.json");
+const modalWidgetPage = require("../../../../locators/ModalWidget.json");
+
+describe("Tab widget test", function() {
+  before(() => {
+    cy.addDsl(dsl);
+  });
+  it("Tab Widget Functionality Test with Modal on change of selected tab", function() {
+    cy.openPropertyPane("tabswidget");
+    cy.widgetText("tab", Layoutpage.tabWidget, Layoutpage.tabInput);
+    cy.AddActionWithModal();
+    cy.get(".t--widget-buttonwidget:contains('Confirm')").click({
+      force: true,
+    });
+  });
+
+  it("Publih the app and validate the widgets displayed under each tab", function() {
+    cy.PublishtheApp();
+    cy.get(publish.buttonWidget).should("be.visible");
+    cy.get(publish.textWidget).should("be.visible");
+    cy.get(publish.datePickerNew).should("be.visible");
+    cy.get(publish.tab)
+      .contains("Tab 2")
+      .click({ force: true });
+    cy.get(publish.checkboxWidget).should("be.visible");
+    cy.get(publish.radioWidget).should("be.visible");
+    cy.get(publish.buttonWidget)
+      .contains("Confirm")
+      .click({ force: true });
+  });
+});
+
+afterEach(() => {
+  // put your clean up code if any
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/LayoutWidgets/Tab_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/LayoutWidgets/Tab_spec.js
index c777b51360..6261817622 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/LayoutWidgets/Tab_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/LayoutWidgets/Tab_spec.js
@@ -60,9 +60,9 @@ describe("Tab widget test", function() {
       .contains(this.data.tabName)
       .click({ force: true })
       .should("be.selected");
+    cy.get(publish.backToEditor).click();
   });
   it("Tab Widget Functionality To Unchecked Visible Widget", function() {
-    cy.get(publish.backToEditor).click();
     cy.openPropertyPane("tabswidget");
     cy.togglebarDisable(commonlocators.visibleCheckbox);
     cy.PublishtheApp();
@@ -74,8 +74,71 @@ describe("Tab widget test", function() {
     cy.togglebar(commonlocators.visibleCheckbox);
     cy.PublishtheApp();
     cy.get(publish.tabWidget).should("be.visible");
+    cy.get(publish.backToEditor).click();
   });
+
+  it("Tab Widget Functionality To Check tab invisiblity", function() {
+    cy.openPropertyPane("tabswidget");
+    cy.get(Layoutpage.tabEdit)
+      .eq(1)
+      .click({ force: true });
+    cy.get(Layoutpage.tabVisibility)
+      .first()
+      .click({ force: true });
+    cy.get(Layoutpage.tabWidget)
+      .contains("Tab 1")
+      .should("not.exist");
+    cy.PublishtheApp();
+    cy.get(publish.tabWidget)
+      .contains("Tab 1")
+      .should("not.exist");
+    cy.get(publish.backToEditor).click();
+  });
+
+  it("Tab Widget Functionality To Check tab visibility", function() {
+    cy.openPropertyPane("tabswidget");
+    cy.get(Layoutpage.tabEdit)
+      .eq(1)
+      .click({ force: true });
+    cy.get(Layoutpage.tabVisibility)
+      .first()
+      .click({ force: true });
+    cy.get(Layoutpage.tabWidget)
+      .contains("Tab 1")
+      .should("be.visible");
+    cy.PublishtheApp();
+    cy.get(publish.tabWidget)
+      .contains("Tab 1")
+      .should("be.visible");
+    cy.get(publish.backToEditor).click();
+  });
+  /* Test to be revisted as the undo action is inconsistent in automation
+  it("Tab Widget Functionality To Check undo action after delete", function() {
+    cy.openPropertyPane("tabswidget");
+    cy.get(Layoutpage.tabDelete)
+      .eq(1)
+      .click({ force: true });
+    cy.wait(2000);
+    cy.wait("@updateLayout");
+    cy.get(publish.tabWidget)
+      .contains("Tab 1")
+      .should("not.exist");
+    cy.get(".undo-section:contains('UNDO')")
+      .should("be.visible")
+      .click({ force: true });
+    cy.wait(2000);
+    cy.wait("@updateLayout");
+    cy.get(Layoutpage.tabWidget)
+      .contains("Tab 1")
+      .should("be.visible");
+    cy.PublishtheApp();
+    cy.get(publish.tabWidget)
+      .contains("Tab 1")
+      .should("be.visible");
+  });
+  */
 });
+
 afterEach(() => {
   // put your clean up code if any
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js
index d8712160d2..8b4b21a142 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js
@@ -2,6 +2,9 @@
 // const explorer = require("../../../../locators/explorerlocators.json");
 const homePage = require("../../../../locators/HomePage.json");
 const commonlocators = require("../../../../locators/commonlocators.json");
+const pages = require("../../../../locators/Pages.json");
+const datasourceEditor = require("../../../../locators/DatasourcesEditor.json");
+const datasource = require("../../../../locators/DatasourcesEditor.json");
 
 describe("Onboarding", function() {
   it("Onboarding flow", function() {
@@ -50,7 +53,7 @@ describe("Onboarding", function() {
 
         // Add widget
         cy.get(".t--add-widget").click();
-        cy.dragAndDropToCanvas("tablewidget", { x: 30, y: -30 });
+        cy.dragAndDropToCanvas("tablewidget", { x: 360, y: 40 });
 
         // wait for animation duration
         // eslint-disable-next-line cypress/no-unnecessary-waiting
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/LeaveOrganizationTest_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/LeaveOrganizationTest_spec.js
new file mode 100644
index 0000000000..d720788c33
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/LeaveOrganizationTest_spec.js
@@ -0,0 +1,62 @@
+/// <reference types="Cypress" />
+
+const homePage = require("../../../../locators/HomePage.json");
+
+describe("Leave organization test spec", function() {
+  let newOrgId;
+  let newOrganizationName;
+
+  it("leave organization menu is visible validation", function() {
+    cy.visit("/applications");
+    cy.createOrg();
+    cy.wait("@createOrg").then((interception) => {
+      newOrganizationName = interception.response.body.data.name;
+      newOrgId = interception.response.body.data.name;
+      cy.visit("/applications");
+      cy.openOrgOptionsPopup(newOrganizationName);
+      cy.contains("Leave Organization");
+    });
+  });
+
+  it("Only admin user can not leave organization validation", function() {
+    cy.visit("/applications");
+    cy.createOrg();
+    cy.wait("@createOrg").then((interception) => {
+      newOrganizationName = interception.response.body.data.name;
+      newOrgId = interception.response.body.data.name;
+      cy.visit("/applications");
+      cy.openOrgOptionsPopup(newOrganizationName);
+      cy.contains("Leave Organization").click();
+      cy.contains("Are you sure").click();
+      cy.wait("@leaveOrgApiCall").then((httpResponse) => {
+        expect(httpResponse.status).to.equal(400);
+      });
+      cy.contains(newOrganizationName);
+    });
+  });
+
+  it("Non admin users can only access leave organization popup menu validation", function() {
+    cy.visit("/applications");
+    cy.createOrg();
+    cy.wait("@createOrg").then((interception) => {
+      newOrganizationName = interception.response.body.data.name;
+      newOrgId = interception.response.body.data.name;
+      cy.visit("/applications");
+      cy.inviteUserForOrg(
+        newOrganizationName,
+        Cypress.env("TESTUSERNAME1"),
+        homePage.viewerRole,
+      );
+      cy.LogOut();
+
+      cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
+      cy.visit("/applications");
+      cy.openOrgOptionsPopup(newOrganizationName);
+      cy.get(homePage.orgNamePopoverContent)
+        .find("a")
+        .should("have.length", 1)
+        .first()
+        .contains("Leave Organization");
+    });
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgImportApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgImportApplication_spec.js
new file mode 100644
index 0000000000..620b05e0aa
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgImportApplication_spec.js
@@ -0,0 +1,39 @@
+const homePage = require("../../../../locators/HomePage.json");
+
+describe("Organization Import Application", function() {
+  let orgid;
+  let newOrganizationName;
+  const fixtureDummyAppPath = "application-file.json";
+  it("Can Import Application", function() {
+    cy.NavigateToHome();
+    cy.generateUUID().then((uid) => {
+      orgid = uid;
+      localStorage.setItem("OrgName", orgid);
+      cy.createOrg();
+      cy.wait("@createOrg").then((createOrgInterception) => {
+        newOrganizationName = createOrgInterception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+        cy.get(homePage.orgImportAppOption).click({ force: true });
+
+        cy.get(homePage.orgImportAppModal).should("be.visible");
+        cy.xpath(homePage.uploadLogo).attachFile(fixtureDummyAppPath);
+
+        cy.get(homePage.orgImportAppButton).click({ force: true });
+        cy.wait("@importNewApplication").then((interception) => {
+          let appId = interception.response.body.data.id;
+          let defaultPage = interception.response.body.data.pages.find(
+            (eachPage) => !!eachPage.isDefault,
+          );
+          cy.get(homePage.toastMessage).should(
+            "contain",
+            "Application imported successfully",
+          );
+          cy.url().should(
+            "include",
+            `/applications/${appId}/pages/${defaultPage.id}/edit`,
+          );
+        });
+      });
+    });
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgSettings_validation_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgSettings_validation_spec.js
index e606c8376c..5c5ee05712 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgSettings_validation_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgSettings_validation_spec.js
@@ -4,6 +4,7 @@ const homePage = require("../../../../locators/HomePage.json");
 
 describe("Org Settings validation spec", function() {
   let orgid;
+  let newOrganizationName;
 
   it("create org with long name should use ellipsis validation", function() {
     cy.NavigateToHome();
@@ -13,15 +14,21 @@ describe("Org Settings validation spec", function() {
         uid;
       localStorage.setItem("OrgName", orgid);
       // create org with long name
-      cy.createOrg(orgid);
-      cy.navigateToOrgSettings(orgid);
-      // checking parent's(<a></a>) since the child(<span>) inherits css from it
-      cy.get(homePage.orgHeaderName)
-        .parent()
-        .then((elem) => {
-          assert.isBelow(elem[0].offsetWidth, elem[0].scrollWidth);
-        })
-        .should("have.css", "text-overflow", "ellipsis");
+      cy.createOrg();
+      // stub the response and
+      // find app name
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+        cy.navigateToOrgSettings(orgid);
+        // checking parent's(<a></a>) since the child(<span>) inherits css from it
+        cy.get(homePage.orgHeaderName)
+          .parent()
+          .then((elem) => {
+            assert.isBelow(elem[0].offsetWidth, elem[0].scrollWidth);
+          })
+          .should("have.css", "text-overflow", "ellipsis");
+      });
     });
     cy.LogOut();
   });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgUserIconTest_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgUserIconTest_spec.js
index e4b0fba386..35ee38be2c 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgUserIconTest_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgUserIconTest_spec.js
@@ -4,21 +4,26 @@ const homePage = require("../../../../locators/HomePage.json");
 
 describe("Check if org has user icons on homepage", function() {
   let orgid;
+  let newOrganizationName;
 
   it("create org and check if user icons exists in that org on homepage", function() {
     cy.NavigateToHome();
     cy.generateUUID().then((uid) => {
       orgid = uid;
       localStorage.setItem("OrgName", orgid);
-      cy.createOrg(orgid);
-      cy.get(homePage.orgList.concat(orgid).concat(")"))
-        .scrollIntoView()
-        .should("be.visible")
-        .within(() => {
-          cy.get(homePage.shareUserIcons)
-            .first()
-            .should("be.visible");
-        });
+      cy.createOrg();
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+        cy.get(homePage.orgList.concat(orgid).concat(")"))
+          .scrollIntoView()
+          .should("be.visible")
+          .within(() => {
+            cy.get(homePage.shareUserIcons)
+              .first()
+              .should("be.visible");
+          });
+      });
     });
     cy.LogOut();
   });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/Orgname_validation_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/Orgname_validation_spec.js
index cefe2baab0..8ab08a7c6a 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/Orgname_validation_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/Orgname_validation_spec.js
@@ -3,28 +3,40 @@
 const homePage = require("../../../../locators/HomePage.json");
 
 describe("Org name validation spec", function() {
+  let orgid;
+  let newOrganizationName;
   it("create org with leading space validation", function() {
     cy.NavigateToHome();
-    cy.get(homePage.createOrg)
-      .should("be.visible")
-      .first()
-      .click({ force: true });
-    cy.xpath(homePage.inputOrgName)
-      .should("be.visible")
-      .type(" ");
-    cy.get(homePage.submit).should("be.disabled");
-    cy.xpath(homePage.cancelBtn).click();
+    cy.createOrg();
+    cy.wait("@createOrg").then((interception) => {
+      newOrganizationName = interception.response.body.data.name;
+      cy.NavigateToHome();
+      cy.contains(newOrganizationName).click({ force: true });
+      cy.get(homePage.renameOrgInput)
+        .should("be.visible")
+        .type(" ");
+      cy.get(".error-message").should("be.visible");
+    });
+  });
+  it("creates org and checks that orgname is editable", function() {
+    cy.createOrg();
+    cy.generateUUID().then((uid) => {
+      orgid =
+        "kadjhfkjadsjkfakjdscajdsnckjadsnckadsjcnanakdjsnckjdscnakjdscnnadjkncakjdsnckjadsnckajsdfkjadshfkjsdhfjkasdhfkjasdhfjkasdhjfasdjkfhjhdsfjhdsfjhadasdfasdfadsasdf" +
+        uid;
+      // create org with long name
+      cy.createOrg();
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+      });
+    });
   });
-
   it("create org with special characters validation", function() {
-    cy.get(homePage.createOrg)
-      .should("be.visible")
-      .first()
-      .click({ force: true });
-    cy.xpath(homePage.inputOrgName)
-      .should("be.visible")
-      .type("Test & Org");
-    cy.get(homePage.submit).should("be.enabled");
-    cy.xpath(homePage.cancelBtn).click();
+    cy.createOrg();
+    cy.wait("@createOrg").then((interception) => {
+      newOrganizationName = interception.response.body.data.name;
+      cy.renameOrg(newOrganizationName, "Test & Org");
+    });
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Pages/Pages_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Pages/Pages_spec.js
index 95133ddc2e..fb7a3de75c 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Pages/Pages_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Pages/Pages_spec.js
@@ -23,7 +23,9 @@ describe("Pages", function() {
     cy.get(".bp3-icon-caret-right ~ .t--entity-name:contains(Page1)").click({
       multiple: true,
     });
-    cy.get(".bp3-icon-caret-right ~ .t--entity-name:contains(APIs)").click({
+    cy.get(
+      ".bp3-icon-caret-right ~ .t--entity-name:contains(Datasources)",
+    ).click({
       multiple: true,
     });
     cy.get(`.t--entity-name:contains(${apiName})`).should("have.length", 2);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ProductUpdates/ProductUpdates_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ProductUpdates/ProductUpdates_spec.js
index db433c36c7..ef124c354f 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ProductUpdates/ProductUpdates_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ProductUpdates/ProductUpdates_spec.js
@@ -10,10 +10,10 @@ describe("Check for product updates button and modal", function() {
       .its("store")
       .invoke("getState")
       .then((state) => {
-        const { releaseItems, newReleasesCount } = state.ui.releases;
+        const { newReleasesCount, releaseItems } = state.ui.releases;
         if (Array.isArray(releaseItems) && releaseItems.length > 0) {
           cy.get("[data-cy=t--product-updates-btn]")
-            .contains(newReleasesCount)
+            .contains("What's New?")
             .click({ force: true });
           //eslint-disable-next-line cypress/no-unnecessary-waiting
           cy.wait(500); // modal transition
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/PropertyPane/PropertyPaneCTA_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/PropertyPane/PropertyPaneCTA_spec.js
new file mode 100644
index 0000000000..6bdd252016
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/PropertyPane/PropertyPaneCTA_spec.js
@@ -0,0 +1,21 @@
+const dsl = require("../../../../fixtures/TextTabledsl.json");
+
+describe("Property pane CTA to add an action", function() {
+  before(() => {
+    cy.addDsl(dsl);
+  });
+
+  it("Check if CTA is shown when there is no action", function() {
+    cy.openPropertyPane("tablewidget");
+
+    cy.get(".t--propertypane-connect-cta").should("be.visible");
+  });
+
+  it("Check if CTA does not exist when there is an action", function() {
+    cy.NavigateToAPI_Panel();
+
+    cy.CreateAPI("FirstAPI");
+    cy.SearchEntityandOpen("Table1");
+    cy.get(".t--propertypane-connect-cta").should("not.exist");
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/QueryPaneTests/Datasourcedocs_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/QueryPaneTests/Datasourcedocs_spec.js
index 85badafaa2..8834919119 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/QueryPaneTests/Datasourcedocs_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/QueryPaneTests/Datasourcedocs_spec.js
@@ -1,6 +1,7 @@
 const datasource = require("../../../../locators/DatasourcesEditor.json");
 const queryLocators = require("../../../../locators/QueryEditor.json");
 const commonlocators = require("../../../../locators/commonlocators.json");
+const queryEditor = require("../../../../locators/QueryEditor.json");
 
 describe("Check datasource doc links", function() {
   let postgresDatasourceName;
@@ -44,7 +45,8 @@ describe("Check datasource doc links", function() {
   });
 
   it("Delete the query and datasources", function() {
-    cy.get(queryLocators.deleteQuery).click();
+    cy.get(queryEditor.queryMoreAction).click();
+    cy.get(queryEditor.deleteUsingContext).click();
     cy.wait("@deleteAction").should(
       "have.nested.property",
       "response.body.responseMeta.status",
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/QueryPaneTests/SwitchDatasource_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/QueryPaneTests/SwitchDatasource_spec.js
index 7e4e07ef32..cdb81f2401 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/QueryPaneTests/SwitchDatasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/QueryPaneTests/SwitchDatasource_spec.js
@@ -1,5 +1,6 @@
 const datasource = require("../../../../locators/DatasourcesEditor.json");
 const queryLocators = require("../../../../locators/QueryEditor.json");
+const queryEditor = require("../../../../locators/QueryEditor.json");
 
 describe("Switch datasource", function() {
   let postgresDatasourceName;
@@ -92,7 +93,8 @@ describe("Switch datasource", function() {
   });
 
   it("Delete the query and datasources", function() {
-    cy.get(queryLocators.deleteQuery).click();
+    cy.get(queryEditor.queryMoreAction).click();
+    cy.get(queryEditor.deleteUsingContext).click();
     cy.wait("@deleteAction").should(
       "have.nested.property",
       "response.body.responseMeta.status",
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WidgetSelection/WidgetSelection_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WidgetSelection/WidgetSelection_spec.js
new file mode 100644
index 0000000000..54ff3d797d
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WidgetSelection/WidgetSelection_spec.js
@@ -0,0 +1,29 @@
+const dsl = require("../../../../fixtures/widgetSelection.json");
+
+describe("Widget Selection", function() {
+  before(() => {
+    cy.addDsl(dsl);
+  });
+
+  it("Multi Select widgets using cmd + click", function() {
+    cy.get(`#${dsl.dsl.children[0].widgetId}`).click({
+      ctrlKey: true,
+    });
+    cy.get(`#${dsl.dsl.children[1].widgetId}`).click({
+      ctrlKey: true,
+    });
+    cy.get(`.t--widget-propertypane-toggle`).should("have.length", 2);
+    cy.get(`#${dsl.dsl.children[2].widgetId}`).click({
+      ctrlKey: true,
+    });
+    cy.get(`.t--widget-propertypane-toggle`).should("have.length", 3);
+    cy.get(`#${dsl.dsl.children[0].widgetId}`).click({
+      ctrlKey: true,
+    });
+    cy.get(`.t--widget-propertypane-toggle`)
+      .not(`[style *= "background: rgb(255, 224, 210);"]`) // Excluding focused widgets.
+      .should("have.length", 2);
+
+    cy.get(`.t--multi-selection-box`).should("have.length", 1);
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/LayoutWidgets/List_spec.js b/app/client/cypress/integration/Smoke_TestSuite/LayoutWidgets/List_spec.js
index 8221072b87..063471e6e5 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/LayoutWidgets/List_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/LayoutWidgets/List_spec.js
@@ -4,7 +4,7 @@ const dsl = require("../../../fixtures/listdsl.json");
 const publishPage = require("../../../locators/publishWidgetspage.json");
 
 describe("Container Widget Functionality", function() {
-  const items = JSON.parse(dsl.dsl.children[0].items);
+  const items = JSON.parse(dsl.dsl.children[0].listData);
 
   before(() => {
     cy.addDsl(dsl);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiFlow/CurlImportFlow_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiFlow/CurlImportFlow_spec.js
index 9ea0d1bad9..d33f1f2480 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiFlow/CurlImportFlow_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiFlow/CurlImportFlow_spec.js
@@ -1,10 +1,14 @@
 const ApiEditor = require("../../../../locators/ApiEditor.json");
 const apiwidget = require("../../../../locators/apiWidgetslocator.json");
+const pages = require("../../../../locators/Pages.json");
 
 describe("Test curl import flow", function() {
   it("Test curl import flow Run and Delete", function() {
     localStorage.setItem("ApiPaneV2", "ApiPaneV2");
     cy.NavigateToApiEditor();
+    cy.get(pages.integrationCreateNew)
+      .should("be.visible")
+      .click({ force: true });
     cy.get(ApiEditor.curlImage).click({ force: true });
     cy.get("textarea").type("curl -X GET https://mock-api.appsmith.com/users");
     cy.importCurl();
@@ -27,7 +31,5 @@ describe("Test curl import flow", function() {
     cy.get("@deleteAction").then((response) => {
       cy.expect(response.response.body.responseMeta.success).to.eq(true);
     });
-    cy.get(ApiEditor.ApiHomePage).should("be.visible");
-    cy.get(ApiEditor.formActionButtons).should("not.exist");
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_All_Verb_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_All_Verb_spec.js
index 5411c7745f..cb090494a1 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_All_Verb_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_All_Verb_spec.js
@@ -14,11 +14,8 @@ describe("API Panel Test Functionality", function() {
   });
 
   it("PUT Action test API fetaure", function() {
-    cy.log("Login Successful");
     cy.NavigateToAPI_Panel();
-    cy.log("Navigation to API Panel screen successful");
     cy.CreateAPI("FirstAPI");
-    cy.log("Creation of FirstAPI Action successful");
     cy.SelectAction(testdata.putAction);
     cy.EnterSourceDetailsWithbody(
       testdata.baseUrl,
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_CurlPOSTImport_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_CurlPOSTImport_spec.js
index b23b1b8fdb..0437fef97e 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_CurlPOSTImport_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_CurlPOSTImport_spec.js
@@ -1,10 +1,14 @@
 const ApiEditor = require("../../../../locators/ApiEditor.json");
 const apiwidget = require("../../../../locators/apiWidgetslocator.json");
+const pages = require("../../../../locators/Pages.json");
 
 describe("Test curl import flow", function() {
-  it("Test curl import flow for POST action", function() {
+  it("Test curl import flow for POST action with JSON body", function() {
     localStorage.setItem("ApiPaneV2", "ApiPaneV2");
     cy.NavigateToApiEditor();
+    cy.get(pages.integrationCreateNew)
+      .should("be.visible")
+      .click({ force: true });
     cy.get(ApiEditor.curlImage).click({ force: true });
     cy.get("textarea").type(
       'curl -d \'{"name":"morpheus","job":"leader"}\' -H Content-Type:application/json -X POST https://mock-api.appsmith.com/echo/post',
@@ -26,4 +30,36 @@ describe("Test curl import flow", function() {
         });
     });
   });
+
+  it("Test curl import flow for POST action with multipart form data", function() {
+    localStorage.setItem("ApiPaneV2", "ApiPaneV2");
+    cy.NavigateToApiEditor();
+    cy.get(pages.integrationCreateNew)
+      .should("be.visible")
+      .click({ force: true });
+    cy.get(ApiEditor.curlImage).click({ force: true });
+    cy.get("textarea").type(
+      "curl --request POST http://httpbin.org/post -F 'randomKey=randomValue' --form 'randomKey2=\"randomValue2\"'",
+      {
+        force: true,
+        parseSpecialCharSequences: false,
+      },
+    );
+    cy.importCurl();
+    cy.RunAPI();
+    cy.ResponseStatusCheck("200 OK");
+    cy.log("Ran the API successfully");
+    cy.get("@postExecute").then((response) => {
+      cy.log(response.response.body);
+      cy.expect(response.response.body.responseMeta.success).to.eq(true);
+      // Asserting if the form key value are returned in the response
+      cy.expect(response.response.body.data.body.form.randomKey).to.eq(
+        "randomValue",
+      );
+      // Asserting the content type header set in curl import is multipart/form-data
+      cy.expect(
+        response.response.body.data.body.headers["Content-Type"],
+      ).contains("multipart/form-data;boundary");
+    });
+  });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/DatasourceBasicProfile_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/DatasourceBasicProfile_spec.js
new file mode 100644
index 0000000000..aac6a3abef
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/DatasourceBasicProfile_spec.js
@@ -0,0 +1,26 @@
+/*
+ * Commenting this spec as its flaky
+ *
+ * */
+// const testdata = require("../../../../fixtures/testdata.json");
+// describe("Create a rest datasource", function() {
+//   beforeEach(() => {
+//     cy.startRoutesForDatasource();
+//   });
+
+//   it("Create a rest datasource", function() {
+//     cy.NavigateToAPI_Panel();
+//     cy.CreateAPI("Testapi");
+//     cy.enterDatasource(testdata.basicURl);
+//     cy.get(".t--store-as-datasource").click();
+//     cy.addBasicProfileDetails("test", "test@123");
+//     cy.saveDatasource();
+//     cy.contains(".datasource-highlight", "envyenksqii9nf3.m.pipedream.net");
+//     cy.SaveAndRunAPI();
+//     cy.wait(2000);
+//     var encodedStringBtoA = btoa("test:test@123");
+//     cy.log(encodedStringBtoA);
+//     cy.ResponseStatusCheck(testdata.successStatusCode);
+//     cy.ResponseTextCheck("Basic ".concat(encodedStringBtoA));
+//   });
+// });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/MongoDataSourceStub_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/MongoDataSourceStub_spec.js
index 2ce7ec8e3b..1b63e64319 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/MongoDataSourceStub_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/MongoDataSourceStub_spec.js
@@ -23,6 +23,7 @@ describe("Create, test, save then delete a mongo datasource", function() {
       "response.body.responseMeta.status",
       200,
     );
+    /*
     cy.NavigateToQueryEditor();
 
     cy.get("@createDatasource").then((httpResponse) => {
@@ -39,7 +40,8 @@ describe("Create, test, save then delete a mongo datasource", function() {
       "response.body.responseMeta.status",
       200,
     );
-
+    cy.xpath('//div[contains(text(),"Form Input")]').click({ force: true });
+    cy.xpath('//div[contains(text(),"Raw Input")]').click({ force: true });
     cy.get(queryLocators.templateMenu).click();
     cy.get(".CodeMirror textarea")
       .first()
@@ -94,4 +96,5 @@ describe("Create, test, save then delete a mongo datasource", function() {
     );
   });
   */
+  });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/PostgresDatasource_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/PostgresDatasource_spec.js
index dabd0e202a..9c0da595b9 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/PostgresDatasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/PostgresDatasource_spec.js
@@ -1,5 +1,6 @@
 const datasource = require("../../../../locators/DatasourcesEditor.json");
 const queryEditor = require("../../../../locators/QueryEditor.json");
+const datasourceEditor = require("../../../../locators/DatasourcesEditor.json");
 
 let datasourceName;
 
@@ -21,14 +22,18 @@ describe("Postgres datasource test cases", function() {
 
   it("Create a new query from the datasource editor", function() {
     cy.saveDatasource();
-    cy.get(datasource.createQuerty).click();
+    // cy.get(datasource.createQuerty).click();
+    cy.get(`${datasourceEditor.datasourceCard} ${datasource.createQuerty}`)
+      .last()
+      .click();
     cy.wait("@createNewApi").should(
       "have.nested.property",
       "response.body.responseMeta.status",
       201,
     );
 
-    cy.get(queryEditor.deleteQuery).click();
+    cy.get(queryEditor.queryMoreAction).click();
+    cy.get(queryEditor.deleteUsingContext).click();
     cy.wait("@deleteAction").should(
       "have.nested.property",
       "response.body.responseMeta.status",
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_API_Pane_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_API_Pane_spec.js
index c14b38effc..0e60dda003 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_API_Pane_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_API_Pane_spec.js
@@ -27,10 +27,11 @@ describe("Entity explorer API pane related testcases", function() {
       .find(explorer.collapse)
       .click();
     cy.get(apiwidget.propertyList).then(function($lis) {
-      expect($lis).to.have.length(3);
+      expect($lis).to.have.length(4);
       expect($lis.eq(0)).to.contain("{{FirstAPI.isLoading}}");
       expect($lis.eq(1)).to.contain("{{FirstAPI.data}}");
-      expect($lis.eq(2)).to.contain("{{FirstAPI.run()}}");
+      expect($lis.eq(2)).to.contain("{{FirstAPI.responseMeta}}");
+      expect($lis.eq(3)).to.contain("{{FirstAPI.run()}}");
     });
     cy.get(apiwidget.actionlist)
       .contains(testdata.Get)
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_CopyQuery_RenameDatasource_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_CopyQuery_RenameDatasource_spec.js
index 952c0cdaaf..82a484dede 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_CopyQuery_RenameDatasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_CopyQuery_RenameDatasource_spec.js
@@ -54,10 +54,11 @@ describe("Entity explorer tests related to copy query", function() {
         .find(explorer.collapse)
         .click();
       cy.get(apiwidget.propertyList).then(function($lis) {
-        expect($lis).to.have.length(3);
+        expect($lis).to.have.length(4);
         expect($lis.eq(0)).to.contain("{{Query1.isLoading}}");
         expect($lis.eq(1)).to.contain("{{Query1.data}}");
-        expect($lis.eq(2)).to.contain("{{Query1.run()}}");
+        expect($lis.eq(2)).to.contain("{{Query1.responseMeta}}");
+        expect($lis.eq(3)).to.contain("{{Query1.run()}}");
       });
     });
   });
@@ -71,21 +72,22 @@ describe("Entity explorer tests related to copy query", function() {
       .invoke("show")
       .click({ force: true });
     cy.copyEntityToPage(pageid);
-    cy.SearchEntityandOpen("Query1Copy");
+    cy.SearchEntityandOpen("Query1");
     cy.runQuery();
-    cy.get(`.t--entity.action:contains(Query1Copy)`)
+    cy.get(`.t--entity.action:contains(Query1)`).should("have.length", 2);
+    cy.get(`.t--entity.action:contains(Query1)`)
       .find(explorer.collapse)
-      .click();
+      .click({ multiple: true });
     cy.get(apiwidget.propertyList).then(function($lis) {
-      expect($lis).to.have.length(3);
-      expect($lis.eq(0)).to.contain("{{Query1Copy.isLoading}}");
-      expect($lis.eq(1)).to.contain("{{Query1Copy.data}}");
-      expect($lis.eq(2)).to.contain("{{Query1Copy.run()}}");
+      expect($lis.eq(0)).to.contain("{{Query1.isLoading}}");
+      expect($lis.eq(1)).to.contain("{{Query1.data}}");
+      expect($lis.eq(2)).to.contain("{{Query1.responseMeta}}");
+      expect($lis.eq(3)).to.contain("{{Query1.run()}}");
     });
   });
 
   it("Delete query and rename datasource in explorer", function() {
-    cy.get(commonlocators.entityExplorersearch).clear();
+    cy.get(commonlocators.entityExplorersearch).clear({ force: true });
     cy.NavigateToDatasourceEditor();
     cy.GlobalSearchEntity(`${datasourceName}`);
     cy.get(`.t--entity-name:contains(${datasourceName})`)
@@ -98,7 +100,6 @@ describe("Entity explorer tests related to copy query", function() {
       cy.log("sliced id :" + updatedName);
       cy.EditEntityNameByDoubleClick(datasourceName, updatedName);
       cy.SearchEntityandOpen(updatedName);
-      cy.testSaveDatasource();
       cy.hoverAndClick();
       cy.get(apiwidget.delete).click({ force: true });
       //This is check to make sure if a datasource is active 409
@@ -109,7 +110,7 @@ describe("Entity explorer tests related to copy query", function() {
       );
     });
 
-    cy.SearchEntityandOpen("Query1Copy");
+    cy.SearchEntityandOpen("Query1");
     cy.deleteQuery();
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
index ff72c2c1c5..ed2cfb49e6 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
@@ -63,7 +63,8 @@ describe("Entity explorer datasource structure", function() {
       201,
     );
 
-    cy.get(queryEditor.deleteQuery).click();
+    cy.get(queryEditor.queryMoreAction).click();
+    cy.get(queryEditor.deleteUsingContext).click();
     cy.wait("@deleteAction").should(
       "have.nested.property",
       "response.body.responseMeta.status",
@@ -72,14 +73,15 @@ describe("Entity explorer datasource structure", function() {
 
     cy.GlobalSearchEntity("MyQuery");
     cy.get(`.t--entity-name:contains(MyQuery)`).click();
-    cy.get(queryEditor.deleteQuery).click();
+    cy.get(queryEditor.queryMoreAction).click();
+    cy.get(queryEditor.deleteUsingContext).click();
     cy.wait("@deleteAction").should(
       "have.nested.property",
       "response.body.responseMeta.status",
       200,
     );
 
-    cy.get(commonlocators.entityExplorersearch).clear();
+    cy.get(commonlocators.entityExplorersearch).clear({ force: true });
 
     cy.deleteDatasource(datasourceName);
   });
@@ -102,7 +104,7 @@ describe("Entity explorer datasource structure", function() {
       200,
     );
 
-    cy.get(commonlocators.entityExplorersearch).clear();
+    cy.get(commonlocators.entityExplorersearch).clear({ force: true });
 
     const tableName = Math.random()
       .toString(36)
@@ -151,14 +153,15 @@ describe("Entity explorer datasource structure", function() {
           200,
         );
 
-        cy.get(queryEditor.deleteQuery).click();
+        cy.get(queryEditor.queryMoreAction).click();
+        cy.get(queryEditor.deleteUsingContext).click();
         cy.wait("@deleteAction").should(
           "have.nested.property",
           "response.body.responseMeta.status",
           200,
         );
 
-        cy.get(commonlocators.entityExplorersearch).clear();
+        cy.get(commonlocators.entityExplorersearch).clear({ force: true });
         cy.deleteDatasource(datasourceName);
       });
   });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateAppWithSameNameInOrg_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateAppWithSameNameInOrg_spec.js
index c6f78dbbad..32a444c4f0 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateAppWithSameNameInOrg_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateAppWithSameNameInOrg_spec.js
@@ -3,6 +3,7 @@
 describe("Create org and a new app / delete and recreate app", function() {
   let orgid;
   let appid;
+  let newOrganizationName;
 
   it("create app within an org and delete and re-create another app with same name", function() {
     cy.NavigateToHome();
@@ -10,7 +11,11 @@ describe("Create org and a new app / delete and recreate app", function() {
       orgid = uid;
       appid = uid;
       localStorage.setItem("OrgName", orgid);
-      cy.createOrg(orgid);
+      cy.createOrg();
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+      });
       cy.CreateAppForOrg(orgid, appid);
       cy.DeleteAppByApi();
       cy.NavigateToHome();
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateOrgTests_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateOrgTests_spec.js
index 4740cd7378..d50dc6924b 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateOrgTests_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateOrgTests_spec.js
@@ -5,6 +5,7 @@ const homePage = require("../../../../locators/HomePage.json");
 describe("Create new org and share with a user", function() {
   let orgid;
   let appid;
+  let newOrganizationName;
 
   it("create org and then share with a user from UI", function() {
     cy.NavigateToHome();
@@ -12,7 +13,11 @@ describe("Create new org and share with a user", function() {
       orgid = uid;
       appid = uid;
       localStorage.setItem("OrgName", orgid);
-      cy.createOrg(orgid);
+      cy.createOrg();
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+      });
       cy.CheckShareIcon(orgid, 1);
       cy.inviteUserForOrg(
         orgid,
@@ -51,13 +56,7 @@ describe("Create new org and share with a user", function() {
   });
 
   it("login as Org owner and update the invited user role to developer", function() {
-    cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
-    cy.visit("/applications");
-    cy.wait("@applications").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
+    cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
     cy.get(homePage.searchInput).type(appid);
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000);
@@ -90,13 +89,7 @@ describe("Create new org and share with a user", function() {
   });
 
   it("login as Org owner and update the invited user role to administrator", function() {
-    cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
-    cy.visit("/applications");
-    cy.wait("@applications").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
+    cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
     cy.get(homePage.searchInput).type(appid);
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000);
@@ -124,13 +117,7 @@ describe("Create new org and share with a user", function() {
   });
 
   it("login as Org owner and delete App ", function() {
-    cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
-    cy.visit("/applications");
-    cy.wait("@applications").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
+    cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
     cy.get(homePage.searchInput).type(appid);
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateSameAppInDiffOrg_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateSameAppInDiffOrg_spec.js
index 3de68cf260..318d304bc3 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateSameAppInDiffOrg_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateSameAppInDiffOrg_spec.js
@@ -3,6 +3,7 @@
 describe("Create app same name in different org", function() {
   let orgid;
   let appid;
+  let newOrganizationName;
 
   it("create app within a new org", function() {
     cy.NavigateToHome();
@@ -10,10 +11,16 @@ describe("Create app same name in different org", function() {
       orgid = uid;
       appid = uid;
       localStorage.setItem("OrgName", orgid);
-      cy.createOrg(orgid);
-      cy.CreateAppForOrg(orgid, appid);
-      cy.NavigateToHome();
-      cy.LogOut();
+      cy.createOrg();
+      // stub the response and
+      // find app name
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+        cy.CreateAppForOrg(orgid, appid);
+        cy.NavigateToHome();
+        cy.LogOut();
+      });
     });
   });
 
@@ -25,9 +32,13 @@ describe("Create app same name in different org", function() {
       "response.body.responseMeta.status",
       200,
     );
-    cy.reload();
     const newOrgName = orgid + "1";
-    cy.createOrg(newOrgName);
-    cy.CreateAppForOrg(newOrgName, appid);
+    cy.createOrg();
+    cy.wait("@createOrg").then((interception) => {
+      console.log("createOrganization response: ", interception);
+      newOrganizationName = interception.response.body.data.name;
+      cy.renameOrg(newOrganizationName, newOrgName);
+      cy.CreateAppForOrg(newOrgName, appid);
+    });
   });
 });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/ShareAppTests_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/ShareAppTests_spec.js
index 478a3b5522..d791df203e 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/ShareAppTests_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/ShareAppTests_spec.js
@@ -7,6 +7,7 @@ describe("Create new org and share with a user", function() {
   let orgid;
   let appid;
   let currentUrl;
+  let newOrganizationName;
 
   it("create org and then share with a user from Application share option within application", function() {
     cy.NavigateToHome();
@@ -14,7 +15,11 @@ describe("Create new org and share with a user", function() {
       orgid = uid;
       appid = uid;
       localStorage.setItem("OrgName", orgid);
-      cy.createOrg(orgid);
+      cy.createOrg();
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+      });
       cy.CreateAppForOrg(orgid, appid);
       cy.wait("@getPagesForCreateApp").should(
         "have.nested.property",
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/UpdateOrgTests_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/UpdateOrgTests_spec.js
index fc37647369..f8a63868d0 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/UpdateOrgTests_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/UpdateOrgTests_spec.js
@@ -2,26 +2,24 @@ const homePage = require("../../../../locators/HomePage.json");
 
 describe("Update Organization", function() {
   let orgid;
+  let newOrganizationName;
 
   it("Open the org general settings and update org name. The update should reflect in the org. It should also reflect in the org names on the left side and the org dropdown.	", function() {
     cy.NavigateToHome();
     cy.generateUUID().then((uid) => {
       orgid = uid;
       localStorage.setItem("OrgName", orgid);
-      cy.createOrg(orgid);
-      cy.get(homePage.orgList.concat(orgid).concat(")"))
-        .scrollIntoView()
-        .should("be.visible")
-        .within(() => {
-          cy.get(".t--org-name")
-            .first()
-            .click();
-        });
-      cy.get(homePage.orgSettingOption).click();
+      cy.createOrg();
+      cy.wait("@createOrg").then((interception) => {
+        newOrganizationName = interception.response.body.data.name;
+        cy.renameOrg(newOrganizationName, orgid);
+        cy.get(homePage.orgSettingOption).click({ force: true });
+      });
     });
     cy.generateUUID().then((uid) => {
       orgid = uid;
       localStorage.setItem("OrgName", orgid);
+      cy.get(homePage.orgNameInput).click({ force: true });
       cy.get(homePage.orgNameInput).clear();
       cy.get(homePage.orgNameInput).type(orgid);
       // eslint-disable-next-line cypress/no-unnecessary-waiting
@@ -37,15 +35,12 @@ describe("Update Organization", function() {
   });
 
   it("Open the org general settings and update org email. The update should reflect in the org.", function() {
-    cy.get(homePage.orgList.concat(orgid).concat(")"))
-      .scrollIntoView()
-      .should("be.visible")
-      .within(() => {
-        cy.get(".t--org-name")
-          .first()
-          .click();
-      });
-    cy.get(homePage.orgSettingOption).click();
+    cy.createOrg();
+    cy.wait("@createOrg").then((interception) => {
+      newOrganizationName = interception.response.body.data.name;
+      cy.renameOrg(newOrganizationName, orgid);
+      cy.get(homePage.orgSettingOption).click({ force: true });
+    });
     cy.get(homePage.orgEmailInput).clear();
     cy.get(homePage.orgEmailInput).type(Cypress.env("TESTUSERNAME2"));
     cy.wait("@updateOrganization").should(
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/ConfirmRunAction_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/ConfirmRunAction_spec.js
index 312c09fa0d..19977d12df 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/ConfirmRunAction_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/ConfirmRunAction_spec.js
@@ -41,7 +41,8 @@ describe("Confirm run action", function() {
       200,
     );
 
-    cy.get(queryEditor.deleteQuery).click();
+    cy.get(queryEditor.queryMoreAction).click();
+    cy.get(queryEditor.deleteUsingContext).click();
     cy.wait("@deleteAction").should(
       "have.nested.property",
       "response.body.responseMeta.status",
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/MongoDatasource_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/MongoDatasource_spec.js
index d64c91b60c..b5ce52ffb5 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/MongoDatasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/MongoDatasource_spec.js
@@ -35,6 +35,10 @@ describe("Create a query with a mongo datasource, run, save and then delete the
       200,
     );
 
+    cy.xpath('//div[contains(text(),"Find Document(s)")]').click({
+      force: true,
+    });
+    cy.xpath('//div[contains(text(),"Raw")]').click({ force: true });
     cy.get(queryLocators.templateMenu).click();
     cy.get(".CodeMirror textarea")
       .first()
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/PostgreDatasource_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/PostgreDatasource_spec.js
index d291516b41..2eda8700f9 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/PostgreDatasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/PostgreDatasource_spec.js
@@ -1,5 +1,6 @@
 const queryLocators = require("../../../../locators/QueryEditor.json");
 const datasource = require("../../../../locators/DatasourcesEditor.json");
+const pages = require("../../../../locators/Pages.json");
 
 let datasourceName;
 
@@ -39,6 +40,9 @@ describe("Create a query with a postgres datasource, run, save and then delete t
   });
   it("Create, runs and delete another query", () => {
     cy.NavigateToQueryEditor();
+    cy.get(pages.integrationActiveTab)
+      .should("be.visible")
+      .click({ force: true });
     cy.contains(".t--datasource-name", datasourceName)
       .find(queryLocators.createQuery)
       .click();
@@ -53,6 +57,9 @@ describe("Create a query with a postgres datasource, run, save and then delete t
   });
   it("Deletes a datasource", () => {
     cy.NavigateToQueryEditor();
+    cy.get(pages.integrationActiveTab)
+      .should("be.visible")
+      .click({ force: true });
     cy.contains(".t--datasource-name", datasourceName)
       .find(".t--edit-datasource")
       .click();
diff --git a/app/client/cypress/locators/DatasourcesEditor.json b/app/client/cypress/locators/DatasourcesEditor.json
index 47aa855c89..834f6726ac 100644
--- a/app/client/cypress/locators/DatasourcesEditor.json
+++ b/app/client/cypress/locators/DatasourcesEditor.json
@@ -13,6 +13,8 @@
   "sectionAuthentication": "[data-cy=section-Authentication]",
   "PostgresEntity": ".t--entity-name:contains(PostgreSQL)",
   "createQuerty": ".t--create-query",
+  "activeDatasourceList": ".t--active-datasource-list",
+  "datasourceCard": ".t--datasource",
   "editDatasource": ".t--edit-datasource",
   "defaultDatabaseName": "input[name='datasourceConfiguration.connection.defaultDatabaseName']",
   "selConnectionType": "[data-cy='datasourceConfiguration.connection.type']",
@@ -35,5 +37,8 @@
   "grantType": "[data-cy='authentication.grantType']",
   "authorizationURL":"[data-cy='authentication.authorizationUrl'] input",
   "authorisecode": "//div[contains(@class,'option') and text()='Authorization Code']",
-  "saveAndAuthorize": "button:contains('Save and Authorize')"
+  "saveAndAuthorize": "button:contains('Save and Authorize')",
+  "basic": "//div[contains(@class,'option') and text()='Basic']",
+  "basicUsername": "input[name='authentication.username']",
+  "basicPassword": "input[name='authentication.password']"
 }
diff --git a/app/client/cypress/locators/Debugger.json b/app/client/cypress/locators/Debugger.json
new file mode 100644
index 0000000000..9e5cda0e4c
--- /dev/null
+++ b/app/client/cypress/locators/Debugger.json
@@ -0,0 +1,4 @@
+{
+    "debuggerIcon": ".t--debugger",
+    "debuggerLogState": ".t--debugger-log-state"
+}
\ No newline at end of file
diff --git a/app/client/cypress/locators/DynamicInput.json b/app/client/cypress/locators/DynamicInput.json
index 8f34ce8219..8e5b4bc686 100644
--- a/app/client/cypress/locators/DynamicInput.json
+++ b/app/client/cypress/locators/DynamicInput.json
@@ -1,5 +1,5 @@
 {
-  "input": ".CodeMirror textarea",
+  "input": ".CodeEditorTarget",
   "hints": "ul.CodeMirror-hints",
   "evaluatedValue": ".t--CodeEditor-evaluatedValue",
   "bindingPrompt": ".t--no-binding-prompt"
diff --git a/app/client/cypress/locators/HomePage.json b/app/client/cypress/locators/HomePage.json
index a936620af6..d6b0808e4b 100644
--- a/app/client/cypress/locators/HomePage.json
+++ b/app/client/cypress/locators/HomePage.json
@@ -9,6 +9,7 @@
     "appMoreIcon": ".bp3-popover-wrapper.more .bp3-popover-target",
     "duplicateApp": "[data-cy=t--duplicate]",
     "forkAppFromMenu": "[data-cy=t--fork-app]",
+    "exportAppFromMenu": "[data-cy=t--export-app]",
     "forkAppOrgList": ".radio-group",
     "forkAppOrgButton": "[data-cy=t--fork-app-to-org-button]",
     "selectAction": "#Base",
@@ -59,7 +60,13 @@
     "applicationColorSelector": ".t--color-not-selected",
     "applicationBackgroundColor": ".t--application-card-background",
     "orgSettingOption": "[data-cy=t--org-setting]",
+    "orgImportAppOption": "[data-cy=t--org-import-app]",
+    "orgImportAppModal": ".t--import-application-modal",
+    "orgImportAppButton": "[data-cy=t--org-import-app-button]",
+    "leaveOrgConfirmModal": ".t--member-delete-confirmation-modal",
+    "leaveOrgConfirmButton": "[data-cy=t--org-leave-button]",
     "orgNameInput": "[data-cy=t--org-name-input]",
+    "renameOrgInput": "[data-cy=t--org-rename-input]",
     "orgEmailInput": "[data-cy=t--org-email-input]",
     "orgWebsiteInput": "[data-cy=t--org-website-input]",
     "orgHeaderName": ".t--organization-header",
@@ -72,5 +79,7 @@
     "generalTab": "//li//span[text()='General']",
     "membersTab": "//li//span[text()='Members']",
     "cancelBtn": "//span[text()='Cancel']",
-    "submit": "button:contains('Submit')"
+    "submit": "button:contains('Submit')",
+    "orgNamePopover": ".t--org-name",
+    "orgNamePopoverContent": ".bp3-popover-content"
 }
diff --git a/app/client/cypress/locators/Layout.json b/app/client/cypress/locators/Layout.json
index 7bd865494f..a9799b5de4 100644
--- a/app/client/cypress/locators/Layout.json
+++ b/app/client/cypress/locators/Layout.json
@@ -5,5 +5,7 @@
     "tabDefault": ".t--property-control-defaulttab .CodeMirror-code",
     "tabButton": ".t--property-control-tabs  button",
     "tabDelete": ".t--property-control-tabs  .t--delete-tab-btn",
-    "tabContainer": "div[type='TABS_WIDGET']"
+    "tabContainer": "div[type='TABS_WIDGET']",
+    "tabEdit": ".t--property-control-tabs .t--edit-column-btn",
+    "tabVisibility": ".t--property-control-visible .bp3-control-indicator"
 }
\ No newline at end of file
diff --git a/app/client/cypress/locators/Pages.json b/app/client/cypress/locators/Pages.json
index 2044baf6a8..b68297e32d 100644
--- a/app/client/cypress/locators/Pages.json
+++ b/app/client/cypress/locators/Pages.json
@@ -9,7 +9,9 @@
     "Menuaction": ".bp3-overlay-open>.bp3-transition-container",
     "Delete": ":nth-child(2) > .bp3-menu-item",
     "apiEditorIcon": ".t--nav-link-api-editor",
-    "addEntityAPI": ".apis .t--entity-add-btn",
+    "addEntityAPI": ".datasources .t--entity-add-btn",
+    "integrationCreateNew": "[data-cy=t--tab-CREATE_NEW]",
+    "integrationActiveTab": "[data-cy=t--tab-ACTIVE]",
     "entityWidget": ".t--entity-name:contains('Widgets')",
     "entityTable": ".t--entity-name:contains('Table1')",
     "entityText": ".t--entity-name:contains('Text1')",
diff --git a/app/client/cypress/locators/QueryEditor.json b/app/client/cypress/locators/QueryEditor.json
index 28929954ba..1d736eda63 100644
--- a/app/client/cypress/locators/QueryEditor.json
+++ b/app/client/cypress/locators/QueryEditor.json
@@ -1,11 +1,18 @@
 {
+    "addNewQueryBtn": ".dbqueries .t--entity-add-btn",
     "queryEditorIcon": ".t--nav-link-query-editor",
     "templateMenu": ".t--template-menu",
     "runQuery": ".t--run-query",
     "saveQuery": ".t--save-query",
     "deleteQuery": ".t--delete-query",
+    "queryMoreAction": ".t--more-action-menu",
+    "deleteUsingContext": ".t--apiFormDeleteBtn",
     "createQuery": ".t--create-query",
     "addQueryEntity": ".//div[contains(@class,'t--entity group queries')]//div[contains(@class,'t--entity-add-btn')]",
     "addDatasource": ".t--add-datasource",
-    "editDatasourceButton": ".t--edit-datasource"
-}
+    "editDatasourceButton": ".t--edit-datasource",
+    "queryNameField": ".t--action-name-edit-field input",
+    "settings": "li:contains('Settings')",
+    "query": "li:contains('Query')",
+    "switch": ".t--form-control-SWITCH input"
+}
\ No newline at end of file
diff --git a/app/client/cypress/locators/ViewWidgets.json b/app/client/cypress/locators/ViewWidgets.json
index f11d43e422..d71bd9d2cc 100644
--- a/app/client/cypress/locators/ViewWidgets.json
+++ b/app/client/cypress/locators/ViewWidgets.json
@@ -17,7 +17,7 @@
     "chartInnerText": ".t--property-control-title",
     "inputChartValue": ".t--property-control-chartseries .CodeMirror textarea",
     "chartButton": ".t--property-control-chartseries button",
-    "rectangleChart": ".t--draggable-chartwidget g  rect",
+    "rectangleChart": ".t--draggable-chartwidget g rect",
     "xlabel": ".t--property-control-x-axislabel .CodeMirror-code",
     "ylabel": ".t--property-control-y-axislabel .CodeMirror-code",
     "mapInner": ".t--draggable-mapwidget span.t--widget-name",
@@ -27,7 +27,8 @@
     "createMarker": ".t--property-control-createnewmarker [type='checkbox']",
     "zoomLevel": ".t--property-control-zoomlevel  svg",
     "sourceImage": ".t--property-control-image .CodeMirror-code",
-    "defaultImage": ".t--property-control-defaultimage .CodeMirror-code",
+    "defaultImage": ".t--property-control-defaultimage .CodeMirror textarea",
     "Chartlabel": ".t--draggable-chartwidget g:nth-child(5) text",
+    "PieChartLabel": ".t--draggable-chartwidget g g:nth-child(1) g text",
     "pickMyLocation": ".t--draggable-mapwidget div[title='Pick My Location']"
 }
diff --git a/app/client/cypress/locators/Widgets.json b/app/client/cypress/locators/Widgets.json
index 3e67eecebb..38b87d7465 100644
--- a/app/client/cypress/locators/Widgets.json
+++ b/app/client/cypress/locators/Widgets.json
@@ -1,16 +1,23 @@
 {
+    "NavHomePage": "[data-icon='home']",
     "containerWidget": ".t--draggable-containerwidget",
     "inputWidget": ".t--draggable-inputwidget",
     "togglebutton": "input[type='checkbox']",
     "inputPropsDataType": ".t--property-control-datatype",
     "inputdatatypeplaceholder": ".t--property-control-placeholder",
     "buttonWidget": ".t--draggable-buttonwidget",
+    "buttonStyleDropdown": ".t--property-control-buttonstyle [name='downArrow']",
+    "buttonBackground": ".sc-ecQjpJ > div > .bp3-button",
+    "copyWidget": ".t--copy-widget svg",
+    "removeWidget": ".t--delete-widget svg",
+    "propertypaneText": ".t--propertypane .bp3-panel-stack-view",
     "formButtonWidget": ".t--widget-formbuttonwidget",
     "textWidget": ".t--draggable-textwidget",
     "tableWidget": ".t--draggable-tablewidget",
     "tableOnRowSelected": ".t--property-control-onrowselected",
     "dropdownSelectButton": ".t--open-dropdown-Select",
     "buttonOnClick": ".t--property-control-onclick .bp3-popover-target",
+    "buttonCreateApi": "a.t--create-api-btn",
     "Scrollbutton": ".t--property-control-scrollcontents input",
     "label": ".t--draggable-inputwidget label",
     "inputval": ".t--draggable-inputwidget span.t--widget-name",
@@ -38,6 +45,8 @@
     "textInputval": ".t--draggable-textwidget span.t--widget-name",
     "textCenterAlign": ".t--property-control-textalign .t--icon-tab-CENTER",
     "ColumnAction": ".t--property-control-rowbutton button",
+    "SearchTextChangeAction": ".t--property-control-onsearchtextchanged button",
+    "tableSearchTextChangeSelected": ".t--property-control-onsearchtextchanged",
     "videoWidget": ".t--draggable-videowidget",
     "autoPlay": ".t--property-control-autoplay > .bp3-control > .bp3-control-indicator",
     "defaultOption": ".t--property-control-defaultoption .CodeMirror-code",
@@ -66,7 +75,7 @@
     "verticalBottom": ".t--icon-tab-BOTTOM",
     "textColor": ".t--property-control-textcolor input",
     "backgroundcolorPicker": ".t--property-control-backgroundcolor input",
-    "greenColor": "//div[@color='rgb(3, 179, 101)']",
+    "greenColor": "//div[@color='#03b365']",
     "toggleJsColor": ".t--property-control-textcolor .t--js-toggle",
     "backgroundColor": ".t--property-control-cellbackground input",
     "toggleJsBcgColor": ".t--property-control-cellbackground .t--js-toggle",
@@ -75,6 +84,13 @@
     "textSize": ".t--property-control-textsize .bp3-popover-target",
     "toggleTextSize": ".t--property-control-textsize .t--js-toggle",
     "toggleVerticalAlig": ".t--property-control-verticalalignment .t--js-toggle",
+    "toggleVisible": ".t--property-control-visible .t--js-toggle",
+    "inputToggleVisible": "div.t--property-control-visible div.CodeMirror-lines",
+    "toggleDisable": ".t--property-control-disabled .t--js-toggle",
+    "inputToggleDisable": "div.t--property-control-disabled div.CodeMirror-lines",
+    "toggleOnClick": ".t--property-control-onclick .t--js-toggle",
+    "toggleChartType": ".t--property-control-charttype .t--js-toggle",
+    "inputToggleOnClick": ".t--property-control-onclick div.CodeMirror-lines",
     "tableBtn": ".t--draggable-tablewidget .bp3-button",
     "toastAction": ".Toastify__toast-container--top-right .t--toast-action",
     "toastActionText": ".Toastify__toast-container--top-right .t--toast-action span",
@@ -82,9 +98,13 @@
     "selectWidget": ".t--open-dropdown-Select-Widget",
     "switchWidget": ".t--widget-switchwidget",
     "toastMsg": ".t--toast-action span",
+    "deleteToast": "div[class = 'undo-section'] span[type='h6']",
+    "apiCallToast": "div.t--toast-action span[type='p1']",
     "datepickerInput": ".t--draggable-datepickerwidget2 input",
     "selectToday": ".DayPicker-Day--today",
     "switchWidgetActive": ".t--switch-widget-active",
     "switchWidgetInactive": ".t--switch-widget-inactive",
-    "switchWidgetLoading": ".t--switch-widget-loading"
+    "switchWidgetLoading": ".t--switch-widget-loading",
+    "chartPlotGroup": "g.raphael-group-63-plot-group",
+    "toggleEnableMultirowselection": ".t--property-control-enablemultirowselection .bp3-control-indicator"
 }
diff --git a/app/client/cypress/locators/apiWidgetslocator.json b/app/client/cypress/locators/apiWidgetslocator.json
index 2727f72efe..c49c628b0b 100644
--- a/app/client/cypress/locators/apiWidgetslocator.json
+++ b/app/client/cypress/locators/apiWidgetslocator.json
@@ -12,12 +12,11 @@
   "path": ".t--path >div textarea",
   "editResourceUrl": ".t--dataSourceField",
   "autoSuggest": "//div[contains(@id,'react-select')]",
-  "headerKey": "(//div[contains(@class,'t--actionConfiguration.headers[0].key.0')]//textarea)[2]",
-  "headerValue": "(//div[contains(@class,'t--actionConfiguration.headers[0].value.0')]//textarea)[2]",
-  "postDefaultContentTypeHeaderKey": "(//div[contains(@class,'t--actionConfiguration.headers[2].key.2')]//textarea)[2]",
-  "queryKey": "(//div[contains(@class,'t--actionConfiguration.queryParameters[0].key.0')]//textarea)[2]",
-  "queryValue": "(//div[contains(@class,'t--actionConfiguration.queryParameters[0].value.0')]//textarea)[2]",
-  "formEncoded": "(//div[contains(@class,'t--actionConfiguration.bodyFormData[0].key.0')]//textarea)[2]",
+  "headerKey": ".t--actionConfiguration\\.headers\\[0\\]\\.key\\.0",
+  "headerValue": ".t--actionConfiguration\\.headers\\[0\\]\\.value\\.0",
+  "queryKey": ".t--actionConfiguration\\.queryParameters\\[0\\]\\.key\\.0",
+  "queryValue": ".t--actionConfiguration\\.queryParameters\\[0\\]\\.value\\.0",
+  "formEncoded": ".t--actionConfiguration\\.bodyFormData\\[0\\]\\.key\\.0",
   "responseStatus": "//div[@id='root']",
   "responseText": ".CodeMirror-line > [role='presentation']",
   "createApiOnSideBar": "button:contains('Create new API')",
@@ -52,5 +51,8 @@
   "actionlist": ".action div div",
   "settings": "li:contains('Settings')",
   "onPageLoad": "[data-cy=executeOnLoad]",
-  "renameEntity": ".single-select >div:contains('Edit Name')"
+  "renameEntity": ".single-select >div:contains('Edit Name')",
+  "paramsTab": "//li//span[text()='Params']",
+  "paramKey": ".t--actionConfiguration\\.queryParameters\\[0\\]\\.key\\.0",
+  "paramValue": ".t--actionConfiguration\\.queryParameters\\[0\\]\\.value\\.0"
 }
diff --git a/app/client/cypress/locators/commonlocators.json b/app/client/cypress/locators/commonlocators.json
index 7248cf2091..968b5ad27a 100644
--- a/app/client/cypress/locators/commonlocators.json
+++ b/app/client/cypress/locators/commonlocators.json
@@ -13,9 +13,9 @@
   "optionchangetextDropdown": " .t--property-control-onoptionchange .CodeMirror-code",
   "optionchangetextDatePicker": " .t--property-control-ondateselected .CodeMirror-code",
   "optionchangetextCheckbox": ".t--property-control-oncheckchange .CodeMirror-code",
-  "optionchangetextSwitch": ".t--property-control-onchange .CodeMirror-code",
+  "optionchangetextSwitch": ".t--property-control-onchange .CodeMirror textarea",
   "optionchangetextInput": ".t--property-control-ontextchanged .CodeMirror-code",
-  "optionchangeRadioselect": ".t--property-control-onselectionchange .CodeMirror-code",
+  "optionchangeRadioselect": ".t--property-control-onselectionchange .CodeMirror textarea",
   "optionalignment": ".t--property-control-alignment .bp3-popover-target",
   "onMarkerclick": ".t--property-control-onmarkerclick .CodeMirror-code",
   "success": "div[type='success'] span",
diff --git a/app/client/cypress/locators/explorerlocators.json b/app/client/cypress/locators/explorerlocators.json
index 47b927f915..42e0c2bb9b 100644
--- a/app/client/cypress/locators/explorerlocators.json
+++ b/app/client/cypress/locators/explorerlocators.json
@@ -3,7 +3,7 @@
     "NoQueryMsg": "p:contains('No DB Queries yet.')",
     "NoWidgetsMsg": "p:contains('No widgets yet.')",
     "AddPage": ".pages .t--entity-add-btn",
-    "addEntityAPI": ".apis .t--entity-add-btn",
+    "addEntityAPI": ".datasources .t--entity-add-btn",
     "entityWidget": ".t--entity-name:contains('Widgets')",
     "entityTable": ".t--entity-name:contains('Table1')",
     "entityText": ".t--entity-name:contains('Text1')",
@@ -13,7 +13,7 @@
     "editName": ".single-select >div:contains('Edit Name')",
     "deletePage": ".single-select >div:contains('Delete')",
     "refreshStructure": ".single-select >div:contains('Refresh')",
-    "entityQuery": ".t--entity-name:contains('Queries')",
+    "entityQuery": ".t--entity-name:contains('Datasources')",
     "datasourceStructure": ".t--entity.datasourceStructure",
     "datasourceColumn": ".t--datasource-column",
     "templateMenuIcon": ".t--template-menu-trigger",
@@ -25,6 +25,6 @@
     "addWidget":".widgets .t--entity-add-btn",
     "dropHere":".appsmith_widget_0",
     "closeWidgets":".t--close-widgets-sidebar",
-    "addDBQueryEntity": ".dbqueries .t--entity-add-btn",
+    "addDBQueryEntity": ".datasources .t--entity-add-btn",
     "editEntity": ".t--entity-name input"
 }
\ No newline at end of file
diff --git a/app/client/cypress/locators/publishWidgetspage.json b/app/client/cypress/locators/publishWidgetspage.json
index b4a75d5dad..8e91ef0bfe 100644
--- a/app/client/cypress/locators/publishWidgetspage.json
+++ b/app/client/cypress/locators/publishWidgetspage.json
@@ -22,7 +22,7 @@
   "pickMyLocation": ".t--widget-mapwidget div[title='Pick My Location']",
   "rectChart": ".t--widget-chartwidget g  rect",
   "chartLab": ".t--widget-chartwidget g:nth-child(5) text",
-  "searchInput": "input",
+  "searchInput": ".t--search-input",
   "downloadBtn": ".t--table-download-btn",
   "filterBtn": ".t--table-filter-toggle-btn",
   "attributeDropdown": ".t--table-filter-columns-dropdown",
@@ -31,11 +31,13 @@
   "inputValue": ".t--table-filter-value-input",
   "canvas": ".canvas",
   "removeFilter": ".t--table-filter-remove-btn",
-  "compactMode": ".t--table-compact-mode-toggle-btn",
-  "compactOpt": ".t--table-compact-mode-option",
+  "rowHeight": ".t--table-compact-mode-toggle-btn",
+  "rowHeightOpt": ".t--table-compact-mode-option",
   "visibilityMode": ".t--table-column-visibility-toggle-btn",
   "visibilityOpt": ".option-title",
   "containerWidget": ".t--widget-containerwidget",
   "pageInfo": ".bp3-heading",
-  "inputGrp": ".bp3-input-group input"
+  "inputGrp": ".bp3-input-group input",
+  "datePickerNew": ".t--widget-datepickerwidget2",
+  "tab": ".t--tab-Tab"
 }
\ No newline at end of file
diff --git a/app/client/cypress/manual_TestSuite/GoogleSheet_API_Spec.js b/app/client/cypress/manual_TestSuite/GoogleSheet_API_Spec.js
new file mode 100644
index 0000000000..3a43e1db1d
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/GoogleSheet_API_Spec.js
@@ -0,0 +1,90 @@
+const queryLocators = require("../../../locators/QueryEditor.json");
+const queryEditor = require("../../../locators/QueryEditor.json");
+let datasourceName;
+
+describe("Test Ideas for GooglSheet API", function() {
+  it("Add a Datasource", function() {
+    //Add the datasource to Email Id
+    //Ensure different Email Id can be associate to different Email Id
+    //Ensure Datasource has two action "Read Only" and "Read"
+    //Ensure user can Save the Datasource
+    //Click on "Add API"
+  });
+
+  it("List API", function() {
+    //Select the Method "List Sheet"
+    //Ensure response : URL and Name of the sheet
+    //Ensure "Add Widget" is displayed to user
+    //Ensure click on Add widget the data gets populated on the widget
+  });
+
+  it("Fetch a Sheet", function() {
+    //Select the Method "Fetch Sheet"
+    //Ensure response :id,name,createdTime,modifiedTime,permissions
+  });
+
+  it("Create New Sheet", function() {
+    //Ensure the response is appropriate
+    //Ensure to select the method
+    //Ensure to select a new name to the spreadsheet
+    //Provide an existing name to the new sheet and observe sheet should be created
+    //Send a empty response body and ensure an empty sheet is created in the email Id selected
+    //Enter sheet name as special charaters,alphanumeric keys and number and observe
+    //Send the response body with defined value and ensure the data is added
+  });
+
+  it("Insert a sheet or Update a sheet", function() {
+    //Ensure to select the method
+    //Ensure to add the spreadsheet URL
+    //Ensure add the sheet name in which it needs to be inserted
+    //Ensure add the Table Heading Row Index
+    //Ensure to add appropriate raw object
+    //Ensure to submit one row empty each time and account the error
+    //Ensure to make changes in the raw object to throw error
+    //Add inappropriate data in each field to get appropriate error
+    //Add few inappropritae row name and value and check for partial insertion
+    //Miss an "rowIndex" field and check for and error
+    //Ensure to update the "headername"
+  });
+
+  it("Bulk Insert or Bulk Update", function() {
+    //Ensure to select the method
+    //Ensure to add the spreadsheet URL
+    //Ensure add the Table Heading Row Index
+    //Ensure to add appropriate raw object
+    //Add inappropriate data in each field to get appropriate error
+    //Add few inappropritae row name and value and check for partial insertion
+    //Try inserting without Row Index - Row index is not manadate of insert
+    //Add Different Sheet Url from the same doc and correct sheet name ensure teh correct gets updated
+    //Add doc URL different and name of sheet that doesnt exsit in the doc and ensure the error is displayed
+  });
+
+  it("Delete a Row", function() {
+    //Ensure to select the method
+    //Ensure to add the spreadsheet URL
+    //Ensure to add the sheet name
+    //Ensure add the Table Heading Row Index
+    //Ensure to add the valid index
+    //Enter index as 0 and check if the table header is not deleted
+    //Enter index as on and check the first data value gets deleted
+  });
+
+  it("Delete a Sheet", function() {
+    //Ensure to select the method
+    //Ensure to add the spreadsheet URL
+    //Ensure to add the sheet name
+    //Choose Entity has Single and try to delete the only one sheet which is available in the spreadsheet and check for the error messageEntity
+    //Choose Entity has Entire spreadsheet and try to deleted the sheet
+  });
+
+  it("Fetch Sheet Rows", function() {
+    //Ensure to select the method
+    //Ensure to add the spreadsheet URL
+    //Ensure to add the sheet name
+    //Enter the Table heading row index
+    //Choose the Query format as Query range and enter valid Range for example A2:B
+    //Choose the Query format as Query range and enter invalid Range and check for the error message
+    //Choose the Query format as Query rows and pass the valid Row limit and row offset
+    //Choose the Query format as Query rows and pass the invalid Row limit and row offset and check for the error message
+  });
+});
diff --git a/app/client/cypress/manual_TestSuite/List_Widget_Spec.js b/app/client/cypress/manual_TestSuite/List_Widget_Spec.js
new file mode 100644
index 0000000000..720bd2ab87
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/List_Widget_Spec.js
@@ -0,0 +1,93 @@
+const dsl = require("../../../fixtures/ListWidgetDsl.json");
+
+describe("List Widget test ideas ", function() {
+  it("List widget background colour and deploy ", function() {
+    // Drag and drop a List widget
+    // Open Property pane
+    // Scroll down to Styles
+    // Add background colour
+    // Add item background colour
+    // Ensure the colour are added appropriately
+    // Click on Deploy and ensure it is deployed appropriately
+  });
+
+  it("Adding large item Spacing for item card", function() {
+    // Drag and drop a List widget
+    // Open Property pane
+    // Scroll down to Styles
+    // Add large item spacing (>100)
+    // Ensure the cards get spaced appropriately
+  });
+
+  it("Binding an API data to list widget ", function() {
+    //Add an API
+    // Drag and drop a List widget
+    // Open list Property pane
+    // Bind the API to list widget
+    // Add Input widget into the list widget
+    // Bind the input widgte to the list widget
+  });
+
+  it("Copy Paste and Delete the List Widget ", function() {
+    // Drag and drop a List widget
+    // Click on the property pane
+    // Click on Copy the widget
+    // Paste(cmd+v) the list widget
+    // Click on the delete option of the Parent widget
+  });
+
+  it("Renaming the widget from Property pane and Entity explorer ", function() {
+    // Drag and drop a List widget
+    // Click on the property pane
+    // Click name of the widget
+    // Rename the widget
+    // Navigate to the Entity Explorer
+    // Click on the Widget expands
+    // Navigate to List widget (Double Click)
+    // Rename the widget
+    // Ensure the name of the widget is possible from both the place
+  });
+
+  it("Verify the Pagination functionlaity within List Widget", function() {
+    // Drag and Drop list Widget
+    // Click on page 2
+    // Ensure list widget will be redirected to page 2
+    // Click on next button
+    // Ensure the list widget will be redirected to page 3
+    // Click on Previous button
+    // Ensure the list widget will be redirected to page 2
+    // Mouse Hover on the next button
+    // Ensure the tool tip message is appropriate
+    // Mouse Hover on the Previous button
+    // Ensure the tool tip message is appropriate
+  });
+
+  it("Add new item in the list widget array object", function() {
+    //Drag and drop list widget
+    //Click to open an property pane
+    //Expand Genearl section
+    //Add the following new item
+    //("id": 7,"num": 007",name": Charizard",img": "http://www.serebii.net/pokemongo/pokemon/006.png")
+    //Ensure the new item gets added to the list widget without any error
+    //Check for the new page is added upon adding new items
+  });
+
+  it("Adding apt widget into the List widget", function() {
+    //Drag and Drop List widget
+    //Expand the section 1 size in the list widget
+    //Ensure by exapdning section inside list widget the page size gets increased
+    //Drag and Drop button widget inside list widget
+    //Ensure Button widget can be placed inside list Widget
+    //Drag and Drop Image widget inside list widget
+    //Ensure Image widget can be placed inside list widget
+    // Drag and drop the text widget inside the list widget
+    // Ensure text widget can be place inside the list widget
+  });
+
+  it("Adding unapt widget to identify the error message", function() {
+    //Drag and Drop List widget
+    //Expand the section 1 size in the list widget
+    //Drag and Drop widgets ie: Chart ,Date Picker radio button etc
+    // Ensure an understandable error message is displayed to user
+  });
+});
diff --git a/app/client/cypress/manual_TestSuite/Mongo_Datasource_Spec.js b/app/client/cypress/manual_TestSuite/Mongo_Datasource_Spec.js
new file mode 100644
index 0000000000..71535487b0
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/Mongo_Datasource_Spec.js
@@ -0,0 +1,78 @@
+const queryLocators = require("../../../locators/QueryEditor.json");
+const queryEditor = require("../../../locators/QueryEditor.json");
+let datasourceName;
+
+describe("Test Ideas for Mongo DB Form Input", function() {
+  it("Insert a Document", function() {
+    //Ensure by choosing command as 'Insert a Document' the following fields will be displayed 'Collection Name' and 'Documents'
+    //Click on Command and enter command name
+    //Clicking on Collection name field ensure Evaluvated value popup appears and Evaluvated value should match
+    //Click on Document and pass the following valid query
+    //Clicking on Document field ensure Evaluvated value popup appears and Evaluvated value should match
+    //Click on run and ensure query runs successfuly
+    //Try passing the invalid query in the document and run and verfiy the error message
+  });
+
+  it("Find One or More Document", function() {
+    //  Ensure by choosing command as 'Find one or more Document' the following fields will be displayed 'Collection Name' ,  'Query' ,  'Sort' , 'Projection' , 'Limit' and 'Skip'
+    //Click on collection name and enter valid collection name (In which document is inserted ealrier)
+    //Clicking on Collection Name field ensure Evaluvated value popup appears and Evaluvated value should match
+    //Click on Query field and pass {} to get all the documents inside the collection
+    //Pass the following value in the query field to get particular document in an collection {"_id":ObjectId("id")}
+    //Clicking on Query field ensure Evaluvated value popup appears and Evaluvated value should match
+    //click on run and ensure query runs successfully
+    //Compare the response with the document inserted earlier and value should match
+  });
+
+  it("Update One Document", function() {
+    //Ensure by choosing command as 'Update one Document' the following fields will be displayed 'Collection Name' ,  'Query' ,  'Sort'  and 'Update'
+    //Click on collection name and enter valid collection name (In which document is inserted ealrier)
+    //Clicking on Collection Name field ensure Evaluvated value popup appears and Evaluvated value should match
+    //Click on Query field and pass {} to get all the documents inside the collection
+    //Pass the following value in the query field to get particular document in an collection {"_id":ObjectId("id")}
+    //Clicking on Query field ensure Evaluvated value popup appears and Evaluvated value should match
+    //Click on Update field and pass the following query {"set":{"status":"Inactive"}}
+    //Repeat 'Find one or More Document' scenario and verfiy if the update results are matching
+    //click on run and ensure query runs successfully
+    //Click on Update field and pass any invalid query and ensure query response with appropriate error message
+  });
+
+  it("Update One or More Document", function() {
+    //Ensure by choosing command as 'Update one or More Document' the following fields will be displayed 'Collection Name' ,  'Query' and 'Update'
+    //Click on collection name and enter valid collection name (In which document is inserted ealrier)
+    //Clicking on Collection Name field ensure Evaluvated value popup appears and Evaluvated value should match
+    //Click on Query field and pass {} to get all the documents inside the collection
+    //Pass the following value in the query field to get particular document in an collection {"_id":ObjectId("id")}
+    //Clicking on Query field ensure Evaluvated value popup appears and Evaluvated value should match
+    //Click on Update field and pass the following query {"set":{"status":"Inactive"}}
+    //Repeat 'Find one or More Document' scenario and verify if the update results are matching
+    //click on run and ensure query runs successfully
+    //Click on Update field and pass any invalid query and ensure query response with appropriate error message
+  });
+
+  it("Delet One or More Document", function() {
+    //Ensure by choosing command as 'Delete one or more Document' the following fields will be displayed 'Collection Name' ,  'Query' and 'limit'
+    //Ensure limit has two option 'Single Document' and 'All Matching document'
+    //Click on collection name and enter valid collection name (In which document is inserted ealrier)
+    //Clicking on Collection Name field ensure Evaluvated value popup appears and Evaluvated value should match
+    //Choose limit as single document and in the query pass the document id which needs to be deleted {"_id":ObjectId("id")}
+    //Clicking on Query field ensure Evaluvated value popup appears and Evaluvated value should match
+    //Click on run and ensure the query runs successfully
+    //Repeat 'Find one or More Document' scenario and verify if the specified document is deleted
+    //Choose limit as All Matching document and in the query pass {} to delete all the document or pass multi id's
+    //Click on run and ensure the query runs successfully
+    //Repeat 'Find one or More Document' scenario and verify if the specified document is deleted
+  });
+
+  it("Perform Distinct Operation on a Document", function() {
+    //Ensure by choosing command as 'Count' the following fields will be displayed 'Collection Name' , 'Query' and 'Key/Field'
+    //Click on collection name and enter valid collection name (In which document is inserted ealrier)
+    //Clicking on Collection Name field ensure Evaluvated value popup appears and Evaluvated value should match
+  });
+
+  it("Perform Aggregate Operation on a Document", function() {
+    //Ensure by choosing command as 'Count' the following fields will be displayed 'Collection Name' and 'Array of Pipelines'
+    //Click on collection name and enter valid collection name (In which document is inserted ealrier)
+    //Clicking on Collection Name field ensure Evaluvated value popup appears and Evaluvated value should match
+  });
+});
diff --git a/app/client/cypress/manual_TestSuite/Tab_Widget_Spec.js b/app/client/cypress/manual_TestSuite/Tab_Widget_Spec.js
new file mode 100644
index 0000000000..6e88a6da63
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/Tab_Widget_Spec.js
@@ -0,0 +1,85 @@
+const dsl = require("../../../fixtures/TabWidgetDsl.json");
+
+describe("Tab widget", function() {
+  it("Movement of tabs inside Tab widget ", function() {
+    // Drag and drop the Tab widget
+    // click on "Add a Tab"
+    // Add multiple Tabs
+    // Hold and move the Tab
+    // and observe if the tab are moved in the same
+  });
+
+  it(" Deletion of Tabs and adding them back with Undo", function() {
+    // Drag and drop the Tab widget
+    // click on "Add a Tab"
+    // Add multiple Tabs
+    // Click on delete option of the Tab
+    // ensure the tab is deleted
+    // Click on delete option of the Tab
+    // Ensure an info message is dispalyed to user
+    // Now click on "UNDO"
+    //and observe that the Tab is added back
+  });
+
+  it("Test Ideas for testing the Visible option for tabs ", function() {
+    // Drag and drop the Tab widget
+    // click on "Add a Tab"
+    // Click on Property pane of the tab widget
+    // Click on the Control Pane of the tab
+    // Now click on JS option
+    // Now add it false
+    // and observe the Tab is blured on edit Mode
+    // Now click on Deploy
+    // Observe the tab is not dispalyed to user
+    // Now come back to Edit mode
+    // Click on the Control Pane of the tab
+    // Now click on JS option
+    // enable the  button
+    // Now observe the Tab must be visible and normal
+  });
+
+  it("Test Ideas for testing the Show Tabs Feature ", function() {
+    // Drag and drop the Tab widget
+    // Click on Property pane of the tab widget
+    // Scroll down to Show Tabs option
+    // Now click on JS option
+    // Now add it false
+    // and observe the Tab widget does not show any Tabs
+    // Now click on Deploy
+    // Observe the Tab widget does not show any Tabs
+    // Now come back to Edit mode
+    // Now click on JS option
+    // enable the button
+    // Now observe the Tab must be visible
+  });
+
+  it("Adding multiple widgets inside the Tab widget", function() {
+    // Drag and drop the Tab widget
+    // Ensure default 2 Tabs are dispalyed to user
+    // Add date picker, Text and Button into Tab1
+    // Click on Tab2 and ensure it is empty
+    // Add image widget , radio, Check widget
+    // Click on Deploy
+    // Ensure the Tab widget with widgets are displayed to user
+  });
+
+  it("Adding action while changing the Tab ", function() {
+    // Drag and drop the Tab widget
+    // Click on Property pane of the tab widget
+    // Navigate to Action section
+    // Select "Show a modal"
+    // Click on "Add a Modal"
+    // Assign related action on the modal
+    // Now change the tab
+    // and observe the modal pop up is displayed to user
+  });
+
+  it("Binding the Tab to widget ", function() {
+    // Drag and drop the Tab widget
+    // Click on Property pane of the tab widget
+    // Navigate to control pane
+    // Convert a Visible option to JS
+    // Add binding to the widget
+    // Ensure user is dispalyed on the TAB widget
+  });
+});
diff --git a/app/client/cypress/manual_TestSuite/Text_Widget_Spec.js b/app/client/cypress/manual_TestSuite/Text_Widget_Spec.js
new file mode 100644
index 0000000000..d180857d68
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/Text_Widget_Spec.js
@@ -0,0 +1,106 @@
+const homePage = require("../../../locators/Textwidget.json");
+
+describe("Test Ideas to test different feature of text widget ", function() {
+  it("Add New Text widget along with BG and text colour ", function() {
+    // Navigate to application
+    // Drag and drop a Text Widget
+    // Navigate to Property Pane
+    // Add a text
+    // Scroll to BG colour and add a colour
+    // Next add a text colour
+    // Click on Deploy
+  });
+
+  it("Enable Scroll feature with text colour ", function() {
+    // Navigate to application
+    // Drag and drop a Text Widget
+    // Add a long text in the "Label"
+    // Enable scroll option
+    // Navigate to Text colour and add a colour
+    // and ensure it is scrolling
+    // Click on deploy and check if it scrollable and colour selected is visible
+  });
+
+  it("Adding text Size to the Text along with BG colour ", function() {
+    // Navigate to application
+    // Drag and drop a Text Widget
+    // Navigate to Property pane
+    // Add a medium text in the "Label"
+    // Increase the area of the Text Widget
+    // Navigate to BG colour and add a colour
+    // Naviaget to "Text Size"
+    // Select Paragarph option
+    // Ensure the text size varies accordingly
+  });
+
+  it("Adding Bold Font style and Centre Text Alignment  ", function() {
+    // Navigate to application
+    // Drag and drop a Text Widget
+    // Navigate to Property pane
+    // Add a medium text in the "Label"
+    // Increase the area of the Text Widget
+    // Navigate to Font Style
+    // Make it Bold
+    // and Navigate to Alignment and make it centre
+    // Ensure the changes are visible to user
+  });
+
+  it("Adding Italic Font style and Text Alignment to exsisting text widget ", function() {
+    // Navigate to already exsisting Text widget
+    // Ensure the text is added
+    // Navigate to Property pane
+    // Navigate to Font Style
+    // Make it Italic font
+    // and Navigate to Alignment and make it Right
+    // Ensure the changes are visible to user
+  });
+
+  it("Expand and Contract text widget Property pane", function() {
+    // Navigate to already exsisting Text widget
+    // Navigate to Property pane
+    // Click on collapse option
+    // Observe that the property  pane is contracted
+    // Now click again on the arrow
+    //and ensure it collapses
+  });
+
+  it("Copy and paste a text widget", function() {
+    // Navigate to already exsisting Text widget
+    // Ensure Clour and font feature exsists
+    // Copy and paste the widget
+    // Ensure the new widget retrives the feature exsisting from parent widget
+  });
+
+  it("Rename and search a text widget", function() {
+    // Ensure there are multiple Text widget
+    // Navigate to Entity Explorer
+    // Search for "Text" keyword
+    // Click on one of the text widget
+    // Rename the text widget from the Entity explorer
+    // Clear the search keyword
+    // enter the new text widget name
+    // and observe the user is navigated to same text widget and properties of the widget does not change on renaming
+  });
+
+  it("Search and delete a text widget", function() {
+    // Ensure there are multiple Text widget
+    // Navigate to Entity Explorer
+    // Search for "Text" keyword
+    // Click on one of the text widget
+    // Ensure user is navigated to Text widget
+    // Click on Delete option
+    // Ensure the Text widget is delete
+    // Click on Deploy adn ensure the Widget is delete
+  });
+
+  it("Search and delete a text widget", function() {
+    // Ensure there are multiple Text widget
+    // Navigate to Entity Explorer
+    // Search for "Text" keyword
+    // Click on one of the text widget
+    // Ensure user is navigated to Text widget
+    // Click on Delete option
+    // Ensure the Text widget is delete
+    // Click on Deploy adn ensure the Widget is delete
+  });
+});
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index b8ad76996a..c1773bdcd7 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -20,23 +20,30 @@ const apiwidget = require("../locators/apiWidgetslocator.json");
 const dynamicInputLocators = require("../locators/DynamicInput.json");
 const explorer = require("../locators/explorerlocators.json");
 const datasource = require("../locators/DatasourcesEditor.json");
+const viewWidgetsPage = require("../locators/ViewWidgets.json");
 
 let pageidcopy = " ";
 
-Cypress.Commands.add("createOrg", (orgName) => {
+export const initLocalstorage = () => {
+  cy.window().then((window) => {
+    window.localStorage.setItem("ShowCommentsButtonToolTip", "");
+  });
+};
+
+Cypress.Commands.add("createOrg", () => {
   cy.get(homePage.createOrg)
     .should("be.visible")
     .first()
     .click({ force: true });
-  cy.xpath(homePage.inputOrgName)
+});
+
+Cypress.Commands.add("renameOrg", (orgName, newOrgName) => {
+  cy.contains(orgName).click({ force: true });
+  cy.get(homePage.renameOrgInput)
     .should("be.visible")
-    .type(orgName);
-  cy.xpath(homePage.submitBtn).click();
-  cy.wait("@applications").should(
-    "have.nested.property",
-    "response.body.responseMeta.status",
-    200,
-  );
+    .type(newOrgName)
+    .type("{enter}");
+  cy.contains(newOrgName);
 });
 
 Cypress.Commands.add(
@@ -66,6 +73,16 @@ Cypress.Commands.add("navigateToOrgSettings", (orgName) => {
   cy.get(homePage.inviteUserMembersPage).should("be.visible");
 });
 
+Cypress.Commands.add("openOrgOptionsPopup", (orgName) => {
+  cy.get(homePage.orgList.concat(orgName).concat(")"))
+    .scrollIntoView()
+    .should("be.visible");
+  cy.get(".t--org-name span")
+    .contains(orgName)
+    .first()
+    .click({ force: true });
+});
+
 Cypress.Commands.add("inviteUserForOrg", (orgName, email, role) => {
   cy.stubPostHeaderReq();
   cy.get(homePage.orgList.concat(orgName).concat(")"))
@@ -157,7 +174,11 @@ Cypress.Commands.add("deleteUserFromOrg", (orgName, email) => {
     "response.body.responseMeta.status",
     200,
   );
-  cy.get(homePage.DeleteBtn).click({ force: true });
+  cy.get(homePage.DeleteBtn)
+    .last()
+    .click({ force: true });
+  cy.get(homePage.leaveOrgConfirmModal).should("be.visible");
+  cy.get(homePage.leaveOrgConfirmButton).click({ force: true });
   cy.xpath(homePage.appHome)
     .first()
     .should("be.visible")
@@ -259,6 +280,11 @@ Cypress.Commands.add("CreateAppInFirstListedOrg", (appname) => {
     "response.body.responseMeta.status",
     200,
   );
+  /* The server created app always has an old dsl so the layout will migrate
+   * To avoid race conditions between that update layout and this one
+   * we wait for that to finish before updating layout here
+   */
+  cy.wait("@updateLayout");
 });
 
 Cypress.Commands.add(
@@ -286,6 +312,13 @@ Cypress.Commands.add(
   },
 );
 
+Cypress.Commands.add("addBasicProfileDetails", (username, password) => {
+  cy.get(datasource.authType).click();
+  cy.xpath(datasource.basic).click();
+  cy.get(datasource.basicUsername).type(username);
+  cy.get(datasource.basicPassword).type(password);
+});
+
 Cypress.Commands.add("firestoreDatasourceForm", () => {
   cy.get(datasourceEditor.datasourceConfigUrl).type(
     datasourceFormData["database-url"],
@@ -346,6 +379,8 @@ Cypress.Commands.add("LogintoApp", (uname, pword) => {
     "response.body.responseMeta.status",
     200,
   );
+
+  initLocalstorage();
 });
 
 Cypress.Commands.add("LoginFromAPI", (uname, pword) => {
@@ -438,10 +473,9 @@ Cypress.Commands.add("SearchApp", (appname) => {
 });
 
 Cypress.Commands.add("SearchEntity", (apiname1, apiname2) => {
-  cy.get(commonlocators.entityExplorersearch).should("be.visible");
   cy.get(commonlocators.entityExplorersearch)
-    .clear()
-    .type(apiname1);
+    .clear({ force: true })
+    .type(apiname1, { force: true });
   // eslint-disable-next-line cypress/no-unnecessary-waiting
   cy.wait(500);
   cy.get(
@@ -453,10 +487,10 @@ Cypress.Commands.add("SearchEntity", (apiname1, apiname2) => {
 });
 
 Cypress.Commands.add("GlobalSearchEntity", (apiname1) => {
-  cy.get(commonlocators.entityExplorersearch).should("be.visible");
+  // entity explorer search will be hidden
   cy.get(commonlocators.entityExplorersearch)
-    .clear()
-    .type(apiname1);
+    .clear({ force: true })
+    .type(apiname1, { force: true });
   // eslint-disable-next-line cypress/no-unnecessary-waiting
   cy.wait(500);
   cy.get(
@@ -474,10 +508,18 @@ Cypress.Commands.add("ResponseCheck", (textTocheck) => {
   cy.get(apiwidget.responseText).should("be.visible");
 });
 
+Cypress.Commands.add("ResponseTextCheck", (textTocheck) => {
+  cy.ResponseCheck();
+  cy.get(apiwidget.responseText).contains(textTocheck);
+});
+
 Cypress.Commands.add("NavigateToAPI_Panel", () => {
   cy.get(pages.addEntityAPI)
     .should("be.visible")
     .click({ force: true });
+  cy.get(pages.integrationCreateNew)
+    .should("be.visible")
+    .click({ force: true });
   cy.get("#loading").should("not.exist");
 });
 
@@ -608,8 +650,7 @@ Cypress.Commands.add("SelectAction", (action) => {
 });
 
 Cypress.Commands.add("ClearSearch", () => {
-  cy.get(commonlocators.entityExplorersearch).should("be.visible");
-  cy.get(commonlocators.entityExplorersearch).clear();
+  cy.get(commonlocators.entityExplorersearch).clear({ force: true });
 });
 
 Cypress.Commands.add(
@@ -623,8 +664,8 @@ Cypress.Commands.add(
     const lastChar = text.slice(-1);
 
     cy.get(commonlocators.entityExplorersearch)
-      .clear()
-      .click()
+      .clear({ force: true })
+      .click({ force: true })
       .then(() => {
         $element.text(subString);
         $element.val(subString);
@@ -634,10 +675,9 @@ Cypress.Commands.add(
 );
 
 Cypress.Commands.add("SearchEntityandOpen", (apiname1) => {
-  cy.get(commonlocators.entityExplorersearch).should("be.visible");
   cy.get(commonlocators.entityExplorersearch)
-    .clear()
-    .type(apiname1);
+    .clear({ force: true })
+    .type(apiname1, { force: true });
   // eslint-disable-next-line cypress/no-unnecessary-waiting
   cy.wait(500);
   cy.get(
@@ -649,21 +689,20 @@ Cypress.Commands.add("SearchEntityandOpen", (apiname1) => {
 });
 
 Cypress.Commands.add("enterDatasourceAndPath", (datasource, path) => {
-  cy.get(apiwidget.resourceUrl)
-    .first()
-    .click({ force: true })
-    .type(datasource);
-  /*
-  cy.xpath(apiwidget.autoSuggest)
-    .first()
-    .click({ force: true });
-    */
+  cy.enterDatasource(datasource);
   cy.get(apiwidget.editResourceUrl)
     .first()
     .click({ force: true })
     .type(path, { parseSpecialCharSequences: false });
 });
 
+Cypress.Commands.add("enterDatasource", (datasource) => {
+  cy.get(apiwidget.resourceUrl)
+    .first()
+    .click({ force: true })
+    .type(datasource);
+});
+
 Cypress.Commands.add("changeZoomLevel", (zoomValue) => {
   cy.get(commonlocators.changeZoomlevel)
     .last()
@@ -714,16 +753,14 @@ Cypress.Commands.add(
   "EnterSourceDetailsWithHeader",
   (baseUrl, v1method, hKey, hValue) => {
     cy.enterDatasourceAndPath(baseUrl, v1method);
-    cy.xpath(apiwidget.headerKey)
+    cy.get(apiwidget.headerKey)
       .first()
       .click({ force: true })
-      .type(hKey, { force: true })
-      .should("have.value", hKey);
-    cy.xpath(apiwidget.headerValue)
+      .type(hKey, { parseSpecialCharSequences: true });
+    cy.get(apiwidget.headerValue)
       .first()
       .click({ force: true })
-      .type(hValue, { force: true })
-      .should("have.value", hValue);
+      .type(hValue, { parseSpecialCharSequences: true });
     cy.WaitAutoSave();
   },
 );
@@ -816,22 +853,20 @@ Cypress.Commands.add(
   "EnterSourceDetailsWithQueryParam",
   (baseUrl, v1method, hKey, hValue, qKey, qValue) => {
     cy.enterDatasourceAndPath(baseUrl, v1method);
-    cy.xpath(apiwidget.headerKey)
+    cy.get(apiwidget.headerKey)
       .first()
       .click({ force: true })
-      .type(hKey, { force: true })
-      .should("have.value", hKey);
-    cy.xpath(apiwidget.headerValue)
+      .type(hKey, { parseSpecialCharSequences: true });
+    cy.get(apiwidget.headerValue)
       .first()
       .click({ force: true })
-      .type(hValue, { force: true })
-      .should("have.value", hValue);
-    cy.xpath(apiwidget.queryKey)
+      .type(hValue, { parseSpecialCharSequences: true });
+    cy.get(apiwidget.queryKey)
       .first()
       .click({ force: true })
       .type(qKey, { force: true })
       .should("have.value", qKey);
-    cy.xpath(apiwidget.queryValue)
+    cy.get(apiwidget.queryValue)
       .first()
       .click({ force: true })
       .type(qValue, { force: true })
@@ -852,6 +887,9 @@ Cypress.Commands.add(
 
 Cypress.Commands.add("CreationOfUniqueAPIcheck", (apiname) => {
   cy.get(pages.addEntityAPI).click();
+  cy.get(pages.integrationCreateNew)
+    .should("be.visible")
+    .click({ force: true });
   cy.get(apiwidget.createapi).click({ force: true });
   cy.wait("@createNewApi");
   // cy.wait("@getUser");
@@ -859,9 +897,9 @@ Cypress.Commands.add("CreationOfUniqueAPIcheck", (apiname) => {
   cy.get(apiwidget.ApiName).click({ force: true });
   cy.get(apiwidget.apiTxt)
     .clear()
-    .type(apiname, { force: true })
-    .should("have.value", apiname)
-    .focus();
+    .focus()
+    .type(apiname, { force: true, delay: 500 })
+    .should("have.value", apiname);
   cy.get(".error-message").should(($x) => {
     console.log($x);
     expect($x).contain(apiname.concat(" is already being used."));
@@ -1000,31 +1038,23 @@ Cypress.Commands.add("DeleteAPI", (apiname) => {
   );
 });
 
-// Cypress.Commands.add("CreateModal", () => {
-//   cy.get(modalWidgetPage.selectModal).click();
-//   cy.get(modalWidgetPage.createModalButton).click({ force: true });
-//   cy.get(modalWidgetPage.controlModalType)
-//     .find(".bp3-button")
-//     .click({ force: true })
-//     .get("ul.bp3-menu")
-//     .children()
-//     .contains("Alert Modal")
-//     .click();
-//   cy.get(modalWidgetPage.controlModalType)
-//     .find(".bp3-button > .bp3-button-text")
-//     .should("have.text", "Alert Modal");
-//   cy.get(commonlocators.editPropCrossButton).click({force: true});
-//   cy.reload();
-// });
+Cypress.Commands.add("AddActionWithModal", () => {
+  cy.get(commonlocators.dropdownSelectButton)
+    .last()
+    .click();
+  cy.get(".single-select")
+    .contains("Open Modal")
+    .click({ force: true });
+  cy.get(modalWidgetPage.selectModal).click();
+  cy.get(modalWidgetPage.createModalButton).click({ force: true });
+  cy.get(commonlocators.editPropCrossButton).click({ force: true });
+});
 
 Cypress.Commands.add("createModal", (modalType, ModalName) => {
-  cy.get(widgetsPage.buttonOnClick)
-    .last()
+  cy.get(widgetsPage.actionSelect)
+    .first()
     .click({ force: true });
-  cy.get("ul.bp3-menu")
-    .children()
-    .contains("Open Modal")
-    .click();
+  cy.selectOnClickOption("Open Modal");
   cy.get(modalWidgetPage.selectModal).click();
   cy.get(modalWidgetPage.createModalButton).click({ force: true });
 
@@ -1057,14 +1087,18 @@ Cypress.Commands.add("createModal", (modalType, ModalName) => {
   cy.get(".bp3-overlay-backdrop").click({ force: true });
 });
 
+Cypress.Commands.add("selectOnClickOption", (option) => {
+  cy.get("ul.bp3-menu div.bp3-fill")
+    .wait(500)
+    .contains(option)
+    .click({ force: true });
+});
+
 Cypress.Commands.add("updateModal", (modalType, ModalName) => {
-  cy.get(".t--open-dropdown-Select-Action")
+  cy.get(widgetsPage.actionSelect)
     .first()
     .click({ force: true });
-  cy.get("ul.bp3-menu")
-    .children()
-    .contains("Open Modal")
-    .click();
+  cy.selectOnClickOption("Open Modal");
   cy.get(modalWidgetPage.selectModal).click();
   cy.get(modalWidgetPage.createModalButton).click({ force: true });
 
@@ -1110,6 +1144,13 @@ Cypress.Commands.add("UncheckWidgetProperties", (checkboxCss) => {
   cy.assertPageSave();
 });
 
+Cypress.Commands.add("EditWidgetPropertiesUsingJS", (checkboxCss, inputJS) => {
+  cy.get(checkboxCss)
+    .click()
+    .type(inputJS);
+  cy.assertPageSave();
+});
+
 Cypress.Commands.add(
   "ChangeTextStyle",
   (dropDownValue, textStylecss, labelName) => {
@@ -1132,7 +1173,7 @@ Cypress.Commands.add("widgetText", (text, inputcss, innercss) => {
   cy.get(inputcss)
     .first()
     .trigger("mouseover", { force: true });
-  cy.get(innercss).should("have.text", text);
+  cy.contains(innercss, text);
 });
 
 Cypress.Commands.add("editColName", (text) => {
@@ -1609,15 +1650,15 @@ Cypress.Commands.add("addDsl", (dsl) => {
     //Fetch the layout id
     cy.server();
     cy.request("GET", "api/v1/pages/" + pageid).then((response) => {
-      const len = JSON.stringify(response.body);
-      cy.log(len);
-      layoutId = JSON.parse(len).data.layouts[0].id;
-      // Dumpimg the DSL to the created page
+      const respBody = JSON.stringify(response.body);
+      layoutId = JSON.parse(respBody).data.layouts[0].id;
+      // Dumping the DSL to the created page
       cy.request(
         "PUT",
         "api/v1/layouts/" + layoutId + "/pages/" + pageid,
         dsl,
       ).then((response) => {
+        cy.log(response.body);
         expect(response.status).equal(200);
         cy.reload();
       });
@@ -1691,9 +1732,7 @@ Cypress.Commands.add("getAlert", (alertcss) => {
 
   cy.get(alertcss)
     .click({ force: true })
-    .type("{command}{A}{del}")
-    .type("hello")
-    .should("not.to.be.empty");
+    .type("hello");
   cy.get(".t--open-dropdown-Select-type").click({ force: true });
   cy.get(".bp3-popover-content .bp3-menu li")
     .contains("Success")
@@ -1723,9 +1762,7 @@ Cypress.Commands.add(
 
     cy.get(alertcss)
       .click({ force: true })
-      .type("{command}{A}{del}")
-      .type("hello")
-      .should("not.to.be.empty");
+      .type("hello");
     cy.get(".t--open-dropdown-Select-type").click({ force: true });
     cy.get(".bp3-popover-content .bp3-menu li")
       .contains("Success")
@@ -1733,17 +1770,20 @@ Cypress.Commands.add(
   },
 );
 
+Cypress.Commands.add("addQueryFromLightningMenu", (QueryName) => {
+  cy.get(commonlocators.dropdownSelectButton)
+    .first()
+    .click({ force: true })
+    .selectOnClickOption("Execute a Query")
+    .selectOnClickOption(QueryName);
+});
+
 Cypress.Commands.add("addAPIFromLightningMenu", (ApiName) => {
   cy.get(commonlocators.dropdownSelectButton)
+    .first()
     .click({ force: true })
-    .get("ul.bp3-menu")
-    .children()
-    .contains("Call An API")
-    .click({ force: true })
-    .get("ul.bp3-menu")
-    .children()
-    .contains(ApiName)
-    .click({ force: true });
+    .selectOnClickOption("Execute a Query")
+    .selectOnClickOption(ApiName);
 });
 
 Cypress.Commands.add("radioInput", (index, text) => {
@@ -1815,7 +1855,11 @@ Cypress.Commands.add("testSaveDeleteDatasource", () => {
     200,
   );
 
-  cy.get(datasourceEditor.editDatasource).click();
+  cy.get(
+    `${datasourceEditor.datasourceCard} ${datasourceEditor.editDatasource}`,
+  )
+    .last()
+    .click();
 
   cy.get(".t--delete-datasource").click();
   cy.wait("@deleteDatasource").should(
@@ -1838,7 +1882,9 @@ Cypress.Commands.add("NavigateToDatasourceEditor", () => {
   cy.get(explorer.addDBQueryEntity)
     .last()
     .click({ force: true });
-  cy.get(queryEditor.addDatasource).click();
+  cy.get(pages.integrationCreateNew)
+    .should("be.visible")
+    .click({ force: true });
 });
 
 Cypress.Commands.add("NavigateToQueryEditor", () => {
@@ -1859,16 +1905,20 @@ Cypress.Commands.add("testDatasource", () => {
 
 Cypress.Commands.add("saveDatasource", () => {
   cy.get(".t--save-datasource").click();
-  cy.wait("@saveDatasource").should(
-    "have.nested.property",
-    "response.body.responseMeta.status",
-    200,
-  );
+  cy.wait("@saveDatasource")
+    .then((xhr) => {
+      cy.log(JSON.stringify(xhr.response.body));
+    })
+    .should("have.nested.property", "response.body.responseMeta.status", 200);
 });
 
 Cypress.Commands.add("testSaveDatasource", () => {
   cy.saveDatasource();
-  cy.get(datasourceEditor.editDatasource).click();
+  cy.get(
+    `${datasourceEditor.datasourceCard} ${datasourceEditor.editDatasource}`,
+  )
+    .last()
+    .click();
   cy.testDatasource();
 });
 
@@ -1926,7 +1976,9 @@ Cypress.Commands.add("createPostgresDatasource", () => {
 
 Cypress.Commands.add("deleteDatasource", (datasourceName) => {
   cy.NavigateToQueryEditor();
-
+  cy.get(pages.integrationActiveTab)
+    .should("be.visible")
+    .click({ force: true });
   cy.contains(".t--datasource-name", datasourceName)
     .find(".t--edit-datasource")
     .click();
@@ -1986,7 +2038,8 @@ Cypress.Commands.add("runAndDeleteQuery", () => {
     200,
   );
 
-  cy.get(queryEditor.deleteQuery).click();
+  cy.get(queryEditor.queryMoreAction).click();
+  cy.get(queryEditor.deleteUsingContext).click();
   cy.wait("@deleteAction").should(
     "have.nested.property",
     "response.body.responseMeta.status",
@@ -2000,8 +2053,8 @@ Cypress.Commands.add("dragAndDropToCanvas", (widgetType, { x, y }) => {
     .trigger("mousedown", { button: 0 }, { force: true })
     .trigger("mousemove", x, y, { force: true });
   cy.get(explorer.dropHere)
-    .click()
-    .trigger("mouseup", { force: true });
+    .trigger("mousemove", x, y)
+    .trigger("mouseup", x, y + 20);
 });
 
 Cypress.Commands.add("executeDbQuery", (queryName) => {
@@ -2010,7 +2063,7 @@ Cypress.Commands.add("executeDbQuery", (queryName) => {
     .click({ force: true })
     .get("ul.bp3-menu")
     .children()
-    .contains("Execute a DB Query")
+    .contains("Execute a Query")
     .click({ force: true })
     .get("ul.bp3-menu")
     .children()
@@ -2018,25 +2071,175 @@ Cypress.Commands.add("executeDbQuery", (queryName) => {
     .click({ force: true });
 });
 
+Cypress.Commands.add("CreateMockQuery", (queryName) => {
+  // cy.get(queryEditor.addNewQueryBtn).click({ force: true });
+  cy.get(queryEditor.createQuery)
+    .first()
+    .click({ force: true });
+  cy.get(queryEditor.queryNameField).type(queryName + "{enter}", {
+    force: true,
+  });
+  cy.assertPageSave();
+  cy.get(queryEditor.templateMenu + " div")
+    .contains("Select")
+    .click({ force: true });
+  cy.runQuery();
+  // cy.wait(3000);
+  // cy.get(queryEditor.runQuery)
+  //   .click({force: true});
+});
+
 Cypress.Commands.add("openPropertyPane", (widgetType) => {
   const selector = `.t--draggable-${widgetType}`;
   cy.get(selector)
     .first()
     .trigger("mouseover", { force: true })
     .wait(500);
-  cy.get(`${selector}:first-of-type .t--widget-propertypane-toggle`)
+  cy.get(
+    `${selector}:first-of-type .t--widget-propertypane-toggle > .t--widget-name`,
+  )
     .first()
     .click({ force: true });
   // eslint-disable-next-line cypress/no-unnecessary-waiting
   cy.wait(1000);
 });
 
+Cypress.Commands.add("openPropertyPaneCopy", (widgetType) => {
+  const selector = `.t--draggable-${widgetType}`;
+  cy.get(selector)
+    .last()
+    .trigger("mouseover", { force: true })
+    .wait(500);
+  cy.get(
+    `${selector}:first-of-type .t--widget-propertypane-toggle > .t--widget-name`,
+  )
+    .first()
+    .click({ force: true });
+  // eslint-disable-next-line cypress/no-unnecessary-waiting
+  cy.wait(1000);
+});
+
+Cypress.Commands.add("changeButtonStyle", (index, buttonColor, hoverColor) => {
+  cy.get(widgetsPage.buttonStyleDropdown).click({ force: true });
+  cy.get(
+    ".bp3-popover-content .t--dropdown-option:nth-child(" + index + ")",
+  ).click({ force: true });
+  cy.PublishtheApp();
+  cy.get(widgetsPage.widgetBtn).should(
+    "have.css",
+    "background-color",
+    buttonColor,
+  );
+  // cy.get(buttonBackground)
+  //   .first()
+  //   .trigger('mouseover', { force: true });
+  // cy.get(buttonBackground)
+  //   .should('have.css', 'background-color', hoverColor);
+  cy.wait(1000);
+});
+
 Cypress.Commands.add("closePropertyPane", () => {
   cy.get(commonlocators.editPropCrossButton).click({ force: true });
 });
 
+Cypress.Commands.add("onClickActions", (forSuccess, forFailure) => {
+  // Filling the messages for success/failure in the onClickAction of the button widget.
+  // For Success
+  cy.get(".code-highlight")
+    .children()
+    .contains("No Action")
+    .first()
+    .click({ force: true })
+    .selectOnClickOption("Show Message")
+    .get("div.t--property-control-onclick div.CodeMirror-lines")
+    .click()
+    .type(forSuccess)
+    .get("button.t--open-dropdown-Select-type")
+    .click()
+    .get("a.single-select div")
+    .contains(forSuccess)
+    .click();
+
+  cy.wait(2000);
+  // For Failure
+  cy.get(".code-highlight")
+    .children()
+    .contains("No Action")
+    .last()
+    .click({ force: true })
+    .selectOnClickOption("Show Message")
+    .get("div.t--property-control-onclick div.CodeMirror-lines")
+    .last()
+    .click()
+    .type(forFailure)
+    .get("button.t--open-dropdown-Select-type")
+    .last()
+    .click()
+    .get("a.single-select div")
+    .contains(forFailure)
+    .click();
+});
+
+Cypress.Commands.add("copyWidget", (widget, widgetLocator) => {
+  const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
+  //Copy widget and verify all properties
+  cy.get(widgetsPage.propertypaneText)
+    .children()
+    .last()
+    .invoke("text")
+    .then((x) => {
+      cy.log(x);
+      let originalWidget = x.replaceAll("x", "");
+      originalWidget = originalWidget.replaceAll(/\u200B/g, "");
+      cy.log(originalWidget);
+      cy.get(widgetsPage.copyWidget).click({ force: true });
+      cy.reload();
+      // Wait for the widget to be appear in the DOM and press Ctrl/Cmd + V to paste the button.
+      cy.get(widgetLocator).should("be.visible");
+      cy.get("body").type(`{${modifierKey}}v`);
+      cy.wait(2000);
+      cy.openPropertyPaneCopy(widget);
+      cy.get(widgetsPage.propertypaneText)
+        .children()
+        .last()
+        .invoke("text")
+        .then((y) => {
+          cy.log(y);
+          let copiedWidget = y.replaceAll("x", "");
+          copiedWidget = copiedWidget.replaceAll(/\u200B/g, "");
+          cy.log(copiedWidget);
+          expect(originalWidget).to.be.equal(copiedWidget);
+        });
+    });
+});
+
+Cypress.Commands.add("deleteWidget", (widget) => {
+  // Delete the button widget
+  cy.get(widgetsPage.removeWidget).click({ force: true });
+  cy.get(widgetsPage.deleteToast).should("have.text", "UNDO");
+});
+
+Cypress.Commands.add("UpdateChartType", (typeOfChart) => {
+  // Command to change the chart type if the property pane of the chart widget is opened.
+  cy.get(viewWidgetsPage.chartType)
+    .last()
+    .click({ force: true });
+  cy.get(commonlocators.dropdownmenu)
+    .children()
+    .contains(typeOfChart)
+    .click({ force: true });
+
+  cy.get(viewWidgetsPage.chartType + " span.cs-text").should(
+    "have.text",
+    typeOfChart,
+  );
+});
+
 Cypress.Commands.add("createAndFillApi", (url, parameters) => {
   cy.NavigateToApiEditor();
+  cy.get(pages.integrationCreateNew)
+    .should("be.visible")
+    .click({ force: true });
   cy.testCreateApiButton();
   cy.get("@createNewApi").then((response) => {
     cy.get(ApiEditor.ApiNameField).should("be.visible");
@@ -2187,6 +2390,8 @@ Cypress.Commands.add("startServerAndRoutes", () => {
   cy.route("PUT", "/api/v1/actions/move").as("moveAction");
 
   cy.route("POST", "/api/v1/organizations").as("createOrg");
+  cy.route("POST", "api/v1/applications/import/*").as("importNewApplication");
+  cy.route("GET", "api/v1/applications/export/*").as("exportApplication");
   cy.route("GET", "/api/v1/organizations/roles?organizationId=*").as(
     "getRoles",
   );
@@ -2200,6 +2405,7 @@ Cypress.Commands.add("startServerAndRoutes", () => {
   cy.route("POST", "/api/v1/organizations/*/logo").as("updateLogo");
   cy.route("DELETE", "/api/v1/organizations/*/logo").as("deleteLogo");
   cy.route("POST", "/api/v1/applications/*/fork/*").as("postForkAppOrg");
+  cy.route("PUT", "/api/v1/users/leaveOrganization/*").as("leaveOrgApiCall");
 });
 
 Cypress.Commands.add("alertValidate", (text) => {
@@ -2242,8 +2448,6 @@ Cypress.Commands.add("assertEvaluatedValuePopup", (expectedType) => {
   cy.get(dynamicInputLocators.evaluatedValue)
     .should("be.visible")
     .children("p")
-    .should("contain.text", "Expected Data Type")
-    .should("contain.text", "Evaluated Value")
     .siblings("pre")
     .should("have.text", expectedType);
 });
@@ -2319,15 +2523,33 @@ Cypress.Commands.add("ValidatePaginationInputData", () => {
 Cypress.Commands.add("callApi", (apiname) => {
   cy.get(commonlocators.callApi)
     .first()
-    .click();
+    .click({ force: true });
   cy.get(commonlocators.singleSelectMenuItem)
-    .contains("Call An API")
-    .click();
+    .contains("Execute a Query")
+    .click({ force: true });
   cy.get(commonlocators.selectMenuItem)
     .contains(apiname)
-    .click();
+    .click({ force: true });
 });
 
 Cypress.Commands.add("assertPageSave", () => {
   cy.get(commonlocators.saveStatusSuccess);
 });
+
+Cypress.Commands.add("ValidateQueryParams", (param) => {
+  cy.xpath(apiwidget.paramsTab)
+    .should("be.visible")
+    .click({ force: true });
+
+  cy.validateCodeEditorContent(apiwidget.paramKey, param.key);
+  cy.validateCodeEditorContent(apiwidget.paramValue, param.value);
+});
+
+Cypress.Commands.add(
+  "validateCodeEditorContent",
+  (selector, contentToValidate) => {
+    cy.get(selector).within(() => {
+      cy.get(".CodeMirror-code").should("have.text", contentToValidate);
+    });
+  },
+);
diff --git a/app/client/cypress/support/index.js b/app/client/cypress/support/index.js
index 71c1be4d99..bf914f1c91 100644
--- a/app/client/cypress/support/index.js
+++ b/app/client/cypress/support/index.js
@@ -18,6 +18,7 @@ let appId;
 
 // Import commands.js using ES2015 syntax:
 import "./commands";
+import { initLocalstorage } from "./commands";
 
 Cypress.on("uncaught:exception", (err, runnable) => {
   // returning false here prevents Cypress from
@@ -31,11 +32,13 @@ Cypress.on("fail", (error, runnable) => {
 });
 
 before(function() {
+  initLocalstorage();
   cy.startServerAndRoutes();
   // Clear indexedDB
   cy.window().then((window) => {
     window.indexedDB.deleteDatabase("Appsmith");
   });
+
   const username = Cypress.env("USERNAME");
   const password = Cypress.env("PASSWORD");
   cy.LoginFromAPI(username, password);
@@ -58,6 +61,7 @@ before(function() {
 });
 
 beforeEach(function() {
+  initLocalstorage();
   Cypress.Cookies.preserveOnce("SESSION", "remember_token");
   cy.startServerAndRoutes();
 });
diff --git a/app/client/cypress/test.sh b/app/client/cypress/test.sh
index b1a36fb9d4..f8c75f22cc 100755
--- a/app/client/cypress/test.sh
+++ b/app/client/cypress/test.sh
@@ -27,10 +27,10 @@ if [ "$target" == "ci" ]; then
     # On the CI server run the tests in parallel
     # This requires the projectId and the record_key to be configured in your environment variables. By default this is defined on the CI server
     echo "Got the Build ID: $BUILD_ID"
-    $(npm bin)/cypress run --headless --browser chrome \
+    $(npm bin)/cypress run --headless \
     --record --key "$CYPRESS_RECORD_KEY" --ci-build-id $BUILD_ID \
     --parallel --group "Electrons on Gitlab CI" \
     --spec "cypress/integration/Smoke_TestSuite/**/*.js"
 else
-    $(npm bin)/cypress run --headless --browser chrome --spec "cypress/integration/Smoke_TestSuite/**/*.js"
+    $(npm bin)/cypress run --headless --browser chromium --spec "cypress/integration/Smoke_TestSuite/**/*.js"
 fi
diff --git a/app/client/docker/templates/nginx-app.conf.template b/app/client/docker/templates/nginx-app.conf.template
index 4b7c5fdf4e..6b8ed93474 100644
--- a/app/client/docker/templates/nginx-app.conf.template
+++ b/app/client/docker/templates/nginx-app.conf.template
@@ -48,6 +48,7 @@ server {
         sub_filter __APPSMITH_MAIL_ENABLED__ '${APPSMITH_MAIL_ENABLED}';
         sub_filter __APPSMITH_DISABLE_TELEMETRY__ '${APPSMITH_DISABLE_TELEMETRY}';
         sub_filter __APPSMITH_CLOUD_SERVICES_BASE_URL__ '${APPSMITH_CLOUD_SERVICES_BASE_URL}';
+        sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
     }
 
     location /f {
diff --git a/app/client/jest.config.js b/app/client/jest.config.js
index c88bf5f8ec..f390ccddc2 100644
--- a/app/client/jest.config.js
+++ b/app/client/jest.config.js
@@ -27,6 +27,9 @@ module.exports = {
     "test/(.*)": "<rootDir>/test/$1",
   },
   globals: {
+    "ts-jest": {
+      isolatedModules: true,
+    },
     APPSMITH_FEATURE_CONFIGS: {
       sentry: {
         dsn: parseConfig("__APPSMITH_SENTRY_DSN__"),
diff --git a/app/client/netlify.toml b/app/client/netlify.toml
index 435adaafc5..4f0c0edc20 100644
--- a/app/client/netlify.toml
+++ b/app/client/netlify.toml
@@ -8,35 +8,20 @@
     REACT_APP_ALGOLIA_SEARCH_INDEX_NAME = "test_appsmith"
     REACT_APP_CLIENT_LOG_LEVEL = "debug"
     REACT_APP_GOOGLE_MAPS_API_KEY = "AIzaSyBOQFulljufGt3VDhBAwNjZN09KEFufVyg"
+    REACT_APP_GOOGLE_RECAPTCHA_SITE_KEY = ""
     REACT_APP_TNC_PP = "true"
     REACT_APP_CLOUD_HOSTING = "true"
     REACT_APP_INTERCOM_APP_ID = "y10e7138"
     REACT_APP_MAIL_ENABLED = "true"
     REACT_APP_SENTRY_DSN = "https://abf15a075d1347969df44c746cca7eaa@o296332.ingest.sentry.io/1546547"
     REACT_APP_SENTRY_ENVIRONMENT = "Production"
+    REACT_APP_SHOW_ONBOARDING_FORM = "true"
     SENTRY_AUTH_TOKEN = "dfdf7fa46c5b483a944b4571554d6466da3c64a6ed8b46e3b8a4285183a6bcc3"
     SENTRY_DSN = "https://abf15a075d1347969df44c746cca7eaa@o296332.ingest.sentry.io/1546547"
     SENTRY_ORG = "appsmith"
     SENTRY_PROJECT = "appsmith"
     SENTRY_LOG_LEVEL = "info"
 
-[context.production]
-  [context.production.environment]
-    REACT_APP_ENVIRONMENT = "PRODUCTION"
-    REACT_APP_SENTRY_ENVIRONMENT = "Production"
-    REACT_APP_SMART_LOOK_ID = "c370af0df0edf38360adbefbdc47d2b42ea137c9"
-    REACT_APP_SEGMENT_KEY = "9OnZ6LnDztuZZo4zXfoutEEBB2wftHUH"
-    REACT_APP_BASE_URL = "https://api.appsmith.com"
-    APP_HOST = "app.appsmith.com"
-    REACT_APP_CLIENT_LOG_LEVEL = "error"
-
-[context.release]
-  [context.release.environment]
-    REACT_APP_ENVIRONMENT = "STAGING"
-    REACT_APP_SENTRY_ENVIRONMENT = "Staging"
-    REACT_APP_BASE_URL = "https://release.app.appsmith.com"
-    APP_HOST = "release.app.appsmith.com"
-
 [context.deploy-preview]
   [context.deploy-preview.environment]
     REACT_APP_ENVIRONMENT = "STAGING"
diff --git a/app/client/package.json b/app/client/package.json
index bc24cf83d9..f2ee5e6319 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -16,7 +16,7 @@
     "@blueprintjs/timezone": "^3.6.0",
     "@craco/craco": "^5.7.0",
     "@draft-js-plugins/editor": "^4.1.0",
-    "@draft-js-plugins/mention": "^4.3.2",
+    "@draft-js-plugins/mention": "^4.5.1",
     "@fusioncharts/powercharts": "^3.16.0",
     "@github/g-emoji-element": "^1.1.5",
     "@manaflair/redux-batch": "^1.0.0",
@@ -40,10 +40,12 @@
     "@types/react-table": "^7.0.13",
     "@types/styled-components": "^5.1.3",
     "@types/tinycolor2": "^1.4.2",
+    "@types/zipcelx": "^1.5.0",
     "@uppy/core": "^1.16.0",
     "@uppy/dashboard": "^1.16.0",
     "@uppy/file-input": "^1.4.22",
     "@uppy/google-drive": "^1.5.22",
+    "@uppy/image-editor": "^0.2.4",
     "@uppy/onedrive": "^1.1.22",
     "@uppy/react": "^1.11.2",
     "@uppy/url": "^1.5.16",
@@ -61,11 +63,11 @@
     "deep-diff": "^1.0.2",
     "downloadjs": "^1.4.7",
     "draft-js": "^0.11.7",
-    "emoji-picker-react": "^3.4.2",
+    "emoji-mart": "^3.0.1",
     "eslint": "^7.11.0",
     "fast-deep-equal": "^3.1.1",
     "fast-xml-parser": "^3.17.5",
-    "flow-bin": "^0.91.0",
+    "flow-bin": "^0.148.0",
     "fuse.js": "^3.4.5",
     "fusioncharts": "^3.16.0",
     "history": "^4.10.1",
@@ -73,13 +75,14 @@
     "immer": "^8.0.1",
     "instantsearch.css": "^7.4.2",
     "instantsearch.js": "^4.4.1",
-    "interweave": "^12.1.1",
-    "interweave-autolink": "^4.0.1",
+    "interweave": "^12.7.2",
+    "interweave-autolink": "^4.4.2",
     "js-sha256": "^0.9.0",
+    "jshint": "^2.12.0",
     "json-fn": "^1.1.1",
     "lint-staged": "^9.2.5",
     "localforage": "^1.7.3",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.21",
     "lodash-es": "4.17.14",
     "lodash-move": "^1.1.1",
     "loglevel": "^1.6.7",
@@ -88,12 +91,13 @@
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.27",
     "nanoid": "^2.0.4",
-    "node-sass": "^4.11.0",
+    "node-forge": "^0.10.0",
+    "node-sass": "^6.0.1",
     "normalizr": "^3.3.0",
     "path-to-regexp": "^6.2.0",
     "popper.js": "^1.15.0",
     "prettier": "^1.18.2",
-    "prismjs": "^1.23.0",
+    "prismjs": "^1.24.0",
     "rc-pagination": "^3.1.3",
     "re-reselect": "^3.4.0",
     "react": "^16.12.0",
@@ -105,6 +109,7 @@
     "react-dnd-touch-backend": "^9.4.0",
     "react-dom": "^16.7.0",
     "react-google-maps": "^9.4.5",
+    "react-google-recaptcha": "^2.1.0",
     "react-helmet": "^5.2.1",
     "react-infinite-scroller": "^1.2.4",
     "react-instantsearch-dom": "^6.4.0",
@@ -112,6 +117,7 @@
     "react-mentions": "^4.1.1",
     "react-paginating": "^1.4.0",
     "react-player": "^2.3.1",
+    "react-rating": "^2.0.5",
     "react-redux": "^7.1.3",
     "react-router": "^5.1.2",
     "react-router-dom": "^5.1.2",
@@ -123,6 +129,7 @@
     "react-toastify": "^5.5.0",
     "react-transition-group": "^4.3.0",
     "react-use-gesture": "^7.0.4",
+    "react-virtuoso": "^1.9.0",
     "react-window": "^1.8.6",
     "react-zoom-pan-pinch": "^1.6.1",
     "redux": "^4.0.1",
@@ -144,12 +151,12 @@
     "typescript": "^4.1.3",
     "unescape-js": "^1.1.4",
     "url-search-params-polyfill": "^8.0.0",
-    "worker-loader": "^3.0.2"
+    "worker-loader": "^3.0.2",
+    "zipcelx": "^1.6.2"
   },
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
-    "start": "BROWSER=none EXTEND_ESLINT=true REACT_APP_ENVIRONMENT=DEVELOPMENT HOST=dev.appsmith.com craco start",
-    "start-m1": "BROWSER=none EXTEND_ESLINT=true REACT_APP_ENVIRONMENT=DEVELOPMENT HOST=0.0.0.0 craco start",
+    "start": "BROWSER=none EXTEND_ESLINT=true REACT_APP_ENVIRONMENT=DEVELOPMENT REACT_APP_CLIENT_LOG_LEVEL=debug HOST=dev.appsmith.com craco start",
     "build": "./build.sh",
     "build-local": "craco --max-old-space-size=4096 build --config craco.build.config.js",
     "build-staging": "REACT_APP_ENVIRONMENT=STAGING craco --max-old-space-size=4096 build --config craco.build.config.js",
@@ -161,7 +168,8 @@
     "test:unit": "$(npm bin)/jest -b --colors --no-cache --coverage --collectCoverage=true --coverageDirectory='../../' --coverageReporters='json-summary'",
     "test:jest": "$(npm bin)/jest --watch",
     "storybook": "start-storybook -p 9009 -s public",
-    "build-storybook": "build-storybook -s public"
+    "build-storybook": "build-storybook -s public",
+    "postinstall": "patch-package"
   },
   "resolution": {
     "jest": "24.8.0"
@@ -195,15 +203,20 @@
     "@types/deep-diff": "^1.0.0",
     "@types/downloadjs": "^1.4.2",
     "@types/draft-js": "^0.11.1",
+    "@types/emoji-mart": "^3.0.4",
     "@types/jest": "^24.0.22",
+    "@types/jshint": "^2.12.0",
     "@types/marked": "^1.2.2",
+    "@types/node-forge": "^0.10.0",
     "@types/react-beautiful-dnd": "^11.0.4",
+    "@types/react-google-recaptcha": "^2.1.1",
     "@types/react-select": "^3.0.5",
     "@types/react-tabs": "^2.3.1",
     "@types/react-test-renderer": "^17.0.1",
     "@types/react-window": "^1.8.2",
     "@types/redux-form": "^8.1.9",
     "@types/redux-mock-store": "^1.0.2",
+    "@types/resize-observer-browser": "^0.1.5",
     "@types/styled-system": "^5.1.9",
     "@types/tern": "0.22.0",
     "@types/toposort": "^2.0.3",
@@ -224,6 +237,7 @@
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.21.3",
     "eslint-plugin-react-hooks": "^2.3.0",
+    "eslint-plugin-sort-destructure-keys": "^1.3.5",
     "factory.ts": "^0.5.1",
     "jest-canvas-mock": "^2.3.1",
     "mocha": "^7.1.0",
@@ -231,6 +245,8 @@
     "mochawesome": "^5.0.0",
     "mochawesome-report-generator": "^4.1.0",
     "msw": "^0.28.0",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
     "raw-loader": "^4.0.2",
     "react-docgen-typescript-loader": "^3.6.0",
     "react-is": "^16.12.0",
diff --git a/app/client/patches/@blueprintjs+core+3.36.0.patch b/app/client/patches/@blueprintjs+core+3.36.0.patch
new file mode 100644
index 0000000000..3342cbfefc
--- /dev/null
+++ b/app/client/patches/@blueprintjs+core+3.36.0.patch
@@ -0,0 +1,22 @@
+diff --git a/node_modules/@blueprintjs/core/lib/esm/components/editable-text/editableText.js b/node_modules/@blueprintjs/core/lib/esm/components/editable-text/editableText.js
+index 84f03fa..5e5488a 100644
+--- a/node_modules/@blueprintjs/core/lib/esm/components/editable-text/editableText.js
++++ b/node_modules/@blueprintjs/core/lib/esm/components/editable-text/editableText.js
+@@ -188,7 +188,16 @@ var EditableText = /** @class */ (function (_super) {
+         if (this.state.isEditing && !prevState.isEditing) {
+             (_b = (_a = this.props).onEdit) === null || _b === void 0 ? void 0 : _b.call(_a, this.state.value);
+         }
+-        this.updateInputDimensions();
++        // updateInputDimensions is an expensive method. Call it only when the props
++        // it depends on change
++        if (this.state.value !== prevState.value ||
++            this.props.alwaysRenderInput !== prevProps.alwaysRenderInput ||
++            this.props.maxLines !== prevProps.maxLines ||
++            this.props.minLines !== prevProps.minLines ||
++            this.props.minWidth !== prevProps.minWidth ||
++            this.props.multiline !== prevProps.multiline) {
++            this.updateInputDimensions();
++        }
+     };
+     EditableText.prototype.renderInput = function (value) {
+         var _a = this.props, disabled = _a.disabled, maxLength = _a.maxLength, multiline = _a.multiline, type = _a.type, placeholder = _a.placeholder;
diff --git a/app/client/public/index.html b/app/client/public/index.html
index 558f9ccca9..a022cc7b1c 100755
--- a/app/client/public/index.html
+++ b/app/client/public/index.html
@@ -33,6 +33,11 @@
   <!-- End Google Tag Manager (noscript) -->
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="loader" style="width: 30vw;"></div>
+  <!--
+    To keep zIndex for tooltips higher than app comments, todo remove when migrating to Tooltip2
+    Currently the className does not apply to the portal root, so we're unable to work with z-indexes based on that
+  -->
+  <div id="tooltip-root"></div>
   <div id="header-root"></div>
   <div id="root"></div>
   <script type="text/javascript">
@@ -75,7 +80,7 @@
         return window.localStorage.setItem(key, value);
       }
     };
-    
+
     // Note: The following handler is necessary for when we have a new deployment.
 
     // What happens?
@@ -98,7 +103,7 @@
       const regex = /\/static\/js\/(\w.+).js$/;
       const chunkLoadErrorMessage = "Unexpected token '<'"
       if(regex.test(url) && url.indexOf(window.location.host) > -1 && message.includes(chunkLoadErrorMessage)) {
-        console.log("chunk load failed!", url);
+        console.error("chunk load failed!", url);
         // First check if we've set the flag to not reload on chunk load fail
         const donotReload = localStorageUtil.getItem("donotReloadOnChunkLoadFail");
           if(!donotReload){
@@ -126,7 +131,7 @@
       if ("serviceWorker" in navigator) {
         window.addEventListener("load", function () {
           navigator.serviceWorker.register("/pageService.js").catch(error => {
-            console.log("Service Worker Registration failed: " + error);
+            console.error("Service Worker Registration failed: " + error);
           });
         });
       }
@@ -199,7 +204,8 @@
       intercomAppID: APP_ID,
       mailEnabled: parseConfig("__APPSMITH_MAIL_ENABLED__"),
       disableTelemetry: DISABLE_TELEMETRY === "" || DISABLE_TELEMETRY,
-      cloudServicesBaseUrl: parseConfig("__APPSMITH_CLOUD_SERVICES_BASE_URL__")
+      cloudServicesBaseUrl: parseConfig("__APPSMITH_CLOUD_SERVICES_BASE_URL__") || "https://cs.appsmith.com",
+      googleRecaptchaSiteKey: parseConfig("__APPSMITH_RECAPTCHA_SITE_KEY__"),
     };
 
   </script>
diff --git a/app/client/src/AppRouter.tsx b/app/client/src/AppRouter.tsx
index 1ba02d5b77..430762a01b 100644
--- a/app/client/src/AppRouter.tsx
+++ b/app/client/src/AppRouter.tsx
@@ -13,6 +13,7 @@ import {
   getApplicationViewerPageURL,
   ORG_URL,
   SIGN_UP_URL,
+  SIGNUP_SUCCESS_URL,
   USER_AUTH_URL,
   USERS_URL,
   PROFILE,
@@ -47,7 +48,8 @@ function changeAppBackground(currentTheme: any) {
   if (
     trimTrailingSlash(window.location.pathname) === "/applications" ||
     window.location.pathname.indexOf("/settings/") !== -1 ||
-    trimTrailingSlash(window.location.pathname) === "/profile"
+    trimTrailingSlash(window.location.pathname) === "/profile" ||
+    trimTrailingSlash(window.location.pathname) === "/signup-success"
   ) {
     document.body.style.backgroundColor =
       currentTheme.colors.homepageBackground;
@@ -101,6 +103,11 @@ class AppRouter extends React.Component<any, any> {
                   exact
                   path={APPLICATIONS_URL}
                 />
+                <SentryRoute
+                  component={ApplicationListLoader}
+                  exact
+                  path={SIGNUP_SUCCESS_URL}
+                />
                 <SentryRoute component={EditorLoader} path={BUILDER_URL} />
                 <SentryRoute
                   component={AppViewerLoader}
diff --git a/app/client/src/actions/actionActions.ts b/app/client/src/actions/actionActions.ts
index 673f0b1282..eb84e9e5bd 100644
--- a/app/client/src/actions/actionActions.ts
+++ b/app/client/src/actions/actionActions.ts
@@ -61,6 +61,12 @@ export const fetchActionsForPageSuccess = (actions: Action[]) => {
   };
 };
 
+export const runActionViaShortcut = () => {
+  return {
+    type: ReduxActionTypes.RUN_ACTION_SHORTCUT_REQUEST,
+  };
+};
+
 export const runAction = (id: string, paginationField?: PaginationField) => {
   return {
     type: ReduxActionTypes.RUN_ACTION_REQUEST,
@@ -117,7 +123,11 @@ export const updateActionSuccess = (payload: { data: Action }) => {
   };
 };
 
-export const deleteAction = (payload: { id: string; name: string }) => {
+export const deleteAction = (payload: {
+  id: string;
+  name: string;
+  onSuccess?: () => void;
+}) => {
   return {
     type: ReduxActionTypes.DELETE_ACTION_INIT,
     payload,
@@ -233,6 +243,12 @@ export const updateActionProperty = (
   });
 };
 
+export const executePageLoadActionsComplete = () => {
+  return {
+    type: ReduxActionTypes.EXECUTE_PAGE_LOAD_ACTIONS_COMPLETE,
+  };
+};
+
 export const setActionsToExecuteOnPageLoad = (
   actions: Array<{
     executeOnLoad: boolean;
diff --git a/app/client/src/actions/apiPaneActions.ts b/app/client/src/actions/apiPaneActions.ts
index ccb0096922..e4bf0466f7 100644
--- a/app/client/src/actions/apiPaneActions.ts
+++ b/app/client/src/actions/apiPaneActions.ts
@@ -70,3 +70,11 @@ export const updateBodyContentType = (
   type: ReduxActionTypes.UPDATE_API_ACTION_BODY_CONTENT_TYPE,
   payload: { title, apiId },
 });
+
+export const redirectToNewIntegrations = (
+  applicationId: string,
+  pageId: string,
+): ReduxAction<{ applicationId: string; pageId: string }> => ({
+  type: ReduxActionTypes.REDIRECT_TO_NEW_INTEGRATIONS,
+  payload: { applicationId, pageId },
+});
diff --git a/app/client/src/actions/applicationActions.ts b/app/client/src/actions/applicationActions.ts
index 4578f5fc11..e4cf360f65 100644
--- a/app/client/src/actions/applicationActions.ts
+++ b/app/client/src/actions/applicationActions.ts
@@ -1,6 +1,9 @@
 import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
 import { APP_MODE } from "../reducers/entityReducers/appReducer";
-import { UpdateApplicationPayload } from "api/ApplicationApi";
+import {
+  UpdateApplicationPayload,
+  ImportApplicationRequest,
+} from "api/ApplicationApi";
 
 export const setDefaultApplicationPageSuccess = (
   pageId: string,
@@ -77,6 +80,13 @@ export const duplicateApplication = (applicationId: string) => {
   };
 };
 
+export const importApplication = (appDetails: ImportApplicationRequest) => {
+  return {
+    type: ReduxActionTypes.IMPORT_APPLICATION_INIT,
+    payload: appDetails,
+  };
+};
+
 export const getAllApplications = () => {
   return {
     type: ReduxActionTypes.GET_ALL_APPLICATION_INIT,
@@ -88,3 +98,8 @@ export const resetCurrentApplication = () => {
     type: ReduxActionTypes.RESET_CURRENT_APPLICATION,
   };
 };
+
+export const setShowAppInviteUsersDialog = (payload: boolean) => ({
+  type: ReduxActionTypes.SET_SHOW_APP_INVITE_USERS_MODAL,
+  payload,
+});
diff --git a/app/client/src/actions/canvasSelectionActions.ts b/app/client/src/actions/canvasSelectionActions.ts
new file mode 100644
index 0000000000..e9030b14e2
--- /dev/null
+++ b/app/client/src/actions/canvasSelectionActions.ts
@@ -0,0 +1,22 @@
+import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
+import { SelectedArenaDimensions } from "pages/common/CanvasSelectionArena";
+
+export const setCanvasSelectionStateAction = (start: boolean) => {
+  return {
+    type: start
+      ? ReduxActionTypes.START_CANVAS_SELECTION
+      : ReduxActionTypes.STOP_CANVAS_SELECTION,
+  };
+};
+
+export const selectAllWidgetsInAreaAction = (
+  selectionArena: SelectedArenaDimensions,
+  snapToNextColumn: boolean,
+  snapToNextRow: boolean,
+  isMultiSelect: boolean,
+): ReduxAction<any> => {
+  return {
+    type: ReduxActionTypes.SELECT_WIDGETS_IN_AREA,
+    payload: { selectionArena, snapToNextColumn, snapToNextRow, isMultiSelect },
+  };
+};
diff --git a/app/client/src/actions/commentActions.ts b/app/client/src/actions/commentActions.ts
index 4554af5f78..622582fcea 100644
--- a/app/client/src/actions/commentActions.ts
+++ b/app/client/src/actions/commentActions.ts
@@ -1,5 +1,7 @@
 import { ReduxActionTypes } from "constants/ReduxActionConstants";
 import { COMMENT_EVENTS_CHANNEL } from "constants/CommentConstants";
+import { options as filterOptions } from "comments/AppComments/AppCommentsFilterPopover";
+
 import {
   CommentThread,
   CommentEventPayload,
@@ -11,21 +13,12 @@ import {
   NewCommentThreadPayload,
 } from "entities/Comments/CommentsInterfaces";
 
+import { RawDraftContentState } from "draft-js";
+
 export const setCommentThreadsRequest = () => ({
   type: ReduxActionTypes.SET_COMMENT_THREADS_REQUEST,
 });
 
-// todo remove (for dev)
-export const setCommentThreadsSuccess = (payload: any) => ({
-  type: ReduxActionTypes.SET_COMMENT_THREADS_SUCCESS,
-  payload,
-});
-
-// todo remove (for dev)
-export const initCommentThreads = () => ({
-  type: ReduxActionTypes.INIT_COMMENT_THREADS,
-});
-
 export const commentEvent = (payload: CommentEventPayload) => ({
   type: COMMENT_EVENTS_CHANNEL,
   payload,
@@ -81,14 +74,6 @@ export const setCommentMode = (payload: boolean) => ({
   payload,
 });
 
-export const setIsCommentThreadVisible = (payload: {
-  commentThreadId: string;
-  isVisible: boolean;
-}) => ({
-  type: ReduxActionTypes.SET_IS_COMMENT_THREAD_VISIBLE,
-  payload,
-});
-
 export const fetchApplicationCommentsRequest = () => ({
   type: ReduxActionTypes.FETCH_APPLICATION_COMMENTS_REQUEST,
 });
@@ -130,7 +115,10 @@ export const updateCommentThreadEvent = (payload: Partial<CommentThread>) => ({
   payload,
 });
 
-export const pinCommentThreadRequest = (payload: { threadId: string }) => ({
+export const pinCommentThreadRequest = (payload: {
+  threadId: string;
+  pin: boolean;
+}) => ({
   type: ReduxActionTypes.PIN_COMMENT_THREAD_REQUEST,
   payload,
 });
@@ -158,3 +146,117 @@ export const deleteCommentSuccess = (payload: {
   type: ReduxActionTypes.DELETE_COMMENT_SUCCESS,
   payload,
 });
+
+export const setShouldShowResolvedComments = (payload: boolean) => ({
+  type: ReduxActionTypes.SET_SHOULD_SHOW_RESOLVED_COMMENTS,
+  payload,
+});
+
+export const setAppCommentsFilter = (
+  payload: typeof filterOptions[number]["value"],
+) => ({
+  type: ReduxActionTypes.SET_APP_COMMENTS_FILTER,
+  payload,
+});
+
+export const resetVisibleThread = (threadId?: string) => ({
+  type: ReduxActionTypes.RESET_VISIBLE_THREAD,
+  payload: threadId,
+});
+
+export const setVisibleThread = (threadId: string) => ({
+  type: ReduxActionTypes.SET_VISIBLE_THREAD,
+  payload: threadId,
+});
+
+export const markThreadAsReadRequest = (threadId: string) => ({
+  type: ReduxActionTypes.MARK_THREAD_AS_READ_REQUEST,
+  payload: { threadId },
+});
+
+export const editCommentRequest = ({
+  body,
+  commentId,
+  commentThreadId,
+}: {
+  commentThreadId: string;
+  commentId: string;
+  body: RawDraftContentState;
+}) => ({
+  type: ReduxActionTypes.EDIT_COMMENT_REQUEST,
+  payload: {
+    body,
+    commentId,
+    commentThreadId,
+  },
+});
+
+export const updateCommentSuccess = (payload: {
+  comment: Comment;
+  commentThreadId: string;
+}) => ({
+  type: ReduxActionTypes.EDIT_COMMENT_SUCCESS,
+  payload,
+});
+
+export const deleteCommentThreadRequest = (commentThreadId: string) => ({
+  type: ReduxActionTypes.DELETE_THREAD_REQUEST,
+  payload: commentThreadId,
+});
+
+export const deleteCommentThreadSuccess = (payload: {
+  commentThreadId: string;
+  appId: string;
+}) => ({
+  type: ReduxActionTypes.DELETE_THREAD_SUCCESS,
+  payload,
+});
+
+export const addCommentReaction = (payload: {
+  emoji: string;
+  commentId: string;
+}) => ({
+  type: ReduxActionTypes.ADD_COMMENT_REACTION,
+  payload,
+});
+
+export const removeCommentReaction = (payload: {
+  emoji: string;
+  commentId: string;
+}) => ({
+  type: ReduxActionTypes.REMOVE_COMMENT_REACTION,
+  payload,
+});
+
+export const updateCommentEvent = (payload: Comment) => ({
+  type: ReduxActionTypes.UPDATE_COMMENT_EVENT,
+  payload,
+});
+
+export const showCommentsIntroCarousel = () => ({
+  type: ReduxActionTypes.SHOW_COMMENTS_INTRO_CAROUSEL,
+  payload: undefined,
+});
+
+export const hideCommentsIntroCarousel = () => ({
+  type: ReduxActionTypes.HIDE_COMMENTS_INTRO_CAROUSEL,
+  payload: undefined,
+});
+
+export const setAreCommentsEnabled = (flag: boolean) => ({
+  type: ReduxActionTypes.SET_ARE_COMMENTS_ENABLED,
+  payload: flag,
+});
+
+export const fetchUnreadCommentThreadsCountSuccess = (count?: number) => ({
+  type: ReduxActionTypes.FETCH_UNREAD_COMMENT_THREADS_COUNT_SUCCESS,
+  payload: count,
+});
+
+export const incrementThreadUnreadCount = () => ({
+  type: ReduxActionTypes.INCREMENT_COMMENT_THREAD_UNREAD_COUNT,
+});
+
+export const decrementThreadUnreadCount = () => ({
+  type: ReduxActionTypes.DECREMENT_COMMENT_THREAD_UNREAD_COUNT,
+});
diff --git a/app/client/src/actions/datasourceActions.ts b/app/client/src/actions/datasourceActions.ts
index 6fa834fd62..65f08d4582 100644
--- a/app/client/src/actions/datasourceActions.ts
+++ b/app/client/src/actions/datasourceActions.ts
@@ -137,6 +137,29 @@ export const fetchDatasources = () => {
   };
 };
 
+export const fetchMockDatasources = () => {
+  return {
+    type: ReduxActionTypes.FETCH_MOCK_DATASOURCES_INIT,
+  };
+};
+
+export const addMockDatasourceToOrg = (
+  name: string,
+  organizationId: string,
+  pluginId: string,
+  packageName: string,
+): ReduxAction<{
+  name: string;
+  organizationId: string;
+  pluginId: string;
+  packageName: string;
+}> => {
+  return {
+    type: ReduxActionTypes.ADD_MOCK_DATASOURCES_INIT,
+    payload: { name, packageName, pluginId, organizationId },
+  };
+};
+
 export const initDatasourcePane = (
   pluginType: string,
   urlId?: string,
diff --git a/app/client/src/actions/debuggerActions.ts b/app/client/src/actions/debuggerActions.ts
index a0ca54e4a7..ce7beb04cd 100644
--- a/app/client/src/actions/debuggerActions.ts
+++ b/app/client/src/actions/debuggerActions.ts
@@ -1,5 +1,15 @@
 import { ReduxActionTypes } from "constants/ReduxActionConstants";
-import { Message } from "entities/AppsmithConsole";
+import { Message, ENTITY_TYPE } from "entities/AppsmithConsole";
+import { EventName } from "utils/AnalyticsUtil";
+
+export interface LogDebuggerErrorAnalyticsPayload {
+  entityName: string;
+  entityId: string;
+  entityType: ENTITY_TYPE;
+  eventName: EventName;
+  propertyPath: string;
+  errorMessages: { message: string }[];
+}
 
 export const debuggerLogInit = (payload: Message) => ({
   type: ReduxActionTypes.DEBUGGER_LOG_INIT,
@@ -29,3 +39,11 @@ export const updateErrorLog = (payload: Message) => ({
   type: ReduxActionTypes.DEBUGGER_UPDATE_ERROR_LOG,
   payload,
 });
+
+// Only used for analytics
+export const logDebuggerErrorAnalytics = (
+  payload: LogDebuggerErrorAnalyticsPayload,
+) => ({
+  type: ReduxActionTypes.DEBUGGER_ERROR_ANALYTICS,
+  payload,
+});
diff --git a/app/client/src/actions/notificationActions.ts b/app/client/src/actions/notificationActions.ts
new file mode 100644
index 0000000000..209c04504a
--- /dev/null
+++ b/app/client/src/actions/notificationActions.ts
@@ -0,0 +1,58 @@
+import { ReduxActionTypes } from "constants/ReduxActionConstants";
+import { AppsmithNotification } from "entities/Notification";
+
+export const fetchNotificationsRequest = (beforeTime?: string) => ({
+  type: ReduxActionTypes.FETCH_NOTIFICATIONS_REQUEST,
+  payload: beforeTime,
+});
+
+export const fetchNotificationsSuccess = (payload: {
+  notifications: Array<AppsmithNotification>;
+}) => ({
+  type: ReduxActionTypes.FETCH_NOTIFICATIONS_SUCCESS,
+  payload,
+});
+
+export const newNotificationEvent = (payload: Notification) => ({
+  type: ReduxActionTypes.NEW_NOTIFICATION_EVENT,
+  payload,
+});
+
+export const setIsNotificationsListVisible = (payload: boolean) => ({
+  type: ReduxActionTypes.SET_IS_NOTIFICATIONS_LIST_VISIBLE,
+  payload,
+});
+
+export const markAllNotificationsAsReadRequest = () => ({
+  type: ReduxActionTypes.MARK_ALL_NOTIFICATIONS_AS_READ_REQUEST,
+});
+
+export const markAllNotificationsAsReadSuccess = () => ({
+  type: ReduxActionTypes.MARK_ALL_NOTIFICATIONS_AS_READ_SUCCESS,
+});
+
+export const resetNotifications = (payload: {
+  notifications: Array<AppsmithNotification>;
+}) => ({
+  type: ReduxActionTypes.RESET_NOTIFICATIONS,
+  payload,
+});
+
+export const fetchUnreadNotificationsCountRequest = () => ({
+  type: ReduxActionTypes.FETCH_UNREAD_NOTIFICATIONS_COUNT_REQUEST,
+});
+
+export const fetchUnreadNotificationsCountSuccess = (payload: number) => ({
+  type: ReduxActionTypes.FETCH_UNREAD_NOTIFICATIONS_COUNT_SUCCESS,
+  payload,
+});
+
+export const markNotificationAsReadRequest = (payload: string) => ({
+  type: ReduxActionTypes.MARK_NOTIFICATION_AS_READ_REQUEST,
+  payload,
+});
+
+export const markNotificationAsReadSuccess = (payload: string) => ({
+  type: ReduxActionTypes.MARK_NOTIFICATION_AS_READ_SUCCESS,
+  payload,
+});
diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx
index f454c0349d..177661dd01 100644
--- a/app/client/src/actions/pageActions.tsx
+++ b/app/client/src/actions/pageActions.tsx
@@ -30,11 +30,15 @@ export const fetchPageList = (
   };
 };
 
-export const fetchPage = (pageId: string): ReduxAction<FetchPageRequest> => {
+export const fetchPage = (
+  pageId: string,
+  isFirstLoad = false,
+): ReduxAction<FetchPageRequest> => {
   return {
     type: ReduxActionTypes.FETCH_PAGE_INIT,
     payload: {
       id: pageId,
+      isFirstLoad,
     },
   };
 };
@@ -47,9 +51,13 @@ export const fetchPublishedPage = (pageId: string, bustCache = false) => ({
   },
 });
 
-export const fetchPageSuccess = (): ReduxActionWithoutPayload => {
+export const fetchPageSuccess = (
+  postEvalActions: Array<ReduxAction<unknown> | ReduxActionWithoutPayload>,
+): EvaluationReduxAction<undefined> => {
   return {
     type: ReduxActionTypes.FETCH_PAGE_SUCCESS,
+    postEvalActions,
+    payload: undefined,
   };
 };
 
@@ -75,6 +83,11 @@ export const initCanvasLayout = (
   };
 };
 
+export const setLastUpdatedTime = (payload: number): ReduxAction<number> => ({
+  type: ReduxActionTypes.SET_LAST_UPDATED_TIME,
+  payload,
+});
+
 export const savePageSuccess = (payload: SavePageResponse) => {
   return {
     type: ReduxActionTypes.SAVE_PAGE_SUCCESS,
@@ -104,9 +117,10 @@ export const updateAndSaveLayout = (
   };
 };
 
-export const saveLayout = () => {
+export const saveLayout = (isRetry?: boolean) => {
   return {
     type: ReduxActionTypes.SAVE_PAGE_INIT,
+    payload: { isRetry },
   };
 };
 
@@ -203,6 +217,12 @@ export type WidgetDelete = {
   isShortcut?: boolean;
 };
 
+export type MultipleWidgetDeletePayload = {
+  widgetIds: string[];
+  disallowUndo?: boolean;
+  isShortcut?: boolean;
+};
+
 export type WidgetResize = {
   widgetId: string;
   leftColumn: number;
diff --git a/app/client/src/actions/tourActions.ts b/app/client/src/actions/tourActions.ts
new file mode 100644
index 0000000000..b32c709a4a
--- /dev/null
+++ b/app/client/src/actions/tourActions.ts
@@ -0,0 +1,22 @@
+import { ReduxActionTypes } from "constants/ReduxActionConstants";
+import { TourType } from "entities/Tour";
+
+export const setActiveTour = (tourType: TourType) => ({
+  type: ReduxActionTypes.SET_ACTIVE_TOUR,
+  payload: tourType,
+});
+
+export const resetActiveTour = () => ({
+  type: ReduxActionTypes.RESET_ACTIVE_TOUR,
+  payload: undefined,
+});
+
+export const setActiveTourIndex = (index: number) => ({
+  type: ReduxActionTypes.SET_ACTIVE_TOUR_INDEX,
+  payload: index,
+});
+
+export const proceedToNextTourStep = () => ({
+  type: ReduxActionTypes.PROCEED_TO_NEXT_TOUR_STEP,
+  payload: undefined,
+});
diff --git a/app/client/src/actions/userActions.ts b/app/client/src/actions/userActions.ts
index 85f1fb7b97..d446a5755c 100644
--- a/app/client/src/actions/userActions.ts
+++ b/app/client/src/actions/userActions.ts
@@ -65,3 +65,25 @@ export const updateUserDetails = (payload: UpdateUserRequest) => ({
   type: ReduxActionTypes.UPDATE_USER_DETAILS_INIT,
   payload,
 });
+
+export const updatePhoto = (payload: {
+  file: File;
+  callback?: () => void;
+}) => ({
+  type: ReduxActionTypes.UPLOAD_PROFILE_PHOTO,
+  payload,
+});
+
+export const removePhoto = (callback: () => void) => ({
+  type: ReduxActionTypes.REMOVE_PROFILE_PHOTO,
+  payload: { callback },
+});
+
+export const leaveOrganization = (orgId: string) => {
+  return {
+    type: ReduxActionTypes.LEAVE_ORG_INIT,
+    payload: {
+      orgId,
+    },
+  };
+};
diff --git a/app/client/src/actions/widgetActions.tsx b/app/client/src/actions/widgetActions.tsx
index 03e1f59548..e45f15e366 100644
--- a/app/client/src/actions/widgetActions.tsx
+++ b/app/client/src/actions/widgetActions.tsx
@@ -63,13 +63,6 @@ export const focusWidget = (
   payload: { widgetId },
 });
 
-export const selectWidget = (
-  widgetId?: string,
-): ReduxAction<{ widgetId?: string }> => ({
-  type: ReduxActionTypes.SELECT_WIDGET,
-  payload: { widgetId },
-});
-
 export const showModal = (id: string) => {
   return {
     type: ReduxActionTypes.SHOW_MODAL,
diff --git a/app/client/src/actions/widgetSelectionActions.ts b/app/client/src/actions/widgetSelectionActions.ts
new file mode 100644
index 0000000000..c323a53128
--- /dev/null
+++ b/app/client/src/actions/widgetSelectionActions.ts
@@ -0,0 +1,71 @@
+import { ReduxActionTypes, ReduxAction } from "constants/ReduxActionConstants";
+import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
+
+export const selectWidgetAction = (
+  widgetId?: string,
+  isMultiSelect?: boolean,
+): ReduxAction<{ widgetId?: string; isMultiSelect?: boolean }> => ({
+  type: ReduxActionTypes.SELECT_WIDGET,
+  payload: { widgetId, isMultiSelect },
+});
+
+export const selectWidgetInitAction = (
+  widgetId?: string,
+  isMultiSelect?: boolean,
+): ReduxAction<{ widgetId?: string; isMultiSelect?: boolean }> => ({
+  type: ReduxActionTypes.SELECT_WIDGET_INIT,
+  payload: { widgetId, isMultiSelect },
+});
+
+export const selectMultipleWidgetsAction = (
+  widgetIds?: string[],
+): ReduxAction<{ widgetIds?: string[] }> => {
+  return {
+    type: ReduxActionTypes.SELECT_MULTIPLE_WIDGETS,
+    payload: { widgetIds },
+  };
+};
+
+export const silentAddSelectionsAction = (
+  widgetIds?: string[],
+): ReduxAction<{ widgetIds?: string[] }> => {
+  return {
+    type: ReduxActionTypes.SELECT_WIDGETS,
+    payload: { widgetIds },
+  };
+};
+
+export const deselectMultipleWidgetsAction = (
+  widgetIds?: string[],
+): ReduxAction<{ widgetIds?: string[] }> => {
+  return {
+    type: ReduxActionTypes.DESELECT_WIDGETS,
+    payload: { widgetIds },
+  };
+};
+
+export const selectAllWidgetsInCanvasInitAction = (
+  canvasId = MAIN_CONTAINER_WIDGET_ID,
+): ReduxAction<{ canvasId: string }> => {
+  return {
+    type: ReduxActionTypes.SELECT_ALL_WIDGETS_IN_CANVAS_INIT,
+    payload: {
+      canvasId,
+    },
+  };
+};
+
+export const selectMultipleWidgetsInitAction = (widgetIds: string[]) => {
+  return {
+    type: ReduxActionTypes.SELECT_MULTIPLE_WIDGETS_INIT,
+    payload: { widgetIds },
+  };
+};
+
+export const shiftSelectWidgetsEntityExplorerInitAction = (
+  widgetId: string,
+  siblingWidgets: string[],
+): ReduxAction<{ widgetId: string; siblingWidgets: string[] }> => ({
+  type: ReduxActionTypes.SHIFT_SELECT_WIDGET_INIT,
+  payload: { widgetId, siblingWidgets },
+});
diff --git a/app/client/src/api/Api.ts b/app/client/src/api/Api.ts
index bc1cdfbd2a..32dfc0f65c 100644
--- a/app/client/src/api/Api.ts
+++ b/app/client/src/api/Api.ts
@@ -68,6 +68,22 @@ class Api {
     );
   }
 
+  static patch(
+    url: string,
+    body?: any,
+    queryParams?: any,
+    config: Partial<AxiosRequestConfig> = {},
+  ) {
+    return axiosInstance.patch(
+      url + convertObjectToQueryParams(queryParams),
+      body,
+      {
+        ...apiRequestConfig,
+        ...config,
+      },
+    );
+  }
+
   static delete(
     url: string,
     queryParams?: any,
@@ -80,6 +96,6 @@ class Api {
   }
 }
 
-export type HttpMethod = "GET" | "POST" | "PUT" | "DELETE";
+export type HttpMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
 
 export default Api;
diff --git a/app/client/src/api/ApiUtils.ts b/app/client/src/api/ApiUtils.ts
index 2da9b22cf9..81f94cca20 100644
--- a/app/client/src/api/ApiUtils.ts
+++ b/app/client/src/api/ApiUtils.ts
@@ -10,10 +10,11 @@ import {
   ERROR_CODES,
   SERVER_ERROR_CODES,
 } from "constants/ApiConstants";
-import history from "utils/history";
-import { AUTH_LOGIN_URL } from "constants/routes";
 import log from "loglevel";
 import { ActionExecutionResponse } from "api/ActionAPI";
+import store from "store";
+import { logoutUser } from "actions/userActions";
+import { AUTH_LOGIN_URL } from "constants/routes";
 
 const executeActionRegex = /actions\/execute/;
 const timeoutErrorRegex = /timeout of (\d+)ms exceeded/;
@@ -100,10 +101,13 @@ export const apiFailureResponseInterceptor = (error: any) => {
       const currentUrl = `${window.location.href}`;
       if (error.response.status === API_STATUS_CODES.REQUEST_NOT_AUTHORISED) {
         // Redirect to login and set a redirect url.
-        history.replace({
-          pathname: AUTH_LOGIN_URL,
-          search: `redirectUrl=${currentUrl}`,
-        });
+        store.dispatch(
+          logoutUser({
+            redirectURL: `${AUTH_LOGIN_URL}?redirectUrl=${encodeURIComponent(
+              currentUrl,
+            )}`,
+          }),
+        );
         return Promise.reject({
           code: ERROR_CODES.REQUEST_NOT_AUTHORISED,
           message: "Unauthorized. Redirecting to login page...",
diff --git a/app/client/src/api/ApplicationApi.tsx b/app/client/src/api/ApplicationApi.tsx
index 0347802ff0..21349820f9 100644
--- a/app/client/src/api/ApplicationApi.tsx
+++ b/app/client/src/api/ApplicationApi.tsx
@@ -31,11 +31,12 @@ export interface ApplicationResponsePayload {
   pages?: ApplicationPagePayload[];
   appIsExample: boolean;
   appLayout?: AppLayoutConfig;
+  unreadCommentThreads?: number;
 }
 
-// export interface FetchApplicationResponse extends ApiResponse {
-//   data: ApplicationResponsePayload & { pages: ApplicationPagePayload[] };
-// }
+export interface FetchApplicationResponse extends ApiResponse {
+  data: ApplicationResponsePayload & { pages: ApplicationPagePayload[] };
+}
 
 export interface FetchApplicationsResponse extends ApiResponse {
   data: Array<ApplicationResponsePayload & { pages: ApplicationPagePayload[] }>;
@@ -119,6 +120,13 @@ export interface FetchUsersApplicationsOrgsResponse extends ApiResponse {
   };
 }
 
+export interface ImportApplicationRequest {
+  orgId: string;
+  applicationFile?: File;
+  progress?: (progressEvent: ProgressEvent) => void;
+  onSuccessCallback?: () => void;
+}
+
 class ApplicationApi extends Api {
   static baseURL = "v1/applications/";
   static publishURLPath = (applicationId: string) => `publish/${applicationId}`;
@@ -147,13 +155,13 @@ class ApplicationApi extends Api {
 
   static fetchApplication(
     applicationId: string,
-  ): AxiosPromise<FetchApplicationsResponse> {
+  ): AxiosPromise<FetchApplicationResponse> {
     return Api.get(ApplicationApi.baseURL + applicationId);
   }
 
   static fetchApplicationForViewMode(
     applicationId: string,
-  ): AxiosPromise<FetchApplicationsResponse> {
+  ): AxiosPromise<FetchApplicationResponse> {
     return Api.get(ApplicationApi.baseURL + `view/${applicationId}`);
   }
 
@@ -212,6 +220,21 @@ class ApplicationApi extends Api {
         request.organizationId,
     );
   }
+
+  static importApplicationToOrg(
+    request: ImportApplicationRequest,
+  ): AxiosPromise<ApiResponse> {
+    const formData = new FormData();
+    if (request.applicationFile) {
+      formData.append("file", request.applicationFile);
+    }
+    return Api.post("v1/applications/import/" + request.orgId, formData, null, {
+      headers: {
+        "Content-Type": "multipart/form-data",
+      },
+      onUploadProgress: request.progress,
+    });
+  }
 }
 
 export default ApplicationApi;
diff --git a/app/client/src/api/CommentsAPI.tsx b/app/client/src/api/CommentsAPI.tsx
index ce9fdf00d3..f4efd9307a 100644
--- a/app/client/src/api/CommentsAPI.tsx
+++ b/app/client/src/api/CommentsAPI.tsx
@@ -10,6 +10,8 @@ class CommentsApi extends Api {
   static baseURL = "v1/comments";
   static getThreadsAPI = `${CommentsApi.baseURL}/threads`;
   static getCommentsAPI = CommentsApi.baseURL;
+  static getReactionsAPI = (commentId: string) =>
+    `${CommentsApi.getCommentsAPI}/${commentId}/reactions`;
 
   static createNewThread(
     request: CreateCommentThreadRequest,
@@ -33,23 +35,48 @@ class CommentsApi extends Api {
   }
 
   static updateCommentThread(
-    updateCommentRequest: Partial<CreateCommentThreadRequest>,
+    updateCommentThreadRequest: Partial<CreateCommentThreadRequest>,
     threadId: string,
   ): AxiosPromise<ApiResponse> {
     return Api.put(
       `${CommentsApi.getThreadsAPI}/${threadId}`,
-      updateCommentRequest,
+      updateCommentThreadRequest,
     );
   }
 
-  static pinCommentThread(threadId: string) {
-    console.log(threadId);
-    return Promise.resolve();
+  static updateComment(
+    updateCommentRequest: Partial<CreateCommentRequest>,
+    commentId: string,
+  ): AxiosPromise<ApiResponse> {
+    return Api.put(
+      `${CommentsApi.getCommentsAPI}/${commentId}`,
+      updateCommentRequest,
+    );
   }
 
   static deleteComment(commentId: string): AxiosPromise<ApiResponse> {
     return Api.delete(`${CommentsApi.getCommentsAPI}/${commentId}`);
   }
+
+  static deleteCommentThread(threadId: string): AxiosPromise<ApiResponse> {
+    return Api.delete(`${CommentsApi.getThreadsAPI}/${threadId}`);
+  }
+
+  static addCommentReaction(
+    commentId: string,
+    request: { emoji: string },
+  ): AxiosPromise<ApiResponse> {
+    return Api.post(CommentsApi.getReactionsAPI(commentId), request);
+  }
+
+  static removeCommentReaction(
+    commentId: string,
+    request: { emoji: string },
+  ): AxiosPromise<ApiResponse> {
+    return Api.delete(CommentsApi.getReactionsAPI(commentId), null, {
+      data: request,
+    });
+  }
 }
 
 export default CommentsApi;
diff --git a/app/client/src/api/DatasourcesApi.ts b/app/client/src/api/DatasourcesApi.ts
index f879711775..8b15c02be8 100644
--- a/app/client/src/api/DatasourcesApi.ts
+++ b/app/client/src/api/DatasourcesApi.ts
@@ -63,6 +63,26 @@ class DatasourcesApi extends API {
       DatasourcesApi.url + `/${id}/structure?ignoreCache=${ignoreCache}`,
     );
   }
+
+  static fetchMockDatasources(): AxiosPromise<
+    GenericApiResponse<Datasource[]>
+  > {
+    return API.get(DatasourcesApi.url + "/mocks");
+  }
+
+  static addMockDbToDatasources(
+    name: string,
+    organizationId: string,
+    pluginId: string,
+    packageName: string,
+  ): Promise<any> {
+    return API.post(DatasourcesApi.url + `/mocks`, {
+      name,
+      organizationId,
+      pluginId,
+      packageName,
+    });
+  }
 }
 
 export default DatasourcesApi;
diff --git a/app/client/src/api/ImportApi.ts b/app/client/src/api/ImportApi.ts
index 310d4c5515..eac6e0ad76 100644
--- a/app/client/src/api/ImportApi.ts
+++ b/app/client/src/api/ImportApi.ts
@@ -14,7 +14,7 @@ class CurlImportApi extends Api {
   static curlImportURL = `v1/import`;
 
   static curlImport(request: CurlImportRequest): AxiosPromise<ApiResponse> {
-    const { pageId, name, curl, organizationId } = request;
+    const { curl, name, organizationId, pageId } = request;
     return Api.post(CurlImportApi.curlImportURL, curl, {
       type: "CURL",
       pageId,
diff --git a/app/client/src/api/NotificationsAPI.tsx b/app/client/src/api/NotificationsAPI.tsx
new file mode 100644
index 0000000000..51abaacab7
--- /dev/null
+++ b/app/client/src/api/NotificationsAPI.tsx
@@ -0,0 +1,33 @@
+import { AxiosPromise } from "axios";
+import Api from "./Api";
+import { ApiResponse } from "./ApiResponses";
+
+class NotificationsApi extends Api {
+  static baseURL = "v1/notifications";
+  static markAsReadURL = `${NotificationsApi.baseURL}/isRead`;
+  static markAllAsReadURL = `${NotificationsApi.markAsReadURL}/all`;
+  static fetchUnreadNotificationsCountURL = `${NotificationsApi.baseURL}/count/unread`;
+
+  static fetchNotifications(beforeDate?: string): AxiosPromise<ApiResponse> {
+    return Api.get(NotificationsApi.baseURL, beforeDate ? { beforeDate } : {});
+  }
+
+  static markAllNotificationsAsRead(): AxiosPromise<ApiResponse> {
+    return Api.patch(NotificationsApi.markAllAsReadURL, { isRead: true });
+  }
+
+  static fetchUnreadNotificationsCount(): AxiosPromise<ApiResponse> {
+    return Api.get(NotificationsApi.fetchUnreadNotificationsCountURL);
+  }
+
+  static markNotificationsAsRead(
+    ids: Array<string>,
+  ): AxiosPromise<ApiResponse> {
+    return Api.patch(NotificationsApi.markAsReadURL, {
+      isRead: true,
+      idList: ids,
+    });
+  }
+}
+
+export default NotificationsApi;
diff --git a/app/client/src/api/PageApi.tsx b/app/client/src/api/PageApi.tsx
index fa229d750c..fdc931d00a 100644
--- a/app/client/src/api/PageApi.tsx
+++ b/app/client/src/api/PageApi.tsx
@@ -7,6 +7,7 @@ import { PageAction } from "constants/AppsmithActionConstants/ActionConstants";
 
 export interface FetchPageRequest {
   id: string;
+  isFirstLoad?: boolean;
 }
 
 export interface FetchPublishedPageRequest {
diff --git a/app/client/src/api/UserApi.tsx b/app/client/src/api/UserApi.tsx
index 72bdb2b5a8..827dc2f977 100644
--- a/app/client/src/api/UserApi.tsx
+++ b/app/client/src/api/UserApi.tsx
@@ -40,6 +40,10 @@ export interface FetchUserRequest {
   id: string;
 }
 
+export interface LeaveOrgRequest {
+  orgId: string;
+}
+
 export interface InviteUserRequest {
   email: string;
   groupIds: string[];
@@ -47,7 +51,8 @@ export interface InviteUserRequest {
 }
 
 export interface UpdateUserRequest {
-  name: string;
+  name?: string;
+  email?: string;
 }
 
 class UserApi extends Api {
@@ -59,8 +64,10 @@ class UserApi extends Api {
   static verifyInviteTokenURL = `${UserApi.inviteUserURL}/verify`;
   static confirmUserInviteURL = `${UserApi.inviteUserURL}/confirm`;
   static addOrgURL = `${UserApi.usersURL}/addOrganization`;
+  static leaveOrgURL = `${UserApi.usersURL}/leaveOrganization`;
   static logoutURL = "v1/logout";
   static currentUserURL = "v1/users/me";
+  static photoURL = "v1/users/photo";
 
   static createUser(
     request: CreateUserRequest,
@@ -117,6 +124,27 @@ class UserApi extends Api {
   static logoutUser(): AxiosPromise<ApiResponse> {
     return Api.post(UserApi.logoutURL);
   }
+
+  static uploadPhoto(request: { file: File }): AxiosPromise<ApiResponse> {
+    const formData = new FormData();
+    if (request.file) {
+      formData.append("file", request.file);
+    }
+
+    return Api.post(UserApi.photoURL, formData, null, {
+      headers: {
+        "Content-Type": "multipart/form-data",
+      },
+    });
+  }
+
+  static deletePhoto(): AxiosPromise<ApiResponse> {
+    return Api.delete(UserApi.photoURL);
+  }
+
+  static leaveOrg(request: LeaveOrgRequest): AxiosPromise<LeaveOrgRequest> {
+    return Api.put(UserApi.leaveOrgURL + "/" + request.orgId);
+  }
 }
 
 export default UserApi;
diff --git a/app/client/src/assets/icons/ads/app-icons/draghandler.svg b/app/client/src/assets/icons/ads/app-icons/draghandler.svg
index 133b2b6bdb..2b3f4cc694 100644
--- a/app/client/src/assets/icons/ads/app-icons/draghandler.svg
+++ b/app/client/src/assets/icons/ads/app-icons/draghandler.svg
@@ -1,8 +1 @@
-<svg width="10" height="16" viewBox="0 0 10 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="2" r="2" transform="rotate(90 8 2)" fill="#A9A7A7"/>
-<circle cx="2" cy="2" r="2" transform="rotate(90 2 2)" fill="#A9A7A7"/>
-<circle cx="8" cy="8" r="2" transform="rotate(90 8 8)" fill="#A9A7A7"/>
-<circle cx="2" cy="8" r="2" transform="rotate(90 2 8)" fill="#A9A7A7"/>
-<circle cx="8" cy="14" r="2" transform="rotate(90 8 14)" fill="#A9A7A7"/>
-<circle cx="2" cy="14" r="2" transform="rotate(90 2 14)" fill="#A9A7A7"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" fill="none" viewBox="0 0 10 16"><circle cx="8" cy="2" r="2" fill="#A9A7A7" transform="rotate(90 8 2)"/><circle cx="2" cy="2" r="2" fill="#A9A7A7" transform="rotate(90 2 2)"/><circle cx="8" cy="8" r="2" fill="#A9A7A7" transform="rotate(90 8 8)"/><circle cx="2" cy="8" r="2" fill="#A9A7A7" transform="rotate(90 2 8)"/><circle cx="8" cy="14" r="2" fill="#A9A7A7" transform="rotate(90 8 14)"/><circle cx="2" cy="14" r="2" fill="#A9A7A7" transform="rotate(90 2 14)"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/bell.svg b/app/client/src/assets/icons/ads/bell.svg
new file mode 100644
index 0000000000..e4a36d411c
--- /dev/null
+++ b/app/client/src/assets/icons/ads/bell.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="18" fill="none" viewBox="0 0 16 18"><path fill="#939090" fill-rule="evenodd" d="M1.64706 6.35294C1.64706 2.84431 4.49137 0 8 0C11.5086 0 14.3529 2.84431 14.3529 6.35294V12.25H16V14.5H0V12.25H1.64706V6.35294ZM8 18C9.36447 18 10.4706 16.8807 10.4706 15.5H5.52941C5.52941 16.8807 6.63553 18 8 18Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/bug.svg b/app/client/src/assets/icons/ads/bug.svg
index 28f60f75af..43864e8a92 100644
--- a/app/client/src/assets/icons/ads/bug.svg
+++ b/app/client/src/assets/icons/ads/bug.svg
@@ -1,3 +1 @@
-<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M10.1935 0C8.53666 0 7.19351 1.34315 7.19351 3H13.3474C13.3474 1.34315 12.0042 0 10.3474 0H10.1935ZM15.0329 4.2H4.96715L1.67954 2.06384L0.399787 3.93616L4.11659 6.3512V8.625H0V10.875H4.11659V11.8462C4.11659 12.2648 4.15839 12.6736 4.23804 13.0688L0.399787 15.5627L1.67954 17.4351L5.11276 15.2043C6.21093 16.8875 8.11076 18 10.2704 18C12.3244 18 14.1434 16.9937 15.2612 15.4473L18.3205 17.4351L19.6002 15.5627L16.2329 13.3748C16.3579 12.886 16.4243 12.3738 16.4243 11.8462V10.875H20V8.625H16.4243V5.99976L19.6002 3.93616L18.3205 2.06384L15.0329 4.2Z" fill="#716E6E"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="18" fill="none" viewBox="0 0 20 18"><path fill="#716E6E" fill-rule="evenodd" d="M10.1935 0C8.53666 0 7.19351 1.34315 7.19351 3H13.3474C13.3474 1.34315 12.0042 0 10.3474 0H10.1935ZM15.0329 4.2H4.96715L1.67954 2.06384L0.399787 3.93616L4.11659 6.3512V8.625H0V10.875H4.11659V11.8462C4.11659 12.2648 4.15839 12.6736 4.23804 13.0688L0.399787 15.5627L1.67954 17.4351L5.11276 15.2043C6.21093 16.8875 8.11076 18 10.2704 18C12.3244 18 14.1434 16.9937 15.2612 15.4473L18.3205 17.4351L19.6002 15.5627L16.2329 13.3748C16.3579 12.886 16.4243 12.3738 16.4243 11.8462V10.875H20V8.625H16.4243V5.99976L19.6002 3.93616L18.3205 2.06384L15.0329 4.2Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/cancel.svg b/app/client/src/assets/icons/ads/cancel.svg
index 254210469e..d397aa2f65 100644
--- a/app/client/src/assets/icons/ads/cancel.svg
+++ b/app/client/src/assets/icons/ads/cancel.svg
@@ -1,3 +1 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 0C3.14027 0 0 3.14027 0 7C0 10.8597 3.14027 14 7 14C10.8597 14 14 10.8597 14 7C14 3.14027 10.8597 0 7 0ZM7 12.25C4.10525 12.25 1.75 9.89475 1.75 7C1.75 5.89515 2.08496 4.85067 2.72185 3.95943L10.0406 11.2781C9.14933 11.915 8.10485 12.25 7 12.25ZM11.2781 10.0406L3.95943 2.72185C4.85067 2.08496 5.89515 1.75 7 1.75C9.89475 1.75 12.25 4.10525 12.25 7C12.25 8.10485 11.915 9.14933 11.2781 10.0406Z" fill="#858282"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 14 14"><path fill="#858282" d="M7 0C3.14027 0 0 3.14027 0 7C0 10.8597 3.14027 14 7 14C10.8597 14 14 10.8597 14 7C14 3.14027 10.8597 0 7 0ZM7 12.25C4.10525 12.25 1.75 9.89475 1.75 7C1.75 5.89515 2.08496 4.85067 2.72185 3.95943L10.0406 11.2781C9.14933 11.915 8.10485 12.25 7 12.25ZM11.2781 10.0406L3.95943 2.72185C4.85067 2.08496 5.89515 1.75 7 1.75C9.89475 1.75 12.25 4.10525 12.25 7C12.25 8.10485 11.915 9.14933 11.2781 10.0406Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/card-context-menu.svg b/app/client/src/assets/icons/ads/card-context-menu.svg
index eadc7a9738..e3fe0a28e8 100644
--- a/app/client/src/assets/icons/ads/card-context-menu.svg
+++ b/app/client/src/assets/icons/ads/card-context-menu.svg
@@ -1,3 +1 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.19629 14.0371C11.0107 14.0371 14.1689 10.8721 14.1689 7.06445C14.1689 3.25 11.0039 0.0917969 7.18945 0.0917969C3.38184 0.0917969 0.223633 3.25 0.223633 7.06445C0.223633 10.8721 3.38867 14.0371 7.19629 14.0371ZM7.19629 12.875C3.96973 12.875 1.39258 10.291 1.39258 7.06445C1.39258 3.83789 3.96289 1.25391 7.18945 1.25391C10.416 1.25391 13 3.83789 13.0068 7.06445C13.0137 10.291 10.4229 12.875 7.19629 12.875ZM4.00391 8.0625C4.55078 8.0625 4.99512 7.61133 4.99512 7.06445C4.99512 6.51758 4.54395 6.06641 4.00391 6.06641C3.4502 6.06641 3.00586 6.51758 3.00586 7.06445C3.00586 7.61133 3.4502 8.0625 4.00391 8.0625ZM7.18945 8.0625C7.73633 8.0625 8.1875 7.61133 8.1875 7.06445C8.1875 6.51758 7.73633 6.06641 7.18945 6.06641C6.64258 6.06641 6.19141 6.51758 6.19141 7.06445C6.19141 7.61133 6.64258 8.0625 7.18945 8.0625ZM10.3818 8.0625C10.9287 8.0625 11.373 7.61133 11.373 7.06445C11.373 6.51758 10.9287 6.06641 10.3818 6.06641C9.82812 6.06641 9.38379 6.51758 9.38379 7.06445C9.38379 7.61133 9.82812 8.0625 10.3818 8.0625Z" fill="#80888D"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="none" viewBox="0 0 15 15"><path fill="#80888D" d="M7.19629 14.0371C11.0107 14.0371 14.1689 10.8721 14.1689 7.06445C14.1689 3.25 11.0039 0.0917969 7.18945 0.0917969C3.38184 0.0917969 0.223633 3.25 0.223633 7.06445C0.223633 10.8721 3.38867 14.0371 7.19629 14.0371ZM7.19629 12.875C3.96973 12.875 1.39258 10.291 1.39258 7.06445C1.39258 3.83789 3.96289 1.25391 7.18945 1.25391C10.416 1.25391 13 3.83789 13.0068 7.06445C13.0137 10.291 10.4229 12.875 7.19629 12.875ZM4.00391 8.0625C4.55078 8.0625 4.99512 7.61133 4.99512 7.06445C4.99512 6.51758 4.54395 6.06641 4.00391 6.06641C3.4502 6.06641 3.00586 6.51758 3.00586 7.06445C3.00586 7.61133 3.4502 8.0625 4.00391 8.0625ZM7.18945 8.0625C7.73633 8.0625 8.1875 7.61133 8.1875 7.06445C8.1875 6.51758 7.73633 6.06641 7.18945 6.06641C6.64258 6.06641 6.19141 6.51758 6.19141 7.06445C6.19141 7.61133 6.64258 8.0625 7.18945 8.0625ZM10.3818 8.0625C10.9287 8.0625 11.373 7.61133 11.373 7.06445C11.373 6.51758 10.9287 6.06641 10.3818 6.06641C9.82812 6.06641 9.38379 6.51758 9.38379 7.06445C9.38379 7.61133 9.82812 8.0625 10.3818 8.0625Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/commentIcon.png b/app/client/src/assets/icons/ads/commentIcon.png
index 2775b7b58d..e6d22c7d5e 100644
Binary files a/app/client/src/assets/icons/ads/commentIcon.png and b/app/client/src/assets/icons/ads/commentIcon.png differ
diff --git a/app/client/src/assets/icons/ads/cross.svg b/app/client/src/assets/icons/ads/cross.svg
index 9589ed4d54..ac7eaaca70 100644
--- a/app/client/src/assets/icons/ads/cross.svg
+++ b/app/client/src/assets/icons/ads/cross.svg
@@ -1,4 +1 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 1L1 13" stroke="#716E6E" stroke-width="1.5"/>
-<path d="M13 13L1 1" stroke="#716E6E" stroke-width="1.5"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 14 14"><path stroke="#716E6E" stroke-width="1.5" d="M13 1L1 13"/><path stroke="#716E6E" stroke-width="1.5" d="M13 13L1 1"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/download.svg b/app/client/src/assets/icons/ads/download.svg
new file mode 100644
index 0000000000..230d2ec50d
--- /dev/null
+++ b/app/client/src/assets/icons/ads/download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path fill="#939090" fill-rule="evenodd" d="M15.4547 16.4284H13.117H6.88326H4.54559C2.8243 16.4284 1.42871 14.8933 1.42871 12.9999C1.42871 11.3987 2.43157 10.0641 3.7804 9.68786C3.93001 6.28329 6.47884 3.57129 9.61053 3.57129C12.7072 3.57129 15.2349 6.22243 15.4352 9.57386C17.183 9.56015 18.5716 11.1167 18.5716 12.9999C18.5716 14.8933 17.176 16.4284 15.4547 16.4284ZM12.7266 11.4286L9.99929 14.8572L7.27202 11.4286L8.83045 11.4286L8.83045 8.00004L11.1681 8.00003V11.4286L12.7266 11.4286Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/expand-more.svg b/app/client/src/assets/icons/ads/expand-more.svg
new file mode 100644
index 0000000000..41a5c0133c
--- /dev/null
+++ b/app/client/src/assets/icons/ads/expand-more.svg
@@ -0,0 +1,3 @@
+<svg width="8" height="6" viewBox="0 0 8 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.92006 1.18808L7.51929 0.805547C7.46589 0.754465 7.40437 0.729004 7.33482 0.729004C7.26545 0.729004 7.20396 0.754465 7.15055 0.805547L4.00004 3.81269L0.849671 0.805628C0.796241 0.754545 0.734752 0.729084 0.665289 0.729084C0.595798 0.729084 0.534309 0.754545 0.480906 0.805628L0.0801884 1.18818C0.0266733 1.23916 1.18406e-09 1.29785 1.32213e-09 1.36419C1.46009e-09 1.43046 0.0267575 1.48916 0.0801884 1.54013L3.81566 5.10589C3.86906 5.15689 3.93058 5.18238 4.00004 5.18238C4.06951 5.18238 4.13091 5.15689 4.18428 5.10589L7.92006 1.54013C7.97347 1.48913 8 1.43044 8 1.36419C8 1.29785 7.97347 1.23916 7.92006 1.18808Z" fill="#090707"/>
+</svg>
diff --git a/app/client/src/assets/icons/ads/open.svg b/app/client/src/assets/icons/ads/open.svg
index 2b43521e49..1ca1dd170b 100644
--- a/app/client/src/assets/icons/ads/open.svg
+++ b/app/client/src/assets/icons/ads/open.svg
@@ -1,4 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="2.5" y="2.5" width="11" height="11" rx="1.5" stroke="#858282" stroke-opacity="0.6"/>
-<path d="M6 10L10 6M10 6H6.92308M10 6V9.07692" stroke="#858282" stroke-opacity="0.6" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><rect width="11" height="11" x="2.5" y="2.5" stroke="#858282" stroke-opacity=".6" rx="1.5"/><path stroke="#858282" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".6" d="M6 10L10 6M10 6H6.92308M10 6V9.07692"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/trending-flat.svg b/app/client/src/assets/icons/ads/trending-flat.svg
new file mode 100644
index 0000000000..01b641efcd
--- /dev/null
+++ b/app/client/src/assets/icons/ads/trending-flat.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.1603 0.969728L9.53673 1.56501L12.3118 4.21393L-5.87492e-07 4.21393L-7.39946e-07 5.05579L12.3118 5.0558L9.53673 7.70468L10.1603 8.29997L14 4.63483L10.1603 0.969728Z" fill="#090707"/>
+</svg>
diff --git a/app/client/src/assets/icons/ads/upload_success.svg b/app/client/src/assets/icons/ads/upload_success.svg
new file mode 100644
index 0000000000..20a260c740
--- /dev/null
+++ b/app/client/src/assets/icons/ads/upload_success.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="16" fill="none" viewBox="0 0 24 16"><path fill="#03B365" fill-rule="evenodd" d="M19.6364 16H16.3636L13.6364 16V11.7333H15.8182L12.0001 7.46667L8.18188 11.7333H10.3636V16L7.63636 16H4.36364C1.95382 16 0 14.0896 0 11.7333C0 9.7408 1.404 8.08 3.29236 7.61173C3.50182 3.37493 7.07018 0 11.4545 0C15.7898 0 19.3287 3.2992 19.6091 7.46987C22.056 7.4528 24 9.38987 24 11.7333C24 14.0896 22.0462 16 19.6364 16Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/wand.svg b/app/client/src/assets/icons/ads/wand.svg
index 5a51055344..824e0a3545 100644
--- a/app/client/src/assets/icons/ads/wand.svg
+++ b/app/client/src/assets/icons/ads/wand.svg
@@ -1,10 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M10.879 0.418515C10.879 0.649535 11.067 0.83703 11.2976 0.83703C11.5286 0.83703 11.7161 1.02411 11.7161 1.25554C11.7161 1.48698 11.5286 1.67406 11.2976 1.67406C11.067 1.67406 10.879 1.86155 10.879 2.09257C10.879 2.32401 10.6915 2.51109 10.4605 2.51109C10.2295 2.51109 10.042 2.32401 10.042 2.09257C10.042 1.86155 9.8541 1.67406 9.6235 1.67406C9.39248 1.67406 9.20498 1.48698 9.20498 1.25554C9.20498 1.02411 9.39248 0.83703 9.6235 0.83703C9.8541 0.83703 10.042 0.649535 10.042 0.418515C10.042 0.187076 10.2295 0 10.4605 0C10.6915 0 10.879 0.187076 10.879 0.418515ZM11.0968 2.91647L13.8833 5.70297L3.58631 16L0.799805 13.2135L11.0968 2.91647ZM11.1158 6.71379L10.1201 5.71815L11.1158 4.7225L12.1114 5.71815L11.1158 6.71379ZM2.58583 13.2519L3.58147 14.2475L10.2271 7.60191L9.23142 6.60627L2.58583 13.2519ZM4.21032 5.71869C4.55622 5.71869 4.83809 5.99993 4.83809 6.34646C4.83809 6.69362 5.11933 6.97423 5.46586 6.97423C5.8124 6.97423 6.09364 6.69362 6.09364 6.34646C6.09364 5.99993 6.37551 5.71869 6.72141 5.71869C7.06794 5.71869 7.34918 5.43807 7.34918 5.09092C7.34918 4.74376 7.06794 4.46314 6.72141 4.46314C6.37551 4.46314 6.09364 4.1819 6.09364 3.83537C6.09364 3.48821 5.8124 3.2076 5.46586 3.2076C5.11933 3.2076 4.83809 3.48821 4.83809 3.83537C4.83809 4.1819 4.55622 4.46314 4.21032 4.46314C3.86379 4.46314 3.58255 4.74376 3.58255 5.09092C3.58255 5.43807 3.86379 5.71869 4.21032 5.71869ZM13.2079 9.38031C13.2079 9.66909 13.4428 9.90345 13.731 9.90345C14.0198 9.90345 14.2542 10.1373 14.2542 10.4266C14.2542 10.7159 14.0198 10.9497 13.731 10.9497C13.4428 10.9497 13.2079 11.1841 13.2079 11.4729C13.2079 11.7622 12.9735 11.996 12.6847 11.996C12.396 11.996 12.1616 11.7622 12.1616 11.4729C12.1616 11.1841 11.9267 10.9497 11.6384 10.9497C11.3497 10.9497 11.1153 10.7159 11.1153 10.4266C11.1153 10.1373 11.3497 9.90345 11.6384 9.90345C11.9267 9.90345 12.1616 9.66909 12.1616 9.38031C12.1616 9.09101 12.396 8.85717 12.6847 8.85717C12.9735 8.85717 13.2079 9.09101 13.2079 9.38031ZM15.3003 7.39249C15.185 7.39249 15.091 7.29874 15.091 7.18323C15.091 7.06751 14.9973 6.97398 14.8818 6.97398C14.7663 6.97398 14.6725 7.06751 14.6725 7.18323C14.6725 7.29874 14.5786 7.39249 14.4633 7.39249C14.3478 7.39249 14.254 7.48603 14.254 7.60175C14.254 7.71747 14.3478 7.81101 14.4633 7.81101C14.5786 7.81101 14.6725 7.90475 14.6725 8.02026C14.6725 8.13598 14.7663 8.22952 14.8818 8.22952C14.9973 8.22952 15.091 8.13598 15.091 8.02026C15.091 7.90475 15.185 7.81101 15.3003 7.81101C15.4158 7.81101 15.5096 7.71747 15.5096 7.60175C15.5096 7.48603 15.4158 7.39249 15.3003 7.39249Z" fill="#E22C2C"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><g clip-path="url(#clip0)"><path fill="#E22C2C" fill-rule="evenodd" d="M10.879 0.418515C10.879 0.649535 11.067 0.83703 11.2976 0.83703C11.5286 0.83703 11.7161 1.02411 11.7161 1.25554C11.7161 1.48698 11.5286 1.67406 11.2976 1.67406C11.067 1.67406 10.879 1.86155 10.879 2.09257C10.879 2.32401 10.6915 2.51109 10.4605 2.51109C10.2295 2.51109 10.042 2.32401 10.042 2.09257C10.042 1.86155 9.8541 1.67406 9.6235 1.67406C9.39248 1.67406 9.20498 1.48698 9.20498 1.25554C9.20498 1.02411 9.39248 0.83703 9.6235 0.83703C9.8541 0.83703 10.042 0.649535 10.042 0.418515C10.042 0.187076 10.2295 0 10.4605 0C10.6915 0 10.879 0.187076 10.879 0.418515ZM11.0968 2.91647L13.8833 5.70297L3.58631 16L0.799805 13.2135L11.0968 2.91647ZM11.1158 6.71379L10.1201 5.71815L11.1158 4.7225L12.1114 5.71815L11.1158 6.71379ZM2.58583 13.2519L3.58147 14.2475L10.2271 7.60191L9.23142 6.60627L2.58583 13.2519ZM4.21032 5.71869C4.55622 5.71869 4.83809 5.99993 4.83809 6.34646C4.83809 6.69362 5.11933 6.97423 5.46586 6.97423C5.8124 6.97423 6.09364 6.69362 6.09364 6.34646C6.09364 5.99993 6.37551 5.71869 6.72141 5.71869C7.06794 5.71869 7.34918 5.43807 7.34918 5.09092C7.34918 4.74376 7.06794 4.46314 6.72141 4.46314C6.37551 4.46314 6.09364 4.1819 6.09364 3.83537C6.09364 3.48821 5.8124 3.2076 5.46586 3.2076C5.11933 3.2076 4.83809 3.48821 4.83809 3.83537C4.83809 4.1819 4.55622 4.46314 4.21032 4.46314C3.86379 4.46314 3.58255 4.74376 3.58255 5.09092C3.58255 5.43807 3.86379 5.71869 4.21032 5.71869ZM13.2079 9.38031C13.2079 9.66909 13.4428 9.90345 13.731 9.90345C14.0198 9.90345 14.2542 10.1373 14.2542 10.4266C14.2542 10.7159 14.0198 10.9497 13.731 10.9497C13.4428 10.9497 13.2079 11.1841 13.2079 11.4729C13.2079 11.7622 12.9735 11.996 12.6847 11.996C12.396 11.996 12.1616 11.7622 12.1616 11.4729C12.1616 11.1841 11.9267 10.9497 11.6384 10.9497C11.3497 10.9497 11.1153 10.7159 11.1153 10.4266C11.1153 10.1373 11.3497 9.90345 11.6384 9.90345C11.9267 9.90345 12.1616 9.66909 12.1616 9.38031C12.1616 9.09101 12.396 8.85717 12.6847 8.85717C12.9735 8.85717 13.2079 9.09101 13.2079 9.38031ZM15.3003 7.39249C15.185 7.39249 15.091 7.29874 15.091 7.18323C15.091 7.06751 14.9973 6.97398 14.8818 6.97398C14.7663 6.97398 14.6725 7.06751 14.6725 7.18323C14.6725 7.29874 14.5786 7.39249 14.4633 7.39249C14.3478 7.39249 14.254 7.48603 14.254 7.60175C14.254 7.71747 14.3478 7.81101 14.4633 7.81101C14.5786 7.81101 14.6725 7.90475 14.6725 8.02026C14.6725 8.13598 14.7663 8.22952 14.8818 8.22952C14.9973 8.22952 15.091 8.13598 15.091 8.02026C15.091 7.90475 15.185 7.81101 15.3003 7.81101C15.4158 7.81101 15.5096 7.71747 15.5096 7.60175C15.5096 7.48603 15.4158 7.39249 15.3003 7.39249Z" clip-rule="evenodd"/></g><defs><clipPath id="clip0"><rect width="16" height="16" fill="#fff"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/warning-triangle.svg b/app/client/src/assets/icons/ads/warning-triangle.svg
index 350e33a327..c4807dff5c 100644
--- a/app/client/src/assets/icons/ads/warning-triangle.svg
+++ b/app/client/src/assets/icons/ads/warning-triangle.svg
@@ -1,4 +1 @@
-<svg width="72" height="73" viewBox="0 0 72 73" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M42.3253 4.44421L71.3309 63.0473C72.8988 66.2151 71.6018 70.0542 68.434 71.6221C67.5514 72.059 66.5798 72.2862 65.595 72.2862H6.4C2.86538 72.2862 0 69.4209 0 65.8863C0 64.8666 0.243617 63.8618 0.710563 62.9553L30.9 4.35225C32.5187 1.21006 36.3782 -0.0249646 39.5204 1.59374C40.7358 2.21989 41.7188 3.21883 42.3253 4.44421Z" fill="#E8E8E8"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M35.9033 53.8863C38.1125 53.8863 39.9033 55.6772 39.9033 57.8863C39.9033 60.0955 38.1125 61.8863 35.9033 61.8863C33.6942 61.8863 31.9033 60.0955 31.9033 57.8863C31.9033 55.6772 33.6942 53.8863 35.9033 53.8863ZM35.9033 23.4863C37.9863 23.4863 39.6749 25.1749 39.6749 27.2579C39.6749 27.3318 39.6728 27.4057 39.6684 27.4794L38.4443 48.2905C38.3651 49.6358 37.251 50.6863 35.9033 50.6863C34.5556 50.6863 33.4415 49.6358 33.3624 48.2905L32.1382 27.4794C32.0159 25.4 33.6024 23.6152 35.6818 23.4928C35.7556 23.4885 35.8294 23.4863 35.9033 23.4863Z" fill="#979797"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="73" fill="none" viewBox="0 0 72 73"><path fill="#E8E8E8" fill-rule="evenodd" d="M42.3253 4.44421L71.3309 63.0473C72.8988 66.2151 71.6018 70.0542 68.434 71.6221C67.5514 72.059 66.5798 72.2862 65.595 72.2862H6.4C2.86538 72.2862 0 69.4209 0 65.8863C0 64.8666 0.243617 63.8618 0.710563 62.9553L30.9 4.35225C32.5187 1.21006 36.3782 -0.0249646 39.5204 1.59374C40.7358 2.21989 41.7188 3.21883 42.3253 4.44421Z" clip-rule="evenodd"/><path fill="#979797" fill-rule="evenodd" d="M35.9033 53.8863C38.1125 53.8863 39.9033 55.6772 39.9033 57.8863C39.9033 60.0955 38.1125 61.8863 35.9033 61.8863C33.6942 61.8863 31.9033 60.0955 31.9033 57.8863C31.9033 55.6772 33.6942 53.8863 35.9033 53.8863ZM35.9033 23.4863C37.9863 23.4863 39.6749 25.1749 39.6749 27.2579C39.6749 27.3318 39.6728 27.4057 39.6684 27.4794L38.4443 48.2905C38.3651 49.6358 37.251 50.6863 35.9033 50.6863C34.5556 50.6863 33.4415 49.6358 33.3624 48.2905L32.1382 27.4794C32.0159 25.4 33.6024 23.6152 35.6818 23.4928C35.7556 23.4885 35.8294 23.4863 35.9033 23.4863Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/chat.svg b/app/client/src/assets/icons/comments/chat.svg
new file mode 100644
index 0000000000..7bb3a13ea4
--- /dev/null
+++ b/app/client/src/assets/icons/comments/chat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path stroke="#939090" stroke-width="1.6" d="M3.3 9.72754C3.3 6.1653 6.18776 3.27754 9.75 3.27754C13.3122 3.27754 16.2 6.1653 16.2 9.72754L16.2 16.1775L9.75 16.1775C6.18777 16.1775 3.3 13.2898 3.3 9.72754Z"/><rect width="7" height="1.3" x="6.25" y="8.478" fill="#939090"/><rect width="4" height="1.3" x="7.75" y="10.956" fill="#939090"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/check-oval.svg b/app/client/src/assets/icons/comments/check-oval.svg
index 13fcb0032a..8abc88b134 100644
--- a/app/client/src/assets/icons/comments/check-oval.svg
+++ b/app/client/src/assets/icons/comments/check-oval.svg
@@ -1,4 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="7" stroke="#80888D" stroke-width="1.2"/>
-<path d="M5.42102 8.12461L7.05028 9.64634L10.671 6.15787" stroke="#80888D" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><circle cx="8" cy="8" r="7" stroke="#80888D" stroke-width="1.2"/><path stroke="#80888D" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5.42102 8.12461L7.05028 9.64634L10.671 6.15787"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/comment-mode-unread-indicator.svg b/app/client/src/assets/icons/comments/comment-mode-unread-indicator.svg
new file mode 100644
index 0000000000..6462f9cb80
--- /dev/null
+++ b/app/client/src/assets/icons/comments/comment-mode-unread-indicator.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="35" height="34" fill="none" viewBox="0 0 35 34"><rect width="35" height="34" fill="transparent"/><path stroke="#939090" stroke-width="1.6" d="M11.3 16.7275C11.3 13.1653 14.1878 10.2775 17.75 10.2775C21.3122 10.2775 24.2 13.1653 24.2 16.7275L24.2 23.1775L17.75 23.1775C14.1878 23.1775 11.3 20.2898 11.3 16.7275Z"/><rect width="7" height="1.3" x="14.25" y="15.477" fill="#939090"/><rect width="4" height="1.3" x="15.75" y="17.956" fill="#939090"/><circle cx="26" cy="10" r="5.35" fill="#F22B2B" stroke="#fff" stroke-width="1.3"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/commentCursor.png b/app/client/src/assets/icons/comments/commentCursor.png
new file mode 100644
index 0000000000..25adce859f
Binary files /dev/null and b/app/client/src/assets/icons/comments/commentCursor.png differ
diff --git a/app/client/src/assets/icons/comments/context-menu.svg b/app/client/src/assets/icons/comments/context-menu.svg
new file mode 100644
index 0000000000..646ae34044
--- /dev/null
+++ b/app/client/src/assets/icons/comments/context-menu.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="17" fill="none" viewBox="0 0 16 17"><ellipse cx="7.775" cy="8.499" fill="#A9A7A7" rx="1.714" ry="1.714" transform="rotate(90 7.77479 8.49944)"/><ellipse cx="7.775" cy="14.214" fill="#A9A7A7" rx="1.714" ry="1.714" transform="rotate(90 7.77479 14.2143)"/><circle cx="7.775" cy="2.786" r="1.714" fill="#A9A7A7" transform="rotate(90 7.77479 2.78557)"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/down-arrow.svg b/app/client/src/assets/icons/comments/down-arrow.svg
new file mode 100644
index 0000000000..6274f608f9
--- /dev/null
+++ b/app/client/src/assets/icons/comments/down-arrow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="14" fill="none" viewBox="0 0 15 14"><path stroke="#F86A2B" stroke-linejoin="round" stroke-width="1.5" d="M7.49995 0.700195V8.2602"/><path fill="#F86A2B" fill-rule="evenodd" d="M13.1001 6.85986L7.5001 13.2999L1.9001 6.85986L13.1001 6.85986Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/edit-mode.svg b/app/client/src/assets/icons/comments/edit-mode.svg
new file mode 100644
index 0000000000..5aea2a20fa
--- /dev/null
+++ b/app/client/src/assets/icons/comments/edit-mode.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="14" fill="none" viewBox="0 0 15 14"><path fill="#4B4848" fill-rule="evenodd" d="M11.2216 0L9.07798 2.11939L12.7836 5.78317L14.9272 3.66379L11.2216 0ZM1.54625 9.91114L0.927246 14L5.01795 13.1758C5.25441 13.1281 5.47179 13.0124 5.64333 12.8428L11.8773 6.67931L8.17161 3.01552L1.89961 9.21666C1.71008 9.40404 1.58615 9.64763 1.54625 9.91114Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/emoji.svg b/app/client/src/assets/icons/comments/emoji.svg
index bc123ca1a0..9337c2dede 100644
--- a/app/client/src/assets/icons/comments/emoji.svg
+++ b/app/client/src/assets/icons/comments/emoji.svg
@@ -1,3 +1 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.19629 14.0371C11.0107 14.0371 14.1689 10.8721 14.1689 7.06445C14.1689 3.25 11.0039 0.0917969 7.18945 0.0917969C3.38184 0.0917969 0.223633 3.25 0.223633 7.06445C0.223633 10.8721 3.38867 14.0371 7.19629 14.0371ZM7.19629 12.875C3.96973 12.875 1.39258 10.291 1.39258 7.06445C1.39258 3.83789 3.96289 1.25391 7.18945 1.25391C10.416 1.25391 13 3.83789 13.0068 7.06445C13.0137 10.291 10.4229 12.875 7.19629 12.875ZM5.21387 6.44238C5.61719 6.44238 5.95215 6.08691 5.95215 5.58789C5.95215 5.08887 5.61719 4.7334 5.21387 4.7334C4.81055 4.7334 4.48242 5.08887 4.48242 5.58789C4.48242 6.08691 4.81055 6.44238 5.21387 6.44238ZM9.20605 6.44238C9.60938 6.44238 9.94434 6.08691 9.94434 5.58789C9.94434 5.08887 9.60938 4.7334 9.20605 4.7334C8.80957 4.7334 8.47461 5.08887 8.47461 5.58789C8.47461 6.08691 8.80957 6.44238 9.20605 6.44238ZM4.80371 9.08789C4.80371 9.53906 5.76074 10.4893 7.18945 10.4893C8.61816 10.4893 9.5752 9.53906 9.5752 9.08789C9.5752 8.92383 9.41797 8.84863 9.27441 8.91699C8.77539 9.19043 8.18066 9.49805 7.18945 9.49805C6.19824 9.49805 5.60352 9.18359 5.11133 8.91699C4.96094 8.84863 4.80371 8.92383 4.80371 9.08789Z" fill="#A9A7A7"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><path stroke="#716E6E" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="M9.88562 9.88562C8.84422 10.927 7.15578 10.927 6.11438 9.88562M6 6.66667H6.00667M10 6.66667H10.0067M14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8C2 4.68629 4.68629 2 8 2C11.3137 2 14 4.68629 14 8Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/eye.svg b/app/client/src/assets/icons/comments/eye.svg
new file mode 100644
index 0000000000..987bf4e7c2
--- /dev/null
+++ b/app/client/src/assets/icons/comments/eye.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path fill="#858282" fill-rule="evenodd" d="M15.6101 7.33577C13.7584 5.80292 11.8038 5 10.0034 5C5.66552 5 2.25348 9.4708 2.11631 9.65328C1.96123 9.85496 1.96123 10.145 2.11631 10.3467C2.79556 11.2046 3.56016 11.9817 4.39672 12.6642C6.24848 14.1971 8.20311 15 10.0034 15C14.3413 15 17.7534 10.5292 17.8906 10.3285C18.0365 10.1302 18.0365 9.85155 17.8906 9.65328C17.2112 8.79548 16.4466 8.01845 15.6101 7.33577ZM10.0034 13.3507C8.07167 13.3507 6.50567 11.8507 6.50567 10.0004C6.50567 8.15001 8.07167 6.65 10.0034 6.65C11.9352 6.65 13.5012 8.15001 13.5012 10.0004C13.4918 11.847 11.9313 13.3417 10.0034 13.3507ZM8.10024 10.003C8.10024 8.99618 8.95233 8.18 10.0034 8.18C11.0545 8.18 11.9066 8.99618 11.9066 10.003C11.9066 11.0098 11.0545 11.826 10.0034 11.826C8.95233 11.826 8.10024 11.0098 8.10024 10.003Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/filter.svg b/app/client/src/assets/icons/comments/filter.svg
new file mode 100644
index 0000000000..5d4f05f9de
--- /dev/null
+++ b/app/client/src/assets/icons/comments/filter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="12" fill="none" viewBox="0 0 13 12"><path fill="#A9A7A7" d="M12.5809 2.0722L8.26649 7.06702L7.98814 10.7165C7.98123 10.7872 7.9553 10.8547 7.9131 10.9119C7.8709 10.9691 7.814 11.0138 7.74846 11.0412L5.5062 11.9691C5.4602 11.9904 5.40997 12.0009 5.35929 12C5.2619 12.0003 5.16798 11.9638 5.09631 11.8979C5.02463 11.832 4.98049 11.7414 4.9727 11.6443L4.61703 7.06702L0.302615 2.0722C0.146342 1.89011 0.0455507 1.66703 0.0121888 1.42941C-0.0211732 1.19178 0.0142928 0.949577 0.114383 0.731494C0.214474 0.513411 0.374991 0.328596 0.576911 0.198956C0.778831 0.0693155 1.01369 0.000284716 1.25364 4.57764e-05H11.6299C11.8698 0.000284716 12.1047 0.0693155 12.3066 0.198956C12.5085 0.328596 12.669 0.513411 12.7691 0.731494C12.8692 0.949577 12.9047 1.19178 12.8713 1.42941C12.838 1.66703 12.7372 1.89011 12.5809 2.0722Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/link.svg b/app/client/src/assets/icons/comments/link.svg
index b0f4250ef4..72f68c513b 100644
--- a/app/client/src/assets/icons/comments/link.svg
+++ b/app/client/src/assets/icons/comments/link.svg
@@ -1,4 +1 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.84001 8.16016C11.04 9.36016 11.04 11.2202 9.84001 12.4202L8.16001 14.1002C6.96001 15.3002 5.1 15.3002 3.9 14.1002C2.7 12.9002 2.7 11.0402 3.9 9.84016L5.4 8.40016" stroke="#090707" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.15977 9.84001C6.95977 8.64001 6.95977 6.78 8.15977 5.58L9.83977 3.9C11.0398 2.7 12.8998 2.7 14.0998 3.9C15.2998 5.1 15.2998 6.96001 14.0998 8.16001L12.5998 9.60001" stroke="#090707" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="none" viewBox="0 0 18 18"><path stroke="#858282" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.8402 8.16003C11.0402 9.36007 11.0402 11.2201 9.8402 12.4202L8.16015 14.1002C6.96012 15.3002 5.10006 15.3002 3.90003 14.1002C2.69999 12.9002 2.69999 11.0401 3.90003 9.84008L5.40007 8.40004"/><path stroke="#858282" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8.15979 9.84008C6.95976 8.64004 6.95976 6.77999 8.15979 5.57995L9.83984 3.8999C11.0399 2.69987 12.8999 2.69987 14.1 3.8999C15.3 5.09994 15.3 6.95999 14.1 8.16003L12.5999 9.60007"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/notifications-empty-state.svg b/app/client/src/assets/icons/comments/notifications-empty-state.svg
new file mode 100644
index 0000000000..cbce95b8ec
--- /dev/null
+++ b/app/client/src/assets/icons/comments/notifications-empty-state.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="122" height="125" fill="none" viewBox="0 0 122 125"><ellipse cx="60.07" cy="117.638" fill="#C5C5C5" fill-opacity=".6" rx="53.052" ry="6.409"/><circle cx="21.704" cy="34.021" r="3.204" stroke="#C5C5C5" stroke-width="1.78"/><circle cx="112.718" cy="91.601" r="2.027" stroke="#939090" stroke-width="1.158"/><path stroke="#939090" stroke-width="1.709" d="M80.3922 11.0469V18.8313"/><path stroke="#939090" stroke-width="1.709" d="M76.5 14.94H84.2844"/><path stroke="#939090" stroke-width="2.136" d="M9.16304 84.0469V93.7774"/><path stroke="#939090" stroke-width="2.136" d="M4.29785 88.9123H14.0284"/><circle cx="50.502" cy="3.204" r="3.204" fill="#C5C5C5"/><path fill="#C5C5C5" fill-rule="evenodd" d="M35.5 34.0469C35.5 31.8377 37.2909 30.0469 39.5 30.0469H117.5C119.709 30.0469 121.5 31.8377 121.5 34.0469V55.0469C121.5 57.256 119.709 59.0469 117.5 59.0469H39.5C37.2909 59.0469 35.5 57.256 35.5 55.0469V34.0469Z" clip-rule="evenodd"/><circle cx="50.5" cy="44.047" r="9" fill="#E8E8E8"/><path stroke="#A9A7A7" stroke-width="2.502" d="M46.1008 43.6451L49.5766 47.0461L55.6868 40.2441"/><path fill="#A9A7A7" fill-rule="evenodd" d="M65.5 41.0469C65.5 39.9423 66.3954 39.0469 67.5 39.0469H92.5C93.6046 39.0469 94.5 39.9423 94.5 41.0469C94.5 42.1514 93.6046 43.0469 92.5 43.0469H67.5C66.3954 43.0469 65.5 42.1514 65.5 41.0469Z" clip-rule="evenodd"/><path fill="#A9A7A7" fill-rule="evenodd" d="M95.5 41.0469C95.5 39.9423 96.3954 39.0469 97.5 39.0469H109.5C110.605 39.0469 111.5 39.9423 111.5 41.0469C111.5 42.1514 110.605 43.0469 109.5 43.0469H97.5C96.3954 43.0469 95.5 42.1514 95.5 41.0469Z" clip-rule="evenodd"/><path fill="#A9A7A7" fill-rule="evenodd" d="M88.5 48.0469C88.5 46.9423 89.3954 46.0469 90.5 46.0469H99.5C100.605 46.0469 101.5 46.9423 101.5 48.0469C101.5 49.1514 100.605 50.0469 99.5 50.0469H90.5C89.3954 50.0469 88.5 49.1514 88.5 48.0469Z" clip-rule="evenodd"/><path fill="#C5C5C5" fill-rule="evenodd" d="M19.5 73.0469C19.5 70.8377 21.2909 69.0469 23.5 69.0469H92.5C94.7091 69.0469 96.5 70.8377 96.5 73.0469V94.0469C96.5 96.256 94.7091 98.0469 92.5 98.0469H23.5C21.2909 98.0469 19.5 96.256 19.5 94.0469V73.0469Z" clip-rule="evenodd"/><circle cx="34.5" cy="85.047" r="9" fill="#E8E8E8"/><path stroke="#A9A7A7" stroke-width="2.502" d="M30.1008 84.6451L33.5766 88.0461L39.6868 81.2441"/><path fill="#A9A7A7" fill-rule="evenodd" d="M49.5 82.0469C49.5 80.9423 50.3954 80.0469 51.5 80.0469H60.5C61.6046 80.0469 62.5 80.9423 62.5 82.0469C62.5 83.1514 61.6046 84.0469 60.5 84.0469H51.5C50.3954 84.0469 49.5 83.1514 49.5 82.0469Z" clip-rule="evenodd"/><path fill="#A9A7A7" fill-rule="evenodd" d="M63.5 82.0469C63.5 80.9423 64.3954 80.0469 65.5 80.0469H81.5C82.6046 80.0469 83.5 80.9423 83.5 82.0469C83.5 83.1514 82.6046 84.0469 81.5 84.0469H65.5C64.3954 84.0469 63.5 83.1514 63.5 82.0469Z" clip-rule="evenodd"/><path fill="#A9A7A7" fill-rule="evenodd" d="M68.5 89.0469C68.5 87.9423 67.6046 87.0469 66.5 87.0469H51.5C50.3954 87.0469 49.5 87.9423 49.5 89.0469C49.5 90.1514 50.3954 91.0469 51.5 91.0469H66.5C67.6046 91.0469 68.5 90.1514 68.5 89.0469Z" clip-rule="evenodd"/><rect width="86" height="30" x=".5" y="47.047" fill="#F1F0EE" rx="4"/><circle cx="15.5" cy="62.047" r="9" fill="#C5C5C5"/><path stroke="#716E6E" stroke-width="3" d="M10.6125 60.0712L15.5 64.5083L24.9996 53.9629"/><path fill="#918E8E" fill-rule="evenodd" d="M30.5 59.0469C30.5 57.9423 31.3954 57.0469 32.5 57.0469H43.5C44.6046 57.0469 45.5 57.9423 45.5 59.0469C45.5 60.1514 44.6046 61.0469 43.5 61.0469H32.5C31.3954 61.0469 30.5 60.1514 30.5 59.0469Z" clip-rule="evenodd"/><path fill="#918E8E" fill-rule="evenodd" d="M46.5 59.0469C46.5 57.9423 47.3954 57.0469 48.5 57.0469H74.5C75.6046 57.0469 76.5 57.9423 76.5 59.0469C76.5 60.1514 75.6046 61.0469 74.5 61.0469H48.5C47.3954 61.0469 46.5 60.1514 46.5 59.0469Z" clip-rule="evenodd"/><path fill="#C5C5C5" fill-rule="evenodd" d="M30.5 66.0469C30.5 64.9423 31.3954 64.0469 32.5 64.0469H50.5C51.6046 64.0469 52.5 64.9423 52.5 66.0469C52.5 67.1514 51.6046 68.0469 50.5 68.0469H32.5C31.3954 68.0469 30.5 67.1514 30.5 66.0469Z" clip-rule="evenodd"/><path fill="#C5C5C5" fill-rule="evenodd" d="M53.5 66.0469C53.5 64.9423 54.3954 64.0469 55.5 64.0469H64.5C65.6046 64.0469 66.5 64.9423 66.5 66.0469C66.5 67.1514 65.6046 68.0469 64.5 68.0469H55.5C54.3954 68.0469 53.5 67.1514 53.5 66.0469Z" clip-rule="evenodd"/><path fill="#716E6E" fill-rule="evenodd" d="M106.206 79.8068L89.9518 110.377L80.2394 105.213L96.4939 74.6426L106.206 79.8068Z" clip-rule="evenodd"/><path fill="#C5C5C5" fill-rule="evenodd" d="M86.8193 116.267L89.5283 111.172L79.8159 106.008L77.1068 111.103C75.4983 114.128 85.2107 119.292 86.8193 116.267Z" clip-rule="evenodd"/><path fill="#C5C5C5" fill-rule="evenodd" d="M97.1609 73.7703L107.694 65.4831L106.714 78.8499L97.1609 73.7703Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/pen.svg b/app/client/src/assets/icons/comments/pen.svg
new file mode 100644
index 0000000000..80d650514f
--- /dev/null
+++ b/app/client/src/assets/icons/comments/pen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="21" height="20" fill="none" viewBox="0 0 21 20"><path fill="#F0F0F0" fill-rule="evenodd" d="M14.2216 3L12.078 5.11939L15.7836 8.78317L17.9272 6.66379L14.2216 3ZM4.54625 12.9111L3.92725 17L8.01795 16.1758C8.25441 16.1281 8.47179 16.0124 8.64333 15.8428L14.8773 9.67931L11.1716 6.01552L4.89961 12.2167C4.71008 12.404 4.58615 12.6476 4.54625 12.9111Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/pin.svg b/app/client/src/assets/icons/comments/pin.svg
index 5ba851dbdc..60301bb220 100644
--- a/app/client/src/assets/icons/comments/pin.svg
+++ b/app/client/src/assets/icons/comments/pin.svg
@@ -1,3 +1 @@
-<svg width="11" height="26" viewBox="0 0 11 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.60156 25.75C6.09375 25.75 6.9375 23.7344 6.9375 20.8164V9.625C8.96484 9.05078 10.4414 7.16406 10.4414 4.96094C10.4414 2.27734 8.28516 0.0976562 5.60156 0.0976562C2.90625 0.0976562 0.75 2.27734 0.75 4.96094C0.75 7.16406 2.21484 9.03906 4.24219 9.625V20.8164C4.24219 23.7227 5.09766 25.75 5.60156 25.75ZM4.21875 5.24219C3.33984 5.24219 2.56641 4.45703 2.56641 3.56641C2.56641 2.66406 3.33984 1.91406 4.21875 1.91406C5.13281 1.91406 5.87109 2.66406 5.87109 3.56641C5.87109 4.45703 5.13281 5.24219 4.21875 5.24219Z" fill="#EF4141"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="26" fill="none" viewBox="0 0 11 26"><path fill="#EF4141" d="M5.60156 25.75C6.09375 25.75 6.9375 23.7344 6.9375 20.8164V9.625C8.96484 9.05078 10.4414 7.16406 10.4414 4.96094C10.4414 2.27734 8.28516 0.0976562 5.60156 0.0976562C2.90625 0.0976562 0.75 2.27734 0.75 4.96094C0.75 7.16406 2.21484 9.03906 4.24219 9.625V20.8164C4.24219 23.7227 5.09766 25.75 5.60156 25.75ZM4.21875 5.24219C3.33984 5.24219 2.56641 4.45703 2.56641 3.56641C2.56641 2.66406 3.33984 1.91406 4.21875 1.91406C5.13281 1.91406 5.87109 2.66406 5.87109 3.56641C5.87109 4.45703 5.13281 5.24219 4.21875 5.24219Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/pin_2.svg b/app/client/src/assets/icons/comments/pin_2.svg
index d5ca8f9991..d7d1825d40 100644
--- a/app/client/src/assets/icons/comments/pin_2.svg
+++ b/app/client/src/assets/icons/comments/pin_2.svg
@@ -1,4 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.0942 6.77075C15.3733 7.04975 15.3733 7.50125 15.0942 7.78025L14.4703 8.40425C14.3008 8.57375 14.0592 8.64575 13.8253 8.59925L11.0697 8.04725L8.79725 10.3197L9.34925 13.0753C9.39575 13.3092 9.32225 13.5523 9.15425 13.7203L8.53025 14.3442C8.25125 14.6233 7.79975 14.6233 7.52075 14.3442L1.45925 8.28275C1.18025 8.00375 1.18025 7.55225 1.45925 7.27325L2.08325 6.64925C2.25275 6.47975 2.49425 6.40775 2.72825 6.45425L5.48375 7.00625L7.75625 4.73375L7.20425 1.97825C7.15775 1.74425 7.23125 1.50125 7.39925 1.33325L8.02325 0.70925C8.30225 0.43025 8.75375 0.43025 9.03275 0.70925L15.0942 6.77075Z" fill="#939090"/>
-<path d="M1.45605 14.3474L4.48605 11.3174" stroke="#939090" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><path fill="#939090" fill-rule="evenodd" d="M15.0942 6.77075C15.3733 7.04975 15.3733 7.50125 15.0942 7.78025L14.4703 8.40425C14.3008 8.57375 14.0592 8.64575 13.8253 8.59925L11.0697 8.04725L8.79725 10.3197L9.34925 13.0753C9.39575 13.3092 9.32225 13.5523 9.15425 13.7203L8.53025 14.3442C8.25125 14.6233 7.79975 14.6233 7.52075 14.3442L1.45925 8.28275C1.18025 8.00375 1.18025 7.55225 1.45925 7.27325L2.08325 6.64925C2.25275 6.47975 2.49425 6.40775 2.72825 6.45425L5.48375 7.00625L7.75625 4.73375L7.20425 1.97825C7.15775 1.74425 7.23125 1.50125 7.39925 1.33325L8.02325 0.70925C8.30225 0.43025 8.75375 0.43025 9.03275 0.70925L15.0942 6.77075Z" clip-rule="evenodd"/><path stroke="#939090" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M1.45605 14.3474L4.48605 11.3174"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/pin_3.svg b/app/client/src/assets/icons/comments/pin_3.svg
new file mode 100644
index 0000000000..59101bf219
--- /dev/null
+++ b/app/client/src/assets/icons/comments/pin_3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="10" fill="none" viewBox="0 0 8 10"><path fill="#716E6E" fill-rule="evenodd" d="M2.12158 1.4H0.998746V0.199999H6.98718V1.4H5.86435L6.23863 5.6C6.99044 5.6 7.5999 6.20947 7.5999 6.96128V7.39926H4.59181V9.2L3.99296 9.8L3.39412 9.2V7.4L0.399904 7.39926V6.9474C0.399904 6.20325 1.00315 5.6 1.7473 5.6L2.12158 1.4Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/reaction-2.svg b/app/client/src/assets/icons/comments/reaction-2.svg
new file mode 100644
index 0000000000..91b9cce1af
--- /dev/null
+++ b/app/client/src/assets/icons/comments/reaction-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="17" fill="none" viewBox="0 0 16 17"><g clip-path="url(#clip0)"><path stroke="#A9A7A7" stroke-width="1.5" d="M7.3629 2.42747C3.69209 2.42747 0.716309 5.40325 0.716309 9.07407C0.716309 12.7449 3.69209 15.7207 7.3629 15.7207C11.0337 15.7207 14.0095 12.7449 14.0095 9.07407"/><path fill="#A9A7A7" fill-rule="evenodd" d="M9.52299 8.07707C10.1654 8.07707 10.6861 7.55631 10.6861 6.91392C10.6861 6.27152 10.1654 5.75076 9.52299 5.75076C8.8806 5.75076 8.35983 6.27152 8.35983 6.91392C8.35983 7.55631 8.8806 8.07707 9.52299 8.07707ZM5.20285 8.07708C5.84524 8.07708 6.366 7.55632 6.366 6.91393C6.366 6.27153 5.84524 5.75077 5.20285 5.75077C4.56045 5.75077 4.03969 6.27153 4.03969 6.91393C4.03969 7.55632 4.56045 8.07708 5.20285 8.07708ZM7.36285 13.062C5.52744 13.062 4.03955 11.5741 4.03955 9.73872H10.6861C10.6861 11.5741 9.19825 13.062 7.36285 13.062Z" clip-rule="evenodd"/><path stroke="#A9A7A7" stroke-width="1.2" d="M12.6743 0.499611V6.64805"/><path stroke="#A9A7A7" stroke-width="1.2" d="M15.7485 3.62524L9.6001 3.62524"/></g><defs><clipPath id="clip0"><rect width="16" height="16" fill="#fff" transform="translate(0 0.5)"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/reaction.svg b/app/client/src/assets/icons/comments/reaction.svg
new file mode 100644
index 0000000000..433c705a35
--- /dev/null
+++ b/app/client/src/assets/icons/comments/reaction.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="none" viewBox="0 0 12 12"><path stroke="#716E6E" stroke-linecap="round" d="M5.5 1.5C2.73858 1.5 0.5 3.73858 0.5 6.5C0.5 9.26142 2.73858 11.5 5.5 11.5C8.26142 11.5 10.5 9.26142 10.5 6.5"/><path fill="#716E6E" fill-rule="evenodd" d="M3.875 5.75C4.35825 5.75 4.75 5.35825 4.75 4.875C4.75 4.39175 4.35825 4 3.875 4C3.39175 4 3 4.39175 3 4.875C3 5.35825 3.39175 5.75 3.875 5.75ZM7.125 5.75C7.60825 5.75 8 5.35825 8 4.875C8 4.39175 7.60825 4 7.125 4C6.64175 4 6.25 4.39175 6.25 4.875C6.25 5.35825 6.64175 5.75 7.125 5.75ZM5.5 9.5C4.11929 9.5 3 8.38071 3 7H8C8 8.38071 6.88071 9.5 5.5 9.5Z" clip-rule="evenodd"/><path stroke="#716E6E" stroke-linecap="round" d="M9.64554 0.84082V4.34082"/><path stroke="#716E6E" stroke-linecap="round" d="M11.3955 2.62012L7.89554 2.62012"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/read-pin.svg b/app/client/src/assets/icons/comments/read-pin.svg
new file mode 100644
index 0000000000..24d0fa35eb
--- /dev/null
+++ b/app/client/src/assets/icons/comments/read-pin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="none" viewBox="0 0 30 30"><path fill="#fff" stroke="#E0DEDE" stroke-width="2" d="M0.999997 15C0.999996 7.26802 7.26801 1 15 0.999999C22.732 0.999999 29 7.26801 29 15L29 29L15 29C7.26801 29 0.999997 22.732 0.999997 15Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/send-button.svg b/app/client/src/assets/icons/comments/send-button.svg
index c524e029bd..246664a879 100644
--- a/app/client/src/assets/icons/comments/send-button.svg
+++ b/app/client/src/assets/icons/comments/send-button.svg
@@ -1,3 +1 @@
-<svg width="19" height="16" viewBox="0 0 19 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.00888888 16L18.6667 8L0.00888888 0L0 6.22222L13.3333 8L0 9.77778L0.00888888 16Z" fill="#6A86CE"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="19" height="16" fill="none" viewBox="0 0 19 16"><path fill="#6A86CE" d="M0.00888888 16L18.6667 8L0.00888888 0L0 6.22222L13.3333 8L0 9.77778L0.00888888 16Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/toggle-comment-mode.svg b/app/client/src/assets/icons/comments/toggle-comment-mode.svg
index 9df15abe13..7e6bcd4849 100644
--- a/app/client/src/assets/icons/comments/toggle-comment-mode.svg
+++ b/app/client/src/assets/icons/comments/toggle-comment-mode.svg
@@ -1,3 +1 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.1531 2.90099H11.7861V9.05249H2.90063V10.4195C2.90063 10.7954 3.2082 11.103 3.58413 11.103H11.1026L13.8366 13.837V3.58449C13.8366 3.20857 13.5291 2.90099 13.1531 2.90099ZM10.4191 7.00199V0.850492C10.4191 0.474567 10.1116 0.166992 9.73563 0.166992H0.850126C0.474201 0.166992 0.166626 0.474567 0.166626 0.850492V10.4195L2.90063 7.68549H9.73563C10.1116 7.68549 10.4191 7.37792 10.4191 7.00199Z" fill="#6A86CE"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 14 14"><path fill="#6A86CE" d="M13.1531 2.90099H11.7861V9.05249H2.90063V10.4195C2.90063 10.7954 3.2082 11.103 3.58413 11.103H11.1026L13.8366 13.837V3.58449C13.8366 3.20857 13.5291 2.90099 13.1531 2.90099ZM10.4191 7.00199V0.850492C10.4191 0.474567 10.1116 0.166992 9.73563 0.166992H0.850126C0.474201 0.166992 0.166626 0.474567 0.166626 0.850492V10.4195L2.90063 7.68549H9.73563C10.1116 7.68549 10.4191 7.37792 10.4191 7.00199Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/trash.svg b/app/client/src/assets/icons/comments/trash.svg
index b67db540e0..0d0cd882fc 100644
--- a/app/client/src/assets/icons/comments/trash.svg
+++ b/app/client/src/assets/icons/comments/trash.svg
@@ -1,3 +1 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.8877 2.96647H14.9502V4.13314H2.7002V2.96647H5.7627L6.63796 1.7998H11.0124L11.8877 2.96647ZM13.2148 15.7997H4.43562L3.9252 5.29966H13.7252L13.2148 15.7997Z" fill="#939090"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="none" viewBox="0 0 18 18"><path fill="#939090" fill-rule="evenodd" d="M11.8877 2.96647H14.9502V4.13314H2.7002V2.96647H5.7627L6.63796 1.7998H11.0124L11.8877 2.96647ZM13.2148 15.7997H4.43562L3.9252 5.29966H13.7252L13.2148 15.7997Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/unpin.svg b/app/client/src/assets/icons/comments/unpin.svg
new file mode 100644
index 0000000000..0f1c9866c7
--- /dev/null
+++ b/app/client/src/assets/icons/comments/unpin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="none" viewBox="0 0 18 18"><path fill="#939090" fill-rule="evenodd" d="M4.49948 3.60005H6.18595L6.08493 4.73217L12.2829 8.92729L11.8075 3.60005H13.494V1.80005H4.49948V3.60005ZM2.95899 4.27167L2.2052 5.39132L5.80942 7.81977L5.62379 9.90005H5.60003C4.49546 9.90005 3.60003 10.7955 3.60003 11.9001V12.5989L8.09728 12.6001V15.3001L8.99673 16.2001L9.89619 15.3001V12.5989H12.8978L15.4014 14.2863L16.1552 13.1667L2.95899 4.27167Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/comments/unread-pin.svg b/app/client/src/assets/icons/comments/unread-pin.svg
new file mode 100644
index 0000000000..5b731a24e0
--- /dev/null
+++ b/app/client/src/assets/icons/comments/unread-pin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="none" viewBox="0 0 30 30"><path fill="#F86A2B" stroke="#fff" stroke-width="2" d="M0.999997 15C0.999996 7.26802 7.26801 1 15 0.999999C22.732 0.999999 29 7.26801 29 15L29 29L15 29C7.26801 29 0.999997 22.732 0.999997 15Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/arrow_forward.svg b/app/client/src/assets/icons/control/arrow_forward.svg
new file mode 100644
index 0000000000..70344d66f5
--- /dev/null
+++ b/app/client/src/assets/icons/control/arrow_forward.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" >
+<path d="M13.3327 7.33341H5.21935L8.94601 3.60675L7.99935 2.66675L2.66602 8.00008L7.99935 13.3334L8.93935 12.3934L5.21935 8.66675H13.3327V7.33341Z" fill="#A2A6A8" id="svg_1" class="" transform="rotate(-180 7.999359607696534,8.00007438659668) "/>
+</svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/back.svg b/app/client/src/assets/icons/control/back.svg
index 3c600a22a9..b34278d7d9 100644
--- a/app/client/src/assets/icons/control/back.svg
+++ b/app/client/src/assets/icons/control/back.svg
@@ -1,4 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.3327 7.33341H5.21935L8.94601 3.60675L7.99935 2.66675L2.66602 8.00008L7.99935 13.3334L8.93935 12.3934L5.21935 8.66675H13.3327V7.33341Z" fill="#A2A6A8"/>
-</svg>
-
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><path fill="#A2A6A8" d="M13.3327 7.33341H5.21935L8.94601 3.60675L7.99935 2.66675L2.66602 8.00008L7.99935 13.3334L8.93935 12.3934L5.21935 8.66675H13.3327V7.33341Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/cap_dot.svg b/app/client/src/assets/icons/control/cap_dot.svg
new file mode 100644
index 0000000000..9dc534c5ee
--- /dev/null
+++ b/app/client/src/assets/icons/control/cap_dot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" stroke="#a2a6a8" strokeWidth="2"><path d="M1.784 8h11.351"/><path fill="#a2a6a8" d="M6.605 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 1 1-7 0z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/cap_solid.svg b/app/client/src/assets/icons/control/cap_solid.svg
new file mode 100644
index 0000000000..b3c4759250
--- /dev/null
+++ b/app/client/src/assets/icons/control/cap_solid.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
+<path fill="#A2A6A8" fill-opacity="1" stroke="#A2A6A8" stroke-opacity="1" stroke-width="2" stroke-dasharray="none" stroke-linejoin="miter" stroke-linecap="butt" fill-rule="nonzero" opacity="1" d="M2.3243240536870218,7.999999884012587 L13.675675405038383,7.999999884012587 " />
+</svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/copy2.svg b/app/client/src/assets/icons/control/copy2.svg
new file mode 100644
index 0000000000..f07eade443
--- /dev/null
+++ b/app/client/src/assets/icons/control/copy2.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.5 0H3.14706V1.41176H14.1747V13.6471H15.5V0ZM12.8529 2.82353H0.5V16H12.8529V2.82353Z" fill="#090707"/>
+</svg>
diff --git a/app/client/src/assets/icons/control/cut.svg b/app/client/src/assets/icons/control/cut.svg
new file mode 100644
index 0000000000..24d44a1945
--- /dev/null
+++ b/app/client/src/assets/icons/control/cut.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="14" viewBox="0 0 16 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.8956 1.29262C1.95273 0.235792 3.66667 0.235792 4.7238 1.29262C5.78093 2.34945 5.78093 4.06291 4.7238 5.11975C4.60724 5.23627 4.4827 5.33995 4.35193 5.43078L5.448 6.019L6.08506 5.32306L12.1055 2.08076C13.0124 1.59232 14.1323 1.88302 14.6929 2.72638L14.7766 2.8641L7.397 6.838L14.7766 10.8125L14.6929 10.9502C14.1323 11.7935 13.0124 12.0842 12.1055 11.5958L6.08506 8.35351L5.586 7.807L4.21474 8.5457C4.30828 8.60855 4.39877 8.67787 4.48558 8.75365L4.62104 8.88025C5.67817 9.93709 5.67817 11.6505 4.62105 12.7074C3.56392 13.7642 1.84998 13.7642 0.792846 12.7074C-0.264282 11.6505 -0.264282 9.93709 0.792846 8.88025C1.12818 8.54502 1.5296 8.31612 1.95519 8.19356L4.264 6.95L2.21011 5.84551C1.78495 5.7494 1.3785 5.54968 1.03107 5.24634L0.8956 5.11975C-0.161527 4.06291 -0.161527 2.34946 0.8956 1.29262ZM3.52628 9.75678C3.00747 9.34607 2.25163 9.38029 1.77233 9.85946C1.25615 10.3755 1.25616 11.2121 1.77233 11.7282C2.2885 12.2442 3.12539 12.2442 3.64156 11.7282C4.15774 11.2121 4.15774 10.3755 3.64156 9.85946L3.52628 9.75678ZM12.0683 6.07527L12.1767 6.08198C12.5771 6.1361 12.8876 6.44438 12.9408 6.8351L12.9489 6.95462C12.9489 7.44005 12.5549 7.83397 12.0693 7.83397C11.5837 7.83397 11.1897 7.44005 11.1897 6.96244C11.1853 6.5546 11.4597 6.2104 11.8336 6.107L11.962 6.08307L12.0683 6.07527ZM15.1194 6.06362L15.2271 6.07033C15.6282 6.12445 15.9387 6.43272 15.9919 6.82345L16 6.94297C16 7.4284 15.606 7.82232 15.1204 7.82232C14.6348 7.82232 14.2408 7.4284 14.2408 6.95078C14.2364 6.54294 14.5108 6.19875 14.8847 6.09534L15.0131 6.07141L15.1194 6.06362ZM3.62903 2.16915C3.11022 1.75843 2.35439 1.79266 1.87508 2.27183C1.35891 2.78786 1.35891 3.62451 1.87508 4.14054C2.39126 4.65657 3.22814 4.65657 3.74432 4.14054C4.26049 3.62451 4.26049 2.78786 3.74432 2.27183L3.62903 2.16915Z" fill="#4B4848"/>
+</svg>
diff --git a/app/client/src/assets/icons/control/divider_cap_all.svg b/app/client/src/assets/icons/control/divider_cap_all.svg
new file mode 100644
index 0000000000..e854c51bab
--- /dev/null
+++ b/app/client/src/assets/icons/control/divider_cap_all.svg
@@ -0,0 +1 @@
+<svg width="48" height="24" fill="#fff"><path d="M11 16v-3h10v-2H11V8l-4 4 4 4zm-8 4h2V4H3v16zM36.378 7.73v3h-10v2h10v3l4-4-4-4zm8-4h-2v16h2v-16z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/divider_cap_left.svg b/app/client/src/assets/icons/control/divider_cap_left.svg
new file mode 100644
index 0000000000..820d7fc5cb
--- /dev/null
+++ b/app/client/src/assets/icons/control/divider_cap_left.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none">
+<path fill="#fff" d="M8 11H11V21H13V11H16L12 7L8 11ZM4 3V5H20V3H4Z" class="selected" transform="rotate(-90 12.000000000000002,12) "/>
+</svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/divider_cap_right.svg b/app/client/src/assets/icons/control/divider_cap_right.svg
new file mode 100644
index 0000000000..ffa6105c39
--- /dev/null
+++ b/app/client/src/assets/icons/control/divider_cap_right.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none">
+<path fill="#fff" d="M8 11H11V21H13V11H16L12 7L8 11ZM4 3V5H20V3H4Z"   transform="rotate(90 12,12.000000000000002) "/>
+</svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/download-data-icon.svg b/app/client/src/assets/icons/control/download-data-icon.svg
new file mode 100644
index 0000000000..eb400b1f56
--- /dev/null
+++ b/app/client/src/assets/icons/control/download-data-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><path fill="#A9A7A7" fill-rule="evenodd" d="M3.63664 2.85717L5.50677 2.85717L7.06542 2.85717L7.06542 6.59999L5.81828 6.59999L8.0001 9.34284L10.1819 6.59999L8.93555 6.59999L8.93555 2.85717L10.4938 2.85717L12.3639 2.85717C13.741 2.85717 14.8574 4.08528 14.8574 5.60003C14.8574 6.88094 14.0551 7.9486 12.9761 8.24963C12.8564 10.9733 10.8173 13.1429 8.31197 13.1429C5.83467 13.1429 3.81243 11.022 3.65223 8.34083C2.25399 8.3518 1.14313 7.10654 1.14313 5.60003C1.14313 4.08529 2.2596 2.85717 3.63664 2.85717Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/download-table.svg b/app/client/src/assets/icons/control/download-table.svg
deleted file mode 100755
index 129ee6b5ad..0000000000
--- a/app/client/src/assets/icons/control/download-table.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><g><path fill="#2E3D49" d="M16.125 8.36658C15.5583 5.49158 13.0333 3.33325 10 3.33325C7.59167 3.33325 5.5 4.69992 4.45833 6.69992C1.95 6.96658 0 9.09158 0 11.6666C0 14.4249 2.24167 16.6666 5 16.6666H15.8333C18.1333 16.6666 20 14.7999 20 12.4999C20 10.2999 18.2917 8.51658 16.125 8.36658ZM14.1667 10.8333L10 14.9999L5.83333 10.8333H8.33333V7.49992H11.6667V10.8333H14.1667Z"/></g></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/filter-icon.svg b/app/client/src/assets/icons/control/filter-icon.svg
old mode 100755
new mode 100644
index 1723d3efe8..4d92889575
--- a/app/client/src/assets/icons/control/filter-icon.svg
+++ b/app/client/src/assets/icons/control/filter-icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><g><path fill="#2E3D49" d="M11.6014 16C11.4571 16 11.3168 15.9532 11.2014 15.8667L8.53472 13.8333C8.45315 13.7705 8.38723 13.6897 8.34212 13.5972C8.29701 13.5047 8.27394 13.4029 8.27472 13.3V11.12L5.07472 4.97333C5.02202 4.87161 4.99642 4.75802 5.0004 4.64352C5.00438 4.52903 5.0378 4.41749 5.09743 4.31966C5.15706 4.22184 5.24089 4.14104 5.34084 4.08504C5.4408 4.02905 5.55349 3.99976 5.66805 4H15.0014C15.1171 4.00002 15.2308 4.03015 15.3313 4.08743C15.4318 4.1447 15.5157 4.22715 15.5747 4.32667C15.6332 4.42801 15.664 4.54298 15.664 4.66C15.664 4.77703 15.6332 4.89199 15.5747 4.99333L12.2414 11.1333V15.3333C12.2423 15.4576 12.2084 15.5796 12.1436 15.6856C12.0788 15.7916 11.9857 15.8774 11.8747 15.9333C11.7894 15.9747 11.6962 15.9975 11.6014 16Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><path fill="#A9A7A7" fill-rule="evenodd" d="M3.6 2.40002C4.48366 2.40002 5.2 3.11637 5.2 4.00002C5.2 4.88368 4.48366 5.60002 3.6 5.60002C2.71634 5.60002 2 4.88368 2 4.00002C2 3.11637 2.71634 2.40002 3.6 2.40002ZM6.12187 4C6.12187 3.64281 6 3.28 6 3.28H14V4.72L6 4.7144C6 4.7144 6.12187 4.3572 6.12187 4ZM10 7.28C10 7.28 9.87813 7.64281 9.87813 8C9.87813 8.3572 10 8.7144 10 8.7144L2 8.72001V7.28H10ZM12.4 6.40002C11.5163 6.40002 10.8 7.11637 10.8 8.00002C10.8 8.88368 11.5163 9.60002 12.4 9.60002C13.2837 9.60002 14 8.88368 14 8.00002C14 7.11637 13.2837 6.40002 12.4 6.40002ZM6 11.28C6 11.28 6.12187 11.6428 6.12187 12C6.12187 12.3572 6 12.7144 6 12.7144L14 12.72V11.28H6ZM3.6 10.4C4.48366 10.4 5.2 11.1164 5.2 12C5.2 12.8837 4.48366 13.6 3.6 13.6C2.71634 13.6 2 12.8837 2 12C2 11.1164 2.71634 10.4 3.6 10.4Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/group.svg b/app/client/src/assets/icons/control/group.svg
new file mode 100644
index 0000000000..03b7eea423
--- /dev/null
+++ b/app/client/src/assets/icons/control/group.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H1.4H2.54546V1.39814H1.4V2.54546H0V1.39814V0ZM3.81818 0H6.36364V1.39814H3.81818V0ZM1.4 3.81818H0V6.36364H1.4V3.81818ZM1.4 7.63636H0V10.1818H1.4V7.63636ZM12.6 3.81818H14V6.36364H12.6V3.81818ZM14 7.63636H12.6V10.1818H14V7.63636ZM7.63636 0H10.1818V1.39814H7.63636V0ZM6.36364 12.6H3.81818V14H6.36364V12.6ZM7.63636 12.6H10.1818V14H7.63636V12.6ZM0 14H1.4H2.54546V12.6H1.4V11.4546H0V12.6V14ZM12.6 0H14V1.39814V2.54546H12.6V1.39814H11.4546V0H12.6ZM14 14H12.6H11.4546V12.6H12.6V11.4546H14V12.6V14Z" fill="#4B4848"/>
+</svg>
diff --git a/app/client/src/assets/icons/control/line_dashed.svg b/app/client/src/assets/icons/control/line_dashed.svg
new file mode 100644
index 0000000000..34e76b522a
--- /dev/null
+++ b/app/client/src/assets/icons/control/line_dashed.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 6H10V9H6V6Z" fill="#939090"/>
+<path d="M13 6H15V9H13V6Z" fill="#939090"/>
+<path d="M1 6H3V9H1V6Z" fill="#939090"/>
+</svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/line_dotted.svg b/app/client/src/assets/icons/control/line_dotted.svg
new file mode 100644
index 0000000000..99693fd967
--- /dev/null
+++ b/app/client/src/assets/icons/control/line_dotted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#939090"><path d="M13 7.5a1 1 0 1 1 2 0v1a1 1 0 1 1-2 0v-1zm-12 0a1 1 0 1 1 2 0v1a1 1 0 1 1-2 0v-1zm8.5.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 1 1 3 0z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/control/open-new-tab.svg b/app/client/src/assets/icons/control/open-new-tab.svg
index 05d3815c3c..2cf241d021 100644
--- a/app/client/src/assets/icons/control/open-new-tab.svg
+++ b/app/client/src/assets/icons/control/open-new-tab.svg
@@ -1,11 +1 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path d="M13.3638 0H8.27286C7.92141 0 7.63649 0.284922 7.63649 0.636371C7.63649 0.98782 7.92141 1.27274 8.27286 1.27274H11.8275L5.27746 7.82277C5.02893 8.0713 5.02893 8.47418 5.27746 8.72271C5.40168 8.84696 5.56454 8.90909 5.7274 8.90909C5.89026 8.90909 6.05315 8.84699 6.1774 8.72268L12.7274 2.17268V5.72729C12.7274 6.07873 13.0124 6.36366 13.3638 6.36366C13.7152 6.36366 14.0002 6.07873 14.0002 5.72729V0.636371C14.0001 0.284922 13.7152 0 13.3638 0Z" fill="#457AE6"/>
-<path d="M10.8182 6.36357C10.4667 6.36357 10.1818 6.64849 10.1818 6.99994V12.7272H1.27271V3.81811H7C7.35145 3.81811 7.63637 3.53319 7.63637 3.18174C7.63637 2.83029 7.35145 2.54539 7 2.54539H0.636371C0.284922 2.54539 0 2.83032 0 3.18177V13.3636C0 13.715 0.284922 13.9999 0.636371 13.9999H10.8182C11.1696 13.9999 11.4546 13.715 11.4546 13.3636V6.99994C11.4545 6.64849 11.1696 6.36357 10.8182 6.36357Z" fill="#457AE6"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="14" height="14" fill="white"/>
-</clipPath>
-</defs>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 14 14"><g clip-path="url(#clip0)"><path fill="#457AE6" d="M13.3638 0H8.27286C7.92141 0 7.63649 0.284922 7.63649 0.636371C7.63649 0.98782 7.92141 1.27274 8.27286 1.27274H11.8275L5.27746 7.82277C5.02893 8.0713 5.02893 8.47418 5.27746 8.72271C5.40168 8.84696 5.56454 8.90909 5.7274 8.90909C5.89026 8.90909 6.05315 8.84699 6.1774 8.72268L12.7274 2.17268V5.72729C12.7274 6.07873 13.0124 6.36366 13.3638 6.36366C13.7152 6.36366 14.0002 6.07873 14.0002 5.72729V0.636371C14.0001 0.284922 13.7152 0 13.3638 0Z"/><path fill="#457AE6" d="M10.8182 6.36357C10.4667 6.36357 10.1818 6.64849 10.1818 6.99994V12.7272H1.27271V3.81811H7C7.35145 3.81811 7.63637 3.53319 7.63637 3.18174C7.63637 2.83029 7.35145 2.54539 7 2.54539H0.636371C0.284922 2.54539 0 2.83032 0 3.18177V13.3636C0 13.715 0.284922 13.9999 0.636371 13.9999H10.8182C11.1696 13.9999 11.4546 13.715 11.4546 13.3636V6.99994C11.4545 6.64849 11.1696 6.36357 10.8182 6.36357Z"/></g><defs><clipPath id="clip0"><rect width="14" height="14" fill="#fff"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/menu/binding.svg b/app/client/src/assets/icons/menu/binding.svg
new file mode 100644
index 0000000000..22692a0acd
--- /dev/null
+++ b/app/client/src/assets/icons/menu/binding.svg
@@ -0,0 +1,4 @@
+<svg width="9" height="12" viewBox="0 0 9 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.79102 11.1094H4.11328V10.2832H3.87891C3.05273 10.2832 2.71875 9.90234 2.71875 8.96484V7.07812C2.71875 6.23438 2.29688 5.79492 1.43555 5.70703V5.56641C2.29688 5.47852 2.71875 5.03906 2.71875 4.19531V2.32031C2.71875 1.38281 3.05273 1.00195 3.87891 1.00195H4.11328V0.175781H3.79102C2.4082 0.175781 1.75781 0.826172 1.75781 2.19141V3.83203C1.75781 4.76953 1.43555 5.08008 0.46875 5.08008V6.19336C1.43555 6.19336 1.75781 6.50391 1.75781 7.44141V9.09375C1.75781 10.459 2.4082 11.1094 3.79102 11.1094Z" fill="#4B4848"/>
+<path d="M8.13305 11.1094H8.45531V10.2832H8.22094C7.39477 10.2832 7.06078 9.90234 7.06078 8.96484V7.07812C7.06078 6.23438 6.63891 5.79492 5.77758 5.70703V5.56641C6.63891 5.47852 7.06078 5.03906 7.06078 4.19531V2.32031C7.06078 1.38281 7.39477 1.00195 8.22094 1.00195H8.45531V0.175781H8.13305C6.75023 0.175781 6.09984 0.826172 6.09984 2.19141V3.83203C6.09984 4.76953 5.77758 5.08008 4.81078 5.08008V6.19336C5.77758 6.19336 6.09984 6.50391 6.09984 7.44141V9.09375C6.09984 10.459 6.75023 11.1094 8.13305 11.1094Z" fill="#4B4848"/>
+</svg>
diff --git a/app/client/src/assets/icons/menu/new-plus.svg b/app/client/src/assets/icons/menu/new-plus.svg
new file mode 100644
index 0000000000..5016558969
--- /dev/null
+++ b/app/client/src/assets/icons/menu/new-plus.svg
@@ -0,0 +1,3 @@
+<svg width="13" height="12" viewBox="0 0 13 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.38281 11.8271C6.71777 11.8271 6.99805 11.5605 6.99805 11.2324V6.68652H11.4141C11.7422 6.68652 12.0225 6.40625 12.0225 6.07129C12.0225 5.73633 11.7422 5.46289 11.4141 5.46289H6.99805V0.910156C6.99805 0.582031 6.71777 0.31543 6.38281 0.31543C6.04785 0.31543 5.77441 0.582031 5.77441 0.910156V5.46289H1.35156C1.02344 5.46289 0.743164 5.73633 0.743164 6.07129C0.743164 6.40625 1.02344 6.68652 1.35156 6.68652H5.77441V11.2324C5.77441 11.5605 6.04785 11.8271 6.38281 11.8271Z" fill="#4B4848"/>
+</svg>
diff --git a/app/client/src/assets/icons/widget/divider.svg b/app/client/src/assets/icons/widget/divider.svg
new file mode 100644
index 0000000000..e3d413a99b
--- /dev/null
+++ b/app/client/src/assets/icons/widget/divider.svg
@@ -0,0 +1 @@
+<svg width="20" height="4" viewBox="0 0 20 4" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="20" height="3"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/widget/embed.svg b/app/client/src/assets/icons/widget/embed.svg
new file mode 100755
index 0000000000..f56a358be2
--- /dev/null
+++ b/app/client/src/assets/icons/widget/embed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path fill="#939090" fill-rule="evenodd" d="M18 2V7H16V4L4 4L4 7H2V2H18ZM2 18V13H4V16H16V13H18V18H2ZM13.5266 7.50323L14.0545 6.98584L16.4884 9.41972L17.0005 9.94231L16.4884 10.465L13.7483 13.2051L13.2257 12.6824L12.7031 12.1597L14.9205 9.94236L13.0092 8.03096L13.5266 7.50323ZM6.34593 13.2051L6.87383 12.6877L7.39122 12.16L5.47992 10.2486L7.69727 8.03122L7.17467 7.50852L6.65209 6.98582L3.91199 9.72591L3.39991 10.2486L3.91199 10.7712L6.34593 13.2051ZM13.0222 5.38513L11.6787 4.76855L7.36265 14.1733L8.70618 14.7899L13.0222 5.38513Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/widget/list.svg b/app/client/src/assets/icons/widget/list.svg
index 87348a0e9e..4e26df872f 100644
--- a/app/client/src/assets/icons/widget/list.svg
+++ b/app/client/src/assets/icons/widget/list.svg
@@ -1,3 +1 @@
-<svg width="24" height="20" viewBox="0 0 24 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.79999 11C9.46273 11 10 11.5372 10 12.2V18.8C10 19.4628 9.46273 20 8.79999 20H1.20001C0.53727 20 0 19.4628 0 18.8V12.2C0 11.5372 0.53727 11 1.20001 11H8.79999ZM20 16V19H12V16H20ZM6.24258 15.5072C6.22756 15.5186 6.21421 15.5321 6.20297 15.5472L4.85718 17.3627C4.7914 17.4514 4.66612 17.47 4.57739 17.4042C4.5678 17.3971 4.55889 17.3891 4.55072 17.3804L3.52838 16.2915C3.45278 16.211 3.32619 16.207 3.24567 16.2826C3.23763 16.2901 3.23023 16.2984 3.22354 16.3071L1.74039 18.2513C1.67339 18.3392 1.69026 18.4646 1.77808 18.5316C1.81293 18.5582 1.85555 18.5726 1.89938 18.5726H8.42206C8.53252 18.5726 8.62204 18.4831 8.62204 18.3727C8.62204 18.3289 8.60772 18.2864 8.58124 18.2516L6.52283 15.5453C6.45596 15.4574 6.3305 15.4403 6.24258 15.5072ZM24 11V14H12V11H24ZM8.79999 0C9.46273 0 10 0.537211 10 1.19995V7.80005C10 8.46279 9.46273 9 8.79999 9H1.20001C0.53727 9 0 8.46279 0 7.80005V1.19995C0 0.537211 0.53727 0 1.20001 0H8.79999ZM20 5V8H12V5H20ZM6.24258 4.5072C6.22756 4.51862 6.21421 4.53209 6.20297 4.54724L4.85718 6.36267C4.7914 6.4514 4.66612 6.46995 4.57739 6.40417C4.5678 6.39706 4.55889 6.38907 4.55072 6.38037L3.52838 5.2915C3.45278 5.21098 3.32619 5.20699 3.24567 5.28259C3.23763 5.29014 3.23023 5.29837 3.22354 5.30713L1.74039 7.25134C1.67339 7.33917 1.69026 7.46463 1.77808 7.53162C1.81293 7.55821 1.85555 7.57263 1.89938 7.57263H8.42206C8.53252 7.57263 8.62204 7.48314 8.62204 7.37268C8.62204 7.32894 8.60772 7.2864 8.58124 7.25159L6.52283 4.54529C6.45596 4.45737 6.3305 4.44033 6.24258 4.5072ZM24 0V3H12V0H24Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="20" fill="none" viewBox="0 0 24 20"><path fill="#fff" fill-rule="evenodd" d="M8.79999 11C9.46273 11 10 11.5372 10 12.2V18.8C10 19.4628 9.46273 20 8.79999 20H1.20001C0.53727 20 0 19.4628 0 18.8V12.2C0 11.5372 0.53727 11 1.20001 11H8.79999ZM20 16V19H12V16H20ZM6.24258 15.5072C6.22756 15.5186 6.21421 15.5321 6.20297 15.5472L4.85718 17.3627C4.7914 17.4514 4.66612 17.47 4.57739 17.4042C4.5678 17.3971 4.55889 17.3891 4.55072 17.3804L3.52838 16.2915C3.45278 16.211 3.32619 16.207 3.24567 16.2826C3.23763 16.2901 3.23023 16.2984 3.22354 16.3071L1.74039 18.2513C1.67339 18.3392 1.69026 18.4646 1.77808 18.5316C1.81293 18.5582 1.85555 18.5726 1.89938 18.5726H8.42206C8.53252 18.5726 8.62204 18.4831 8.62204 18.3727C8.62204 18.3289 8.60772 18.2864 8.58124 18.2516L6.52283 15.5453C6.45596 15.4574 6.3305 15.4403 6.24258 15.5072ZM24 11V14H12V11H24ZM8.79999 0C9.46273 0 10 0.537211 10 1.19995V7.80005C10 8.46279 9.46273 9 8.79999 9H1.20001C0.53727 9 0 8.46279 0 7.80005V1.19995C0 0.537211 0.53727 0 1.20001 0H8.79999ZM20 5V8H12V5H20ZM6.24258 4.5072C6.22756 4.51862 6.21421 4.53209 6.20297 4.54724L4.85718 6.36267C4.7914 6.4514 4.66612 6.46995 4.57739 6.40417C4.5678 6.39706 4.55889 6.38907 4.55072 6.38037L3.52838 5.2915C3.45278 5.21098 3.32619 5.20699 3.24567 5.28259C3.23763 5.29014 3.23023 5.29837 3.22354 5.30713L1.74039 7.25134C1.67339 7.33917 1.69026 7.46463 1.77808 7.53162C1.81293 7.55821 1.85555 7.57263 1.89938 7.57263H8.42206C8.53252 7.57263 8.62204 7.48314 8.62204 7.37268C8.62204 7.32894 8.60772 7.2864 8.58124 7.25159L6.52283 4.54529C6.45596 4.45737 6.3305 4.44033 6.24258 4.5072ZM24 0V3H12V0H24Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/widget/rating.svg b/app/client/src/assets/icons/widget/rating.svg
new file mode 100644
index 0000000000..4b3e80c619
--- /dev/null
+++ b/app/client/src/assets/icons/widget/rating.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.9545 4L14.2934 8.12197C14.4556 8.44862 14.8847 8.75905 15.2469 8.81139L20 9.75293L16.6923 13.2405C16.43 13.4949 16.2662 13.9968 16.3281 14.3559L16.8704 19.0588L12.5437 17.0908C12.2195 16.9211 11.6892 16.9211 11.3649 17.0908L7.03854 19.0572L7.58084 14.3543C7.64276 13.9952 7.47897 13.4929 7.21665 13.2388L4 9.75127L8.6621 8.80973C9.02462 8.75739 9.45373 8.44697 9.61552 8.12031L11.9545 4Z" fill="#EAEAEA"/>
+</svg>
\ No newline at end of file
diff --git a/app/client/src/assets/images/Curl-logo.svg b/app/client/src/assets/images/Curl-logo.svg
index 08f86ba19f..fa01f7bca6 100644
--- a/app/client/src/assets/images/Curl-logo.svg
+++ b/app/client/src/assets/images/Curl-logo.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="53" height="52" fill="none" viewBox="0 0 53 52"><path fill="#0C544C" d="M48.8083 14.9576C48.4317 14.9576 48.127 14.6581 48.127 14.2891C48.127 13.9196 48.4317 13.6207 48.8083 13.6207C49.1843 13.6207 49.4896 13.9196 49.4896 14.2891C49.4896 14.6581 49.1843 14.9576 48.8083 14.9576ZM42.0422 26.3782C41.6656 26.3782 41.3609 26.0787 41.3609 25.7098C41.3609 25.3403 41.6656 25.0413 42.0422 25.0413C42.4182 25.0413 42.7229 25.3403 42.7229 25.7098C42.7229 26.0787 42.4182 26.3782 42.0422 26.3782ZM48.8083 13.0654C48.1195 13.0654 47.5611 13.6133 47.5611 14.2891C47.5611 14.4333 47.5981 14.5675 47.6448 14.696L41.7938 24.535C41.2284 24.6513 40.7949 25.1203 40.7949 25.7098C40.7949 26.3856 41.3534 26.9335 42.0422 26.9335C42.7304 26.9335 43.2888 26.3856 43.2888 25.7098C43.2888 25.574 43.2518 25.4498 43.2105 25.3277L49.091 15.4565C49.6392 15.3276 50.0555 14.8665 50.0555 14.2891C50.0555 13.6133 49.4971 13.0654 48.8083 13.0654Z"/><path fill="#073551" d="M43.7068 14.9576C43.3302 14.9576 43.0255 14.6581 43.0255 14.2891C43.0255 13.9196 43.3302 13.6207 43.7068 13.6207C44.0828 13.6207 44.3875 13.9196 44.3875 14.2891C44.3875 14.6581 44.0828 14.9576 43.7068 14.9576ZM36.9401 26.3782C36.5641 26.3782 36.2588 26.0787 36.2588 25.7098C36.2588 25.3403 36.5641 25.0413 36.9401 25.0413C37.3167 25.0413 37.6214 25.3403 37.6214 25.7098C37.6214 26.0787 37.3167 26.3782 36.9401 26.3782ZM43.7068 13.0654C43.0175 13.0654 42.4596 13.6133 42.4596 14.2891C42.4596 14.4333 42.4966 14.5675 42.5432 14.696L36.6923 24.535C36.1263 24.6513 35.6929 25.1203 35.6929 25.7098C35.6929 26.3856 36.2513 26.9335 36.9401 26.9335C37.6289 26.9335 38.1873 26.3856 38.1873 25.7098C38.1873 25.574 38.1503 25.4498 38.109 25.3277L43.9895 15.4565C44.5377 15.3276 44.954 14.8665 44.954 14.2891C44.954 13.6133 44.395 13.0654 43.7068 13.0654Z"/><path fill="#073551" d="M34.3881 17.0034C34.7641 17.0034 35.0694 17.3029 35.0694 17.6718C35.0694 18.0408 34.7641 18.3402 34.3881 18.3402C34.0115 18.3402 33.7068 18.0408 33.7068 17.6718C33.7068 17.3029 34.0115 17.0034 34.3881 17.0034ZM34.3881 18.8955C35.0769 18.8955 35.6353 18.3476 35.6353 17.6718C35.6353 17.5366 35.5978 17.4118 35.5565 17.2897C35.3912 16.8039 34.9385 16.4481 34.3881 16.4481C34.3001 16.4481 34.2229 16.4802 34.1397 16.4976C33.5743 16.6134 33.1409 17.0823 33.1409 17.6718C33.1409 18.3476 33.6993 18.8955 34.3881 18.8955Z"/><path fill="#073551" d="M33.7068 21.9475C33.7068 21.578 34.012 21.279 34.3881 21.279C34.7641 21.279 35.0694 21.578 35.0694 21.9475C35.0694 22.3164 34.7641 22.6154 34.3881 22.6154C34.012 22.6154 33.7068 22.3164 33.7068 21.9475ZM35.6353 21.9475C35.6353 21.8117 35.5978 21.6874 35.5565 21.5653C35.3912 21.0795 34.939 20.7238 34.3881 20.7238C34.3001 20.7238 34.2229 20.7559 34.1397 20.7727C33.5743 20.889 33.1409 21.358 33.1409 21.9475C33.1409 22.6227 33.6993 23.1711 34.3881 23.1711C35.0769 23.1711 35.6353 22.6227 35.6353 21.9475Z"/><path fill="#073551" d="M2.94458 23.3204C2.94458 24.2762 3.12697 24.7456 3.88657 25.3604L5.05816 26.3183C5.8006 26.9162 6.1804 26.933 7.10523 26.933H9.61578C10.1436 26.933 10.7058 26.8193 10.7058 26.1562C10.7058 25.4741 10.0793 25.3772 9.61578 25.3772H6.82628C6.51085 25.3772 6.19757 25.2151 5.91647 24.9878L4.95946 24.1941C4.71055 24.0004 4.5303 23.8383 4.5303 23.5309V21.6025C4.5303 21.2951 4.71055 21.133 4.95946 20.9372L5.91647 20.1435C6.19757 19.9182 6.51085 19.7561 6.82628 19.7561H9.61578C10.0793 19.7561 10.7058 19.6572 10.7058 18.9772C10.7058 18.314 10.1436 18.2003 9.61578 18.2003H7.10523C6.1804 18.2003 5.8006 18.2172 5.05816 18.8151L3.88657 19.7709C3.12697 20.3877 2.94458 20.8572 2.94458 21.813V23.3204Z"/><path fill="#073551" d="M19.2927 19.2698C19.2927 18.7351 19.1769 18.2003 18.5009 18.2003C17.8229 18.2003 17.707 18.7351 17.707 19.2698V23.7898L15.3788 25.232C15.2308 25.3288 15.0656 25.3772 14.8832 25.3772H14.3553C13.9755 25.3772 13.5635 25.2804 13.4305 25.053C13.2974 24.8277 13.2824 24.4046 13.2653 24.0488L13.1 19.2698C13.0829 18.7666 13.0013 18.2003 12.3233 18.2003C11.598 18.2003 11.5143 18.8003 11.5315 19.3666L11.6967 24.2593C11.7289 25.1014 11.7139 25.7667 12.4241 26.3667C12.952 26.8025 13.4477 26.933 13.894 26.933H15.0656C15.4947 26.933 15.9239 26.7393 16.4367 26.4151L17.7242 25.5878V25.8467C17.7242 26.3814 17.84 26.933 18.516 26.933C19.3592 26.933 19.2927 26.1393 19.2927 25.7835V19.2698Z"/><path fill="#073551" d="M20.1194 25.8635C20.1194 26.3983 20.2353 26.933 20.9112 26.933C21.5892 26.933 21.7051 26.3983 21.7051 25.8635V21.9267L23.9174 20.1288C24.1985 19.9014 24.4131 19.7561 24.7092 19.7561H25.1727C25.5525 19.7561 25.9323 19.7561 26.1297 20.0319C26.2949 20.2572 26.2949 20.453 26.2949 20.7119C26.2949 21.213 26.5267 21.6677 27.1039 21.6677C27.7819 21.6677 27.8806 21.1161 27.8806 20.5814C27.8806 19.8698 27.6982 19.3351 27.1704 18.8151C26.7412 18.394 26.2305 18.2003 25.619 18.2003H24.3465C23.8509 18.2003 23.3895 18.5077 22.9432 18.8635L21.7051 19.8698V19.2361C21.7051 18.7182 21.5399 18.2003 20.9112 18.2003C20.1859 18.2003 20.1194 18.7835 20.1194 19.3498V25.8635Z"/><path fill="#073551" d="M30.7868 16.0781C30.7868 15.1539 30.5229 14.9918 29.6152 14.9918H27.948C27.418 14.9918 26.8579 15.1055 26.8579 15.7687C26.8579 16.4508 27.4845 16.5476 27.948 16.5476H29.2032V25.3772H27.948C27.418 25.3772 26.8579 25.4909 26.8579 26.1561C26.8579 26.8361 27.4845 26.933 27.948 26.933H31.9756C32.4391 26.933 33.0656 26.8361 33.0656 26.1561C33.0656 25.4909 32.5056 25.3772 31.9756 25.3772H30.7868V16.0781Z"/></svg>
\ No newline at end of file
+<svg width="22" height="19" viewBox="0 0 22 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.3784 2.50799C19.8883 2.50799 19.4923 2.11128 19.4923 1.6219C19.4923 1.13251 19.8883 0.7358 20.3784 0.7358C20.8686 0.7358 21.2645 1.13175 21.2645 1.6219C21.2639 1.85672 21.1704 2.08175 21.0043 2.24779C20.8383 2.41383 20.6133 2.50739 20.3784 2.50799ZM11.5795 17.6467C11.0894 17.6467 10.6934 17.25 10.6934 16.7606C10.6934 16.2712 11.0894 15.8745 11.5795 15.8745C12.0697 15.8745 12.4648 16.2704 12.4648 16.7606C12.4648 17.2507 12.0689 17.6467 11.5795 17.6467ZM20.3869 0.00134277C19.9568 0.00174832 19.5444 0.172776 19.2403 0.476888C18.9362 0.781 18.7652 1.19335 18.7648 1.62343C18.7648 1.81489 18.813 1.99257 18.8735 2.16259L11.2556 15.2036C10.5203 15.3568 9.95667 15.9794 9.95667 16.7606C9.95707 17.1907 10.1281 17.603 10.4322 17.9071C10.7363 18.2112 11.1487 18.3823 11.5787 18.3827C12.0087 18.3821 12.4208 18.2109 12.7248 17.9069C13.0287 17.6028 13.1997 17.1905 13.2001 16.7606C13.2001 16.5806 13.1518 16.416 13.0982 16.2551L20.7461 3.17122C21.4583 3.00044 22.0005 2.39005 22.0005 1.62419C22.0001 1.19411 21.8291 0.781766 21.525 0.477654C21.2209 0.173542 20.8085 0.00251448 20.3784 0.00210894" fill="#0C544C"/>
+<path d="M13.741 2.50741C13.2508 2.50741 12.8549 2.1107 12.8549 1.62132C12.8549 1.13194 13.2508 0.735222 13.741 0.735222C14.2311 0.735222 14.6263 1.13117 14.6263 1.62132C14.6263 2.11147 14.2304 2.50741 13.741 2.50741ZM4.93365 17.6453C4.69883 17.6447 4.4738 17.5512 4.30775 17.3851C4.14171 17.2191 4.04816 16.9941 4.04755 16.7592C4.04755 16.2691 4.44427 15.8731 4.93365 15.8731C5.42303 15.8731 5.81974 16.2691 5.81974 16.7592C5.81974 17.2494 5.4238 17.6453 4.93365 17.6453ZM13.741 0C13.3109 0.000405544 12.8986 0.171433 12.5945 0.475545C12.2903 0.779657 12.1193 1.19201 12.1189 1.62208C12.1189 1.81355 12.1672 1.99123 12.2277 2.16125L4.61888 15.2038C3.88366 15.357 3.31922 15.9796 3.31922 16.7608C3.31963 17.1909 3.49066 17.6032 3.79477 17.9073C4.09888 18.2114 4.51123 18.3825 4.9413 18.3829C5.37138 18.3825 5.78373 18.2114 6.08785 17.9073C6.39196 17.6032 6.56299 17.1909 6.56339 16.7608C6.56339 16.5808 6.51514 16.4161 6.46153 16.2553L14.1094 3.17141C14.8216 3.00063 15.3638 2.39024 15.3638 1.62438C15.3634 1.1943 15.1924 0.781954 14.8883 0.477842C14.5842 0.17373 14.1718 0.00270258 13.7418 0.00229704L13.741 0ZM1.62208 5.21931C1.8569 5.21992 2.08194 5.31347 2.24798 5.47951C2.41402 5.64556 2.50757 5.87059 2.50818 6.10541C2.50757 6.34023 2.41402 6.56526 2.24798 6.7313C2.08194 6.89735 1.8569 6.9909 1.62208 6.9915C1.13194 6.9915 0.73599 6.59479 0.73599 6.10541C0.73599 5.61603 1.13194 5.21931 1.62208 5.21931ZM1.62208 7.72749C2.05216 7.72709 2.46451 7.55606 2.76862 7.25195C3.07274 6.94784 3.24376 6.53549 3.24417 6.10541C3.24417 5.9262 3.19515 5.76077 3.14154 5.59994C2.9271 4.95662 2.33739 4.48409 1.62208 4.48409C1.50721 4.48409 1.40765 4.52698 1.29889 4.54995C0.563673 4.70312 0 5.325 0 6.10618C0.000405544 6.53625 0.171434 6.9486 0.475546 7.25271C0.779658 7.55683 1.192 7.72785 1.62208 7.72826V7.72749ZM0.73599 11.772C0.73599 11.2818 1.1327 10.8859 1.62208 10.8859C2.11147 10.8859 2.50818 11.2818 2.50818 11.772C2.50818 12.2621 2.11147 12.6573 1.62208 12.6573C1.1327 12.6573 0.73599 12.2614 0.73599 11.772ZM3.24417 11.772C3.24417 11.592 3.19515 11.4273 3.14154 11.2665C2.9271 10.6232 2.33893 10.1507 1.62208 10.1507C1.50721 10.1507 1.40765 10.1936 1.29889 10.2158C0.563673 10.3689 0 10.9916 0 11.7727C0.000405544 12.2028 0.171434 12.6152 0.475546 12.9193C0.779658 13.2234 1.192 13.3944 1.62208 13.3948C2.05216 13.3944 2.46451 13.2234 2.76862 12.9193C3.07274 12.6152 3.24376 12.2028 3.24417 11.7727" fill="#073551"/>
+</svg>
diff --git a/app/client/src/assets/images/InspectElement.svg b/app/client/src/assets/images/InspectElement.svg
new file mode 100644
index 0000000000..7c74deff90
--- /dev/null
+++ b/app/client/src/assets/images/InspectElement.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="121" height="125" fill="none" viewBox="0 0 121 125"><ellipse cx="59.57" cy="117.637" fill="#C5C5C5" fill-opacity=".6" rx="53.052" ry="6.409"/><circle cx="21.204" cy="34.021" r="3.204" stroke="#C5C5C5" stroke-width="1.78"/><circle cx="112.219" cy="91.602" r="2.027" stroke="#939090" stroke-width="1.158"/><path stroke="#939090" stroke-width="1.709" d="M79.8922 11.0464V18.8308"/><path stroke="#939090" stroke-width="1.709" d="M76 14.9385H83.7844"/><path stroke="#939090" stroke-width="2.136" d="M8.66328 84.0464V93.7769"/><path stroke="#939090" stroke-width="2.136" d="M3.79785 88.9118H13.5284"/><circle cx="50.001" cy="3.204" r="3.204" fill="#C5C5C5"/><path fill="#C5C5C5" fill-rule="evenodd" d="M35 34.0464C35 31.8372 36.7909 30.0464 39 30.0464H117C119.209 30.0464 121 31.8372 121 34.0464V55.0464C121 57.2555 119.209 59.0464 117 59.0464H39C36.7909 59.0464 35 57.2555 35 55.0464V34.0464Z" clip-rule="evenodd"/><circle cx="50" cy="44.046" r="9" fill="#E8E8E8"/><path stroke="#A9A7A7" stroke-width="2.502" d="M45.6006 43.6451L49.0763 47.0461L55.1865 40.2441"/><path fill="#A9A7A7" fill-rule="evenodd" d="M65 41.0464C65 39.9418 65.8954 39.0464 67 39.0464H92C93.1046 39.0464 94 39.9418 94 41.0464C94 42.151 93.1046 43.0464 92 43.0464H67C65.8954 43.0464 65 42.151 65 41.0464Z" clip-rule="evenodd"/><path fill="#A9A7A7" fill-rule="evenodd" d="M95 41.0464C95 39.9418 95.8954 39.0464 97 39.0464H109C110.105 39.0464 111 39.9418 111 41.0464C111 42.151 110.105 43.0464 109 43.0464H97C95.8954 43.0464 95 42.151 95 41.0464Z" clip-rule="evenodd"/><path fill="#A9A7A7" fill-rule="evenodd" d="M88 48.0464C88 46.9418 88.8954 46.0464 90 46.0464H99C100.105 46.0464 101 46.9418 101 48.0464C101 49.151 100.105 50.0464 99 50.0464H90C88.8954 50.0464 88 49.151 88 48.0464Z" clip-rule="evenodd"/><path fill="#C5C5C5" fill-rule="evenodd" d="M19 73.0464C19 70.8372 20.7909 69.0464 23 69.0464H92C94.2091 69.0464 96 70.8372 96 73.0464V94.0464C96 96.2555 94.2091 98.0464 92 98.0464H23C20.7909 98.0464 19 96.2555 19 94.0464V73.0464Z" clip-rule="evenodd"/><circle cx="34" cy="85.046" r="9" fill="#E8E8E8"/><path stroke="#A9A7A7" stroke-width="2.502" d="M29.6006 84.6451L33.0763 88.0461L39.1865 81.2441"/><path fill="#A9A7A7" fill-rule="evenodd" d="M49 82.0464C49 80.9418 49.8954 80.0464 51 80.0464H60C61.1046 80.0464 62 80.9418 62 82.0464C62 83.151 61.1046 84.0464 60 84.0464H51C49.8954 84.0464 49 83.151 49 82.0464Z" clip-rule="evenodd"/><path fill="#A9A7A7" fill-rule="evenodd" d="M63 82.0464C63 80.9418 63.8954 80.0464 65 80.0464H81C82.1046 80.0464 83 80.9418 83 82.0464C83 83.151 82.1046 84.0464 81 84.0464H65C63.8954 84.0464 63 83.151 63 82.0464Z" clip-rule="evenodd"/><path fill="#A9A7A7" fill-rule="evenodd" d="M68 89.0464C68 87.9418 67.1046 87.0464 66 87.0464H51C49.8954 87.0464 49 87.9418 49 89.0464C49 90.151 49.8954 91.0464 51 91.0464H66C67.1046 91.0464 68 90.151 68 89.0464Z" clip-rule="evenodd"/><rect width="86" height="30" y="47.046" fill="#F1F0EE" rx="4"/><circle cx="15" cy="62.046" r="9" fill="#C5C5C5"/><path stroke="#716E6E" stroke-width="3" d="M10.1123 60.0712L14.9998 64.5083L24.4993 53.9629"/><path fill="#918E8E" fill-rule="evenodd" d="M30 59.0464C30 57.9418 30.8954 57.0464 32 57.0464H43C44.1046 57.0464 45 57.9418 45 59.0464C45 60.151 44.1046 61.0464 43 61.0464H32C30.8954 61.0464 30 60.151 30 59.0464Z" clip-rule="evenodd"/><path fill="#918E8E" fill-rule="evenodd" d="M46 59.0464C46 57.9418 46.8954 57.0464 48 57.0464H74C75.1046 57.0464 76 57.9418 76 59.0464C76 60.151 75.1046 61.0464 74 61.0464H48C46.8954 61.0464 46 60.151 46 59.0464Z" clip-rule="evenodd"/><path fill="#C5C5C5" fill-rule="evenodd" d="M30 66.0464C30 64.9418 30.8954 64.0464 32 64.0464H50C51.1046 64.0464 52 64.9418 52 66.0464C52 67.151 51.1046 68.0464 50 68.0464H32C30.8954 68.0464 30 67.151 30 66.0464Z" clip-rule="evenodd"/><path fill="#C5C5C5" fill-rule="evenodd" d="M53 66.0464C53 64.9418 53.8954 64.0464 55 64.0464H64C65.1046 64.0464 66 64.9418 66 66.0464C66 67.151 65.1046 68.0464 64 68.0464H55C53.8954 68.0464 53 67.151 53 66.0464Z" clip-rule="evenodd"/><path fill="#716E6E" fill-rule="evenodd" d="M105.707 79.8053L89.4521 110.376L79.7396 105.211L95.9941 74.6411L105.707 79.8053Z" clip-rule="evenodd"/><path fill="#C5C5C5" fill-rule="evenodd" d="M86.3197 116.267L89.0288 111.172L79.3164 106.007L76.6073 111.102C74.9988 114.128 84.7112 119.292 86.3197 116.267Z" clip-rule="evenodd"/><path fill="#C5C5C5" fill-rule="evenodd" d="M96.6612 73.7703L107.195 65.4831L106.214 78.8499L96.6612 73.7703Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/images/Plus-logo.svg b/app/client/src/assets/images/Plus-logo.svg
new file mode 100644
index 0000000000..2116267a8f
--- /dev/null
+++ b/app/client/src/assets/images/Plus-logo.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 10.474V13.5261C20 13.7558 19.8138 13.9423 19.5838 13.9423H13.9423V19.5838C13.9423 19.8139 13.7558 20 13.5261 20H10.474C10.2444 20 10.0578 19.8138 10.0578 19.5838V13.9423H4.41619C4.18625 13.9423 4 13.7558 4 13.5261V10.474C4 10.2442 4.18625 10.0578 4.41619 10.0578H10.0578V4.41619C10.0578 4.18616 10.2443 4 10.474 4H13.5261C13.7558 4 13.9423 4.18616 13.9423 4.41619V10.0578H19.5838C19.8139 10.0578 20 10.2442 20 10.474Z" fill="black"/>
+</svg>
diff --git a/app/client/src/assets/images/comments-onboarding/step-1.png b/app/client/src/assets/images/comments-onboarding/step-1.png
new file mode 100644
index 0000000000..961bea1a83
Binary files /dev/null and b/app/client/src/assets/images/comments-onboarding/step-1.png differ
diff --git a/app/client/src/assets/images/comments-onboarding/step-2.png b/app/client/src/assets/images/comments-onboarding/step-2.png
new file mode 100644
index 0000000000..47bbf9a563
Binary files /dev/null and b/app/client/src/assets/images/comments-onboarding/step-2.png differ
diff --git a/app/client/src/assets/images/comments-onboarding/step-3.png b/app/client/src/assets/images/comments-onboarding/step-3.png
new file mode 100644
index 0000000000..3f1db4eea7
Binary files /dev/null and b/app/client/src/assets/images/comments-onboarding/step-3.png differ
diff --git a/app/client/src/assets/images/comments-onboarding/step-4.png b/app/client/src/assets/images/comments-onboarding/step-4.png
new file mode 100644
index 0000000000..6afb39482c
Binary files /dev/null and b/app/client/src/assets/images/comments-onboarding/step-4.png differ
diff --git a/app/client/src/assets/images/comments-onboarding/step-5.png b/app/client/src/assets/images/comments-onboarding/step-5.png
new file mode 100644
index 0000000000..3b14415efa
Binary files /dev/null and b/app/client/src/assets/images/comments-onboarding/step-5.png differ
diff --git a/app/client/src/assets/images/profile-placeholder.svg b/app/client/src/assets/images/profile-placeholder.svg
new file mode 100644
index 0000000000..b8ef8acc18
--- /dev/null
+++ b/app/client/src/assets/images/profile-placeholder.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="35" height="38" fill="none" viewBox="0 0 35 38"><path fill="#fff" fill-rule="evenodd" d="M17.2708 17.9773C22.2966 17.9773 26.3708 14.0089 26.3708 9.11364C26.3708 4.21838 22.2966 0.25 17.2708 0.25C12.245 0.25 8.17078 4.21838 8.17078 9.11364C8.17078 14.0089 12.245 17.9773 17.2708 17.9773ZM8.44971 20.8506C3.78306 20.8506 0 24.6337 0 29.3003C0 33.9669 3.78307 37.75 8.44971 37.75H26.5503C31.2169 37.75 35 33.9669 35 29.3003C35 24.6337 31.2169 20.8506 26.5503 20.8506H8.44971Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/lottie/pulse-dot.json b/app/client/src/assets/lottie/pulse-dot.json
new file mode 100644
index 0000000000..a4901959e1
--- /dev/null
+++ b/app/client/src/assets/lottie/pulse-dot.json
@@ -0,0 +1 @@
+{"v":"5.5.0","fr":29.9700012207031,"ip":0,"op":70.0000028511585,"w":250,"h":250,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":90,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[118.549,117.468,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,2.889]},"t":0,"s":[83.62,83.62,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,-0.549]},"t":27,"s":[105.62,105.62,100]},{"t":52.0000021180034,"s":[83.62,83.62,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[106.672,106.672],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9490196078431372,0.16862745098039217,0.16862745098039217,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[7.715,9.008],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":72.0000029326201,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"w1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"t":25.0000010182709,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[125.156,124.494,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[83.6,83.6,100]},{"t":25.0000010182709,"s":[234.048,234.048,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[69.508,69.508],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9490196078431372,0.16862745098039217,0.16862745098039217,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-0.187,0.605],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[139.443,139.443],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":70.0000028511585,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"w2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"t":30.0000012219251,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[125.326,124.285,0],"ix":2},"a":{"a":0,"k":[-44.248,-66.371,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[92.661,92.661,100]},{"t":30.0000012219251,"s":[229.892,229.892,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[86.801,86.801],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9490196078431372,0.16862745098039217,0.16862745098039217,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-44.6,-65.6],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":70.0000028511585,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/client/src/comments/AppComments/AppCommentThreads.tsx b/app/client/src/comments/AppComments/AppCommentThreads.tsx
index d15727fe6b..e3fc2d4036 100644
--- a/app/client/src/comments/AppComments/AppCommentThreads.tsx
+++ b/app/client/src/comments/AppComments/AppCommentThreads.tsx
@@ -1,14 +1,29 @@
 import React, { useMemo } from "react";
+import { useSelector } from "react-redux";
+import styled from "styled-components";
+
 import {
-  getSortedAppCommentThreadIds,
+  getSortedAndFilteredAppCommentThreadIds,
   applicationCommentsSelector,
   allCommentThreadsMap,
   getAppCommentThreads,
+  shouldShowResolved as shouldShowResolvedSelector,
+  appCommentsFilter as appCommentsFilterSelector,
 } from "selectors/commentsSelectors";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
-import { useSelector } from "react-redux";
 
 import CommentThread from "comments/CommentThread/connectedCommentThread";
+import AppCommentsPlaceholder from "./AppCommentsPlaceholder";
+import { getCurrentUser } from "selectors/usersSelectors";
+
+import { Virtuoso } from "react-virtuoso";
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  overflow: auto;
+`;
 
 function AppCommentThreads() {
   const applicationId = useSelector(getCurrentApplicationId) as string;
@@ -17,23 +32,53 @@ function AppCommentThreads() {
   );
   const appCommentThreadIds = getAppCommentThreads(appCommentThreadsByRefMap);
   const commentThreadsMap = useSelector(allCommentThreadsMap);
+  const shouldShowResolved = useSelector(shouldShowResolvedSelector);
+  const appCommentsFilter = useSelector(appCommentsFilterSelector);
+
+  const currentUser = useSelector(getCurrentUser);
+  const currentUsername = currentUser?.username;
 
   const commentThreadIds = useMemo(
-    () => getSortedAppCommentThreadIds(appCommentThreadIds, commentThreadsMap),
-    [appCommentThreadIds, commentThreadsMap],
+    () =>
+      getSortedAndFilteredAppCommentThreadIds(
+        appCommentThreadIds,
+        commentThreadsMap,
+        shouldShowResolved,
+        appCommentsFilter,
+        currentUsername,
+      ),
+    [
+      appCommentThreadIds,
+      commentThreadsMap,
+      shouldShowResolved,
+      appCommentsFilter,
+      currentUsername,
+    ],
   );
 
   return (
-    // eslint-disable-next-line react/jsx-no-useless-fragment
-    <>
-      {commentThreadIds?.map((commentThreadId: string) => (
-        <CommentThread
-          commentThreadId={commentThreadId}
-          hideInput
-          key={commentThreadId}
+    <Container>
+      {commentThreadIds.length > 0 && (
+        <Virtuoso
+          data={commentThreadIds}
+          itemContent={(_index, commentThreadId) => (
+            /** Keeping this as a fail safe: since zero
+             * height elements throw an error
+             * */
+            <div style={{ minHeight: 1 }}>
+              <CommentThread
+                commentThreadId={commentThreadId}
+                hideChildren
+                hideInput
+                key={commentThreadId}
+                showSubheader
+              />
+            </div>
+          )}
         />
-      ))}
-    </>
+      )}
+      {commentThreadIds.length === 0 && <AppCommentsPlaceholder />}
+    </Container>
   );
 }
 
diff --git a/app/client/src/comments/AppComments/AppComments.tsx b/app/client/src/comments/AppComments/AppComments.tsx
index 5791a54a62..c78e9df639 100644
--- a/app/client/src/comments/AppComments/AppComments.tsx
+++ b/app/client/src/comments/AppComments/AppComments.tsx
@@ -1,28 +1,19 @@
-import React, { useState } from "react";
+import React from "react";
 import { useSelector } from "react-redux";
 import { commentModeSelector } from "selectors/commentsSelectors";
 import AppCommentsHeader from "./AppCommentsHeader";
-import AppCommentThreads from "./AppCommentThreadsContainer";
+import AppCommentThreads from "./AppCommentThreads";
 import Container from "./Container";
-import { useCallback } from "react";
 
-function AppComments() {
-  const [isOpen, setIsOpen] = useState(false);
+function AppComments(props: { isInline?: boolean }) {
   const isCommentMode = useSelector(commentModeSelector);
-  const onClose = useCallback(() => {
-    setIsOpen(!isOpen);
-  }, [isOpen]);
 
   if (!isCommentMode) return null;
 
   return (
-    <Container>
-      <AppCommentsHeader
-        isOpen={isOpen}
-        onClose={onClose}
-        setIsOpen={setIsOpen}
-      />
-      <AppCommentThreads isOpen={isOpen} />
+    <Container isInline={props.isInline}>
+      <AppCommentsHeader />
+      <AppCommentThreads />
     </Container>
   );
 }
diff --git a/app/client/src/comments/AppComments/AppCommentsFilterPopover.tsx b/app/client/src/comments/AppComments/AppCommentsFilterPopover.tsx
new file mode 100644
index 0000000000..f3a4fe2466
--- /dev/null
+++ b/app/client/src/comments/AppComments/AppCommentsFilterPopover.tsx
@@ -0,0 +1,114 @@
+import React, { useEffect } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import styled, { withTheme } from "styled-components";
+import Icon, { IconSize } from "components/ads/Icon";
+import { Popover2 } from "@blueprintjs/popover2";
+import RadioGroup, { Radio } from "components/ads/Radio";
+import { Theme } from "constants/DefaultTheme";
+import Checkbox from "components/ads/Checkbox";
+
+import {
+  shouldShowResolved as shouldShowResolvedSelector,
+  appCommentsFilter as appCommentsFilterSelector,
+} from "selectors/commentsSelectors";
+import {
+  setShouldShowResolvedComments,
+  setAppCommentsFilter,
+} from "actions/commentActions";
+
+import "@blueprintjs/popover2/lib/css/blueprint-popover2.css";
+
+export const options = [
+  { label: "Show all comments", value: "show-all" },
+  { label: "Show only pinned", value: "show-only-pinned" },
+  { label: "Show only yours", value: "show-only-yours" },
+];
+
+const checkboxes = [
+  { label: "Show resolved comments", value: "show-resolved" },
+];
+
+const Container = styled.div`
+  width: 180px;
+  padding: ${(props) => props.theme.spaces[5]}px;
+  && ${Radio} {
+    margin-bottom: ${(props) => props.theme.spaces[6]}px;
+  }
+`;
+
+const Row = styled.div`
+  margin-bottom: ${(props) => props.theme.spaces[6]}px;
+  &:last-child {
+    margin-bottom: 0;
+  }
+`;
+
+const useSetResolvedFilterFromQuery = () => {
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    const url = new URL(window.location.href);
+    const searchParams = url.searchParams;
+    console.log(window.location.href, "window.location.href");
+    if (searchParams.get("isResolved")) {
+      dispatch(setShouldShowResolvedComments(true));
+    }
+  }, []);
+};
+
+const AppCommentsFilter = withTheme(({ theme }: { theme: Theme }) => {
+  const dispatch = useDispatch();
+  const shouldShowResolved = useSelector(shouldShowResolvedSelector);
+  const appCommentsFilter = useSelector(appCommentsFilterSelector);
+
+  return (
+    <Container>
+      <RadioGroup
+        backgroundColor={theme.colors.comments.commentsFilter}
+        defaultValue={appCommentsFilter}
+        onSelect={(value) => dispatch(setAppCommentsFilter(value))}
+        options={options}
+        rows={3}
+      />
+      {checkboxes.map(({ label }) => (
+        <Row key={label}>
+          <Checkbox
+            backgroundColor={theme.colors.comments.commentsFilter}
+            isDefaultChecked={shouldShowResolved}
+            label={label}
+            onCheckChange={(isChecked) =>
+              dispatch(setShouldShowResolvedComments(isChecked))
+            }
+          />
+        </Row>
+      ))}
+    </Container>
+  );
+});
+
+function AppCommentsFilterPopover() {
+  useSetResolvedFilterFromQuery();
+
+  return (
+    <Popover2
+      content={<AppCommentsFilter />}
+      modifiers={{
+        offset: {
+          enabled: true,
+          options: {
+            offset: [7, 10],
+          },
+        },
+        preventOverflow: {
+          enabled: true,
+        },
+      }}
+      placement={"bottom-end"}
+      portalClassName="comment-context-menu"
+    >
+      <Icon name="filter" size={IconSize.LARGE} />
+    </Popover2>
+  );
+}
+
+export default AppCommentsFilterPopover;
diff --git a/app/client/src/comments/AppComments/AppCommentsHeader.tsx b/app/client/src/comments/AppComments/AppCommentsHeader.tsx
index 5fb37c55a6..d6b12c76b6 100644
--- a/app/client/src/comments/AppComments/AppCommentsHeader.tsx
+++ b/app/client/src/comments/AppComments/AppCommentsHeader.tsx
@@ -1,49 +1,32 @@
-import React, { useCallback } from "react";
-import styled, { withTheme } from "styled-components";
-import { getTypographyByKey, Theme } from "constants/DefaultTheme";
+import React from "react";
+import styled from "styled-components";
+import { getTypographyByKey } from "constants/DefaultTheme";
 import { COMMENTS, createMessage } from "constants/messages";
-import Icon from "components/ads/Icon";
+
+import AppCommentsFilterPopover from "./AppCommentsFilterPopover";
 
 const AppCommentHeaderTitle = styled.div`
   color: ${(props) => props.theme.colors.comments.appCommentsHeaderTitle};
-  ${(props) => getTypographyByKey(props, "h2")}
+  ${(props) => getTypographyByKey(props, "h5")}
 `;
 
-const Header = styled.div<{ isOpen: boolean }>`
+const Header = styled.div`
   display: flex;
-  padding: ${(props) =>
-    `${props.theme.spaces[6]}px ${props.theme.spaces[8]}px`};
+  padding: ${(props) => props.theme.spaces[6]}px;
   width: 100%;
   justify-content: space-between;
-  cursor: ${(props) => (!props.isOpen ? "pointer" : "auto")};
+  align-items: center;
+  border-bottom: 1px solid
+    ${(props) => props.theme.colors.comments.appCommentsHeaderBorder};
 `;
 
-type Props = {
-  isOpen: boolean;
-  setIsOpen: (isOpen: boolean) => void;
-  onClose: () => void;
-  theme: Theme;
-};
-
-const AppCommentsHeader = withTheme(
-  ({ onClose, isOpen, setIsOpen, theme }: Props) => {
-    const showCommentThreads = useCallback(() => {
-      if (!isOpen) setIsOpen(true);
-    }, [isOpen]);
-
-    return (
-      <Header isOpen={isOpen} onClick={showCommentThreads}>
-        <AppCommentHeaderTitle>{createMessage(COMMENTS)}</AppCommentHeaderTitle>
-        {isOpen && (
-          <Icon
-            fillColor={theme.colors.comments.appCommentsClose}
-            name="close-x"
-            onClick={onClose}
-          />
-        )}
-      </Header>
-    );
-  },
-);
+function AppCommentsHeader() {
+  return (
+    <Header>
+      <AppCommentHeaderTitle>{createMessage(COMMENTS)}</AppCommentHeaderTitle>
+      <AppCommentsFilterPopover />
+    </Header>
+  );
+}
 
 export default AppCommentsHeader;
diff --git a/app/client/src/comments/AppComments/AppCommentsPlaceholder.tsx b/app/client/src/comments/AppComments/AppCommentsPlaceholder.tsx
new file mode 100644
index 0000000000..589dec8247
--- /dev/null
+++ b/app/client/src/comments/AppComments/AppCommentsPlaceholder.tsx
@@ -0,0 +1,34 @@
+import React from "react";
+import styled from "styled-components";
+import {
+  NO_COMMENTS_CLICK_ON_CANVAS_TO_ADD,
+  createMessage,
+} from "constants/messages";
+import Icon, { IconSize } from "components/ads/Icon";
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  align-items: center;
+  justify-content: center;
+  white-space: pre-line;
+  & .message {
+    text-align: center;
+  }
+  color: ${(props) => props.theme.colors.comments.appCommentsPlaceholderText};
+`;
+
+function AppCommentsPlaceholder() {
+  return (
+    <Container>
+      <Icon keepColors name="chat" size={IconSize.XXL} />
+      <span className="message">
+        {createMessage(NO_COMMENTS_CLICK_ON_CANVAS_TO_ADD)}
+      </span>
+    </Container>
+  );
+}
+
+export default AppCommentsPlaceholder;
diff --git a/app/client/src/comments/AppComments/Container.tsx b/app/client/src/comments/AppComments/Container.tsx
index 22b0b75bae..396f221d86 100644
--- a/app/client/src/comments/AppComments/Container.tsx
+++ b/app/client/src/comments/AppComments/Container.tsx
@@ -1,13 +1,24 @@
 import styled from "styled-components";
 import { Colors } from "constants/Colors";
+import { Layers } from "constants/Layers";
 
-const Container = styled.div`
+const Container = styled.div<{ isInline?: boolean }>`
   background: ${Colors.WHITE};
-  width: 280px;
-  position: fixed;
-  right: 30px;
-  bottom: 0;
-  z-index: 11;
+  width: 250px;
+  ${(props) =>
+    !props.isInline
+      ? `
+    position: fixed;
+    left: 0;
+    top: ${props.theme.smallHeaderHeight};
+    height: calc(100% - ${props.theme.smallHeaderHeight});
+  `
+      : `
+    position: relative;
+  `}
+  z-index: ${Layers.appComments};
+  display: flex;
+  flex-direction: column;
 `;
 
 export default Container;
diff --git a/app/client/src/comments/CommentCard/CommentCard.tsx b/app/client/src/comments/CommentCard/CommentCard.tsx
index ed09cb9ccd..876330e3b6 100644
--- a/app/client/src/comments/CommentCard/CommentCard.tsx
+++ b/app/client/src/comments/CommentCard/CommentCard.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import Editor from "@draft-js-plugins/editor";
 import {
   CompositeDecorator,
@@ -8,54 +8,71 @@ import {
   RawDraftContentState,
 } from "draft-js";
 import styled from "styled-components";
-import ProfileImage from "pages/common/ProfileImage";
-import { Comment } from "entities/Comments/CommentsInterfaces";
+import ProfileImage, { Profile } from "pages/common/ProfileImage";
+import { Comment, Reaction } from "entities/Comments/CommentsInterfaces";
 import { getTypographyByKey } from "constants/DefaultTheme";
 import CommentContextMenu from "./CommentContextMenu";
 import ResolveCommentButton from "comments/CommentCard/ResolveCommentButton";
+import { MentionComponent } from "components/ads/MentionsInput";
+import Icon, { IconSize } from "components/ads/Icon";
+import EmojiReactions, {
+  Reaction as ComponentReaction,
+  Reactions,
+  ReactionOperation,
+} from "components/ads/EmojiReactions";
+import { Toaster } from "components/ads/Toast";
+import AddCommentInput from "comments/inlineComments/AddCommentInput";
 
 import createMentionPlugin from "@draft-js-plugins/mention";
 import { flattenDeep, noop } from "lodash";
 import copy from "copy-to-clipboard";
+import moment from "moment";
+import history from "utils/history";
+
+import { getAppMode } from "selectors/applicationSelectors";
+
+import { USER_PHOTO_URL } from "constants/userConstants";
+
+import { getCommentThreadURL } from "../utils";
 
 import {
   deleteCommentRequest,
+  markThreadAsReadRequest,
   pinCommentThreadRequest,
+  editCommentRequest,
+  deleteCommentThreadRequest,
+  addCommentReaction,
+  removeCommentReaction,
 } from "actions/commentActions";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
+import { commentThreadsSelector } from "selectors/commentsSelectors";
+import { getCurrentUser } from "selectors/usersSelectors";
+import { createMessage, LINK_COPIED_SUCCESSFULLY } from "constants/messages";
+import { Variant } from "components/ads/common";
+import TourTooltipWrapper from "components/ads/tour/TourTooltipWrapper";
+import { TourType } from "entities/Tour";
+import { getCurrentApplicationId } from "selectors/editorSelectors";
 
 const StyledContainer = styled.div`
   width: 100%;
   padding: ${(props) =>
-    `${props.theme.spaces[5]}px ${props.theme.spaces[7]}px`};
+    `${props.theme.spaces[6]}px ${props.theme.spaces[5]}px`};
   border-radius: 0;
+  &:hover {
+    background-color: ${(props) =>
+      props.theme.colors.comments.cardHoverBackground};
+  }
 `;
 
-const Separator = styled.div`
-  background-color: ${(props) =>
-    props.theme.colors.comments.childCommentsIndent};
-  height: 1px;
-  width: calc(100% - ${(props) => props.theme.spaces[7] * 2}px);
-  margin-left: ${(props) => props.theme.spaces[7]}px;
-`;
-
-// ${(props) => getTypographyByKey(props, "p1")};
-// line-height: 24px;
-// color: ${(props) => props.theme.colors.comments.commentBody};
-// margin-top: ${(props) => props.theme.spaces[3]}px;
-
 const CommentBodyContainer = styled.div`
-  background-color: ${(props) => props.theme.colors.comments.commentBackground};
-  border-radius: ${(props) => props.theme.spaces[3]}px;
-  padding: ${(props) =>
-    `${props.theme.spaces[4]}px ${props.theme.spaces[5]}px`};
+  padding-bottom: ${(props) => props.theme.spaces[4]}px;
 `;
 
 const CommentHeader = styled.div`
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding-bottom: ${(props) => props.theme.spaces[5]}px;
+  padding-bottom: ${(props) => props.theme.spaces[4]}px;
 `;
 
 const UserName = styled.span`
@@ -64,105 +81,409 @@ const UserName = styled.span`
   margin-left: ${(props) => props.theme.spaces[4]}px;
   display: flex;
   align-items: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2; /* number of lines to show */
+  -webkit-box-orient: vertical;
 `;
 
 const HeaderSection = styled.div`
   display: flex;
   align-items: center;
+
+  & ${Profile} {
+    flex-shrink: 0;
+  }
 `;
 
-const mentionPlugin = createMentionPlugin();
+const CommentTime = styled.div`
+  color: ${(props) => props.theme.colors.comments.commentTime};
+  ${(props) => getTypographyByKey(props, "p3")}
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: ${(props) => props.theme.spaces[4]}px;
+`;
+
+const CommentSubheader = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: ${(props) => props.theme.spaces[4]}px;
+  white-space: nowrap;
+
+  ${(props) => getTypographyByKey(props, "p3")}
+
+  color: ${(props) => props.theme.colors.comments.pinnedByText};
+
+  & .thread-id {
+    flex-shrink: 0;
+    max-width: 50px;
+  }
+
+  & .pin {
+    margin: 0 ${(props) => props.theme.spaces[3]}px;
+  }
+
+  strong {
+    white-space: pre;
+    margin-left: ${(props) => props.theme.spaces[0]}px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+`;
+
+const CommentThreadId = styled.div`
+  color: ${(props) => props.theme.colors.comments.commentTime};
+  ${(props) => getTypographyByKey(props, "p3")}
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
+const Section = styled.div`
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
+const UnreadIndicator = styled.div`
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  background-color: ${(props) =>
+    props.theme.colors.comments.unreadIndicatorCommentCard};
+  margin-right: ${(props) => props.theme.spaces[2]}px;
+  flex-shrink: 0;
+`;
+
+const ReactionsRow = styled.div`
+  display: flex;
+`;
+
+const EmojiReactionsBtnContainer = styled.div``;
+
+const mentionPlugin = createMentionPlugin({
+  mentionComponent: MentionComponent,
+});
 const plugins = [mentionPlugin];
 const decorators = flattenDeep(plugins.map((plugin) => plugin.decorators));
 const decorator = new CompositeDecorator(
   decorators.filter((_decorator, index) => index !== 1) as DraftDecorator[],
 );
 
-const useSelectCommentUsingQuery = (commentId: string) => {
-  useEffect(() => {
-    const searchParams = new URL(window.location.href).searchParams;
-    const commentIdInUrl = searchParams.get("commentId");
-    if (commentIdInUrl && commentIdInUrl === commentId) {
-      const commentCard = document.getElementById(`comment-card-${commentId}`);
-      commentCard?.scrollIntoView();
-    }
-  }, []);
+function StopClickPropagation({ children }: { children: React.ReactNode }) {
+  return (
+    <div
+      // flex to unset height, so that align-items works as expected
+      onClick={(e: React.MouseEvent) => e.stopPropagation()}
+      style={{ display: "flex" }}
+    >
+      {children}
+    </div>
+  );
+}
+
+const replyText = (replies?: number) => {
+  if (!replies) return "";
+  return replies > 1 ? `${replies} Replies` : `1 Reply`;
 };
 
+enum CommentCardModes {
+  EDIT = "EDIT",
+  VIEW = "VIEW",
+}
+
+const reduceReactions = (
+  reactions: Array<Reaction> | undefined,
+  username?: string,
+) => {
+  return (
+    (Array.isArray(reactions) &&
+      reactions.reduce(
+        (res: Record<string, ComponentReaction>, reaction: Reaction) => {
+          const { byUsername, emoji } = reaction;
+          const sameAsCurrent = byUsername === username;
+          if (res[reaction.emoji]) {
+            res[reaction.emoji].count++;
+            if (!sameAsCurrent) {
+              res[reaction.emoji].users = [
+                ...(res[reaction.emoji].users || []),
+                byUsername,
+              ];
+            }
+          } else {
+            const users = !sameAsCurrent ? [byUsername] : [];
+            res[emoji] = {
+              count: 1,
+              reactionEmoji: emoji,
+              users,
+            } as ComponentReaction;
+          }
+
+          if (sameAsCurrent) {
+            res[reaction.emoji].active = true;
+          }
+
+          return res;
+        },
+        {},
+      )) ||
+    undefined
+  );
+};
+
+const ResolveButtonContainer = styled.div`
+  margin-left: ${(props) => props.theme.spaces[2]}px;
+`;
+
 function CommentCard({
   comment,
-  isParentComment,
-  toggleResolved,
-  resolved,
   commentThreadId,
+  inline,
+  isParentComment,
+  numberOfReplies,
+  resolved,
+  showReplies,
+  showSubheader,
+  toggleResolved,
+  unread = true,
+  visible,
 }: {
   comment: Comment;
+  isEditMode?: boolean;
   isParentComment?: boolean;
   resolved?: boolean;
   toggleResolved?: () => void;
   commentThreadId: string;
+  numberOfReplies?: number;
+  showReplies?: boolean;
+  showSubheader?: boolean;
+  unread?: boolean;
+  inline?: boolean;
+  visible?: boolean;
 }) {
+  const [isHovered, setIsHovered] = useState(false);
+  const [cardMode, setCardMode] = useState(CommentCardModes.VIEW);
   const dispatch = useDispatch();
-  const { authorName, body, id: commentId } = comment;
+  const { authorName, authorUsername, body, id: commentId } = comment;
   const contentState = convertFromRaw(body as RawDraftContentState);
   const editorState = EditorState.createWithContent(contentState, decorator);
+  const commentThread = useSelector(commentThreadsSelector(commentThreadId));
+  const [reactions, setReactions] = useState<Reactions>();
+  const currentUser = useSelector(getCurrentUser);
+  const currentUserUsername = currentUser?.username;
 
-  const copyCommentLink = useCallback(() => {
-    const url = new URL(window.location.href);
-    url.searchParams.set("commentId", commentId);
-    url.searchParams.set("commentThreadId", commentThreadId);
-    url.searchParams.set("isCommentMode", "true");
-    copy(url.toString());
-  }, []);
+  const isPinned = commentThread.pinnedState?.active;
+  const pinnedByUsername = commentThread.pinnedState?.authorUsername;
+  let pinnedBy = commentThread.pinnedState?.authorName;
+
+  const appMode = useSelector(getAppMode);
+
+  if (currentUserUsername === pinnedByUsername) {
+    pinnedBy = "You";
+  }
+
+  const applicationId = useSelector(getCurrentApplicationId);
+
+  const commentThreadURL = getCommentThreadURL({
+    applicationId,
+    commentThreadId,
+    isResolved: !!commentThread?.resolvedState?.active,
+    pageId: commentThread?.pageId,
+    mode: appMode,
+  });
+
+  const copyCommentLink = () => {
+    copy(commentThreadURL.toString());
+    Toaster.show({
+      text: createMessage(LINK_COPIED_SUCCESSFULLY),
+      variant: Variant.success,
+    });
+  };
 
   const pin = useCallback(() => {
-    dispatch(pinCommentThreadRequest({ threadId: commentThreadId }));
-  }, []);
+    dispatch(
+      pinCommentThreadRequest({ threadId: commentThreadId, pin: !isPinned }),
+    );
+  }, [isPinned]);
 
   const deleteComment = useCallback(() => {
     dispatch(deleteCommentRequest({ threadId: commentThreadId, commentId }));
   }, []);
 
+  const deleteThread = () => {
+    dispatch(deleteCommentThreadRequest(commentThreadId));
+  };
+
+  const isCreatedByMe = currentUserUsername === comment.authorUsername;
+
+  const switchToEditCommentMode = () => setCardMode(CommentCardModes.EDIT);
+  const switchToViewCommentMode = () => setCardMode(CommentCardModes.VIEW);
+
+  const onSaveComment = (body: RawDraftContentState) => {
+    dispatch(editCommentRequest({ commentId, commentThreadId, body }));
+    setCardMode(CommentCardModes.VIEW);
+  };
+
   const contextMenuProps = {
+    switchToEditCommentMode,
     pin,
     copyCommentLink,
     deleteComment,
+    deleteThread,
+    isParentComment,
+    isCreatedByMe,
+    isPinned,
   };
 
-  useSelectCommentUsingQuery(comment.id);
+  // TODO enable when comments links are enabled
+  // useSelectCommentUsingQuery(comment.id);
+
+  // Dont make inline cards clickable
+  const handleCardClick = () => {
+    if (inline) return;
+    history.push(
+      `${commentThreadURL.pathname}${commentThreadURL.search}${commentThreadURL.hash}`,
+    );
+    if (!commentThread.isViewed) {
+      dispatch(markThreadAsReadRequest(commentThreadId));
+    }
+  };
+
+  useEffect(() => {
+    setReactions(reduceReactions(comment.reactions, currentUserUsername));
+  }, [comment.reactions]);
+
+  const handleReaction = (
+    _event: React.MouseEvent,
+    emojiData: string,
+    updatedReactions: Reactions,
+    addOrRemove: ReactionOperation,
+  ) => {
+    setReactions(updatedReactions);
+    if (addOrRemove == ReactionOperation.ADD) {
+      dispatch(addCommentReaction({ emoji: emojiData, commentId }));
+    } else {
+      dispatch(removeCommentReaction({ emoji: emojiData, commentId }));
+    }
+  };
+
+  const showOptions = visible || isHovered;
+
+  const showResolveBtn =
+    (showOptions || !!resolved) && isParentComment && toggleResolved;
+
+  const hasReactions = !!reactions && Object.keys(reactions).length > 0;
 
   return (
-    <>
-      <StyledContainer
-        data-cy={`t--comment-card-${comment.id}`}
-        id={`comment-card-${comment.id}`}
-      >
-        <CommentHeader>
-          <HeaderSection>
-            <ProfileImage side={30} userName={authorName || ""} />
-            <UserName>{authorName}</UserName>
-          </HeaderSection>
-          <HeaderSection>
-            {isParentComment && toggleResolved && (
-              <ResolveCommentButton
-                handleClick={toggleResolved}
-                resolved={!!resolved}
-              />
+    <StyledContainer
+      data-cy={`t--comment-card-${comment.id}`}
+      onClick={handleCardClick}
+      onMouseLeave={() => setIsHovered(false)}
+      onMouseOver={() => setIsHovered(true)}
+    >
+      {showSubheader && (
+        <CommentSubheader>
+          <Section className="thread-id">
+            {unread && <UnreadIndicator />}
+            <CommentThreadId>{commentThread.sequenceId}</CommentThreadId>
+          </Section>
+          <Section className="pinned-by" onClick={pin}>
+            {isPinned && (
+              <>
+                <Icon className="pin" name="pin-3" />
+                <span>Pinned By</span>
+                <strong>{` ${pinnedBy}`}</strong>
+              </>
             )}
-            <CommentContextMenu {...contextMenuProps} />
-          </HeaderSection>
-        </CommentHeader>
-        <CommentBodyContainer>
+          </Section>
+        </CommentSubheader>
+      )}
+      <CommentHeader>
+        <HeaderSection>
+          <ProfileImage
+            side={25}
+            source={`/api/${USER_PHOTO_URL}/${authorUsername}`}
+            userName={authorName || ""}
+          />
+          <UserName>{authorName}</UserName>
+        </HeaderSection>
+        <HeaderSection>
+          {showOptions && (
+            <StopClickPropagation>
+              <EmojiReactionsBtnContainer>
+                <EmojiReactions
+                  hideReactions
+                  iconSize={IconSize.XXL}
+                  onSelectReaction={handleReaction}
+                  reactions={reactions}
+                />
+              </EmojiReactionsBtnContainer>
+            </StopClickPropagation>
+          )}
+          {showResolveBtn && (
+            <StopClickPropagation>
+              <ResolveButtonContainer>
+                {inline ? (
+                  <TourTooltipWrapper
+                    tourIndex={2}
+                    tourType={TourType.COMMENTS_TOUR}
+                  >
+                    <ResolveCommentButton
+                      handleClick={toggleResolved as () => void}
+                      resolved={!!resolved}
+                    />
+                  </TourTooltipWrapper>
+                ) : (
+                  <ResolveCommentButton
+                    handleClick={toggleResolved as () => void}
+                    resolved={!!resolved}
+                  />
+                )}
+              </ResolveButtonContainer>
+            </StopClickPropagation>
+          )}
+          {showOptions && (
+            <StopClickPropagation>
+              <CommentContextMenu {...contextMenuProps} />
+            </StopClickPropagation>
+          )}
+        </HeaderSection>
+      </CommentHeader>
+      <CommentBodyContainer>
+        {cardMode === CommentCardModes.EDIT ? (
+          <AddCommentInput
+            initialEditorState={editorState}
+            onCancel={switchToViewCommentMode}
+            onSave={onSaveComment}
+            removePadding
+          />
+        ) : (
           <Editor
             editorState={editorState}
             onChange={noop}
             plugins={plugins}
             readOnly
           />
-        </CommentBodyContainer>
-      </StyledContainer>
-      {!isParentComment && <Separator />}
-    </>
+        )}
+      </CommentBodyContainer>
+      <CommentTime>
+        <span>{moment(comment.creationTime).fromNow()}</span>
+        <span>{showReplies && replyText(numberOfReplies)}</span>
+      </CommentTime>
+      {hasReactions && (
+        <ReactionsRow>
+          <StopClickPropagation>
+            <EmojiReactions
+              iconSize={IconSize.LARGE}
+              onSelectReaction={handleReaction}
+              reactions={reactions}
+            />
+          </StopClickPropagation>
+        </ReactionsRow>
+      )}
+    </StyledContainer>
   );
 }
 
diff --git a/app/client/src/comments/CommentCard/CommentContextMenu.tsx b/app/client/src/comments/CommentCard/CommentContextMenu.tsx
index bef783b01c..17cd05dc5d 100644
--- a/app/client/src/comments/CommentCard/CommentContextMenu.tsx
+++ b/app/client/src/comments/CommentCard/CommentContextMenu.tsx
@@ -5,7 +5,10 @@ import {
   PIN_COMMENT,
   COPY_LINK,
   DELETE_COMMENT,
+  DELETE_THREAD,
+  UNPIN_COMMENT,
   createMessage,
+  EDIT_COMMENT,
 } from "constants/messages";
 import { noop } from "lodash";
 
@@ -14,9 +17,7 @@ import "@blueprintjs/popover2/lib/css/blueprint-popover2.css";
 import { Popover2 } from "@blueprintjs/popover2";
 
 // render over popover portals
-const Container = styled.div`
-  z-index: 11;
-`;
+const Container = styled.div``;
 
 const MenuItem = styled.div`
   display: flex;
@@ -29,14 +30,7 @@ const MenuItem = styled.div`
 `;
 
 const StyledIcon = styled(Icon)`
-  && path {
-    stroke: ${(props) => props.theme.colors.comments.contextMenuIcon};
-    fill: ${(props) => props.theme.colors.comments.contextMenuIcon};
-  }
-  ${MenuItem}:hover & path {
-    stroke: ${(props) =>
-      props.theme.colors.comments.contextMenuIconStrokeHover};
-  }
+  margin-left: ${(props) => props.theme.spaces[2]}px;
 `;
 
 const MenuIcon = styled.div`
@@ -56,31 +50,68 @@ type Props = {
   pin: typeof noop;
   copyCommentLink: typeof noop;
   deleteComment: typeof noop;
+  deleteThread: typeof noop;
+  switchToEditCommentMode: typeof noop;
+  isParentComment?: boolean;
+  isCreatedByMe?: boolean;
+  isPinned?: boolean;
 };
 
-function CommentContextMenu({ pin, copyCommentLink, deleteComment }: Props) {
+function CommentContextMenu({
+  copyCommentLink,
+  deleteComment,
+  deleteThread,
+  isCreatedByMe,
+  isParentComment,
+  isPinned,
+  pin,
+  switchToEditCommentMode,
+}: Props) {
   const [isOpen, setIsOpen] = useState(false);
 
-  const options = useMemo(
-    () => [
-      {
-        icon: "pin-2",
-        display: createMessage(PIN_COMMENT),
-        onClick: pin,
-      },
-      {
-        icon: "link-2",
-        display: createMessage(COPY_LINK),
-        onClick: copyCommentLink,
-      },
-      {
-        icon: "trash",
-        display: createMessage(DELETE_COMMENT),
-        onClick: deleteComment,
-      },
-    ],
-    [],
-  );
+  const options = useMemo(() => {
+    const options = [];
+    if (isParentComment) {
+      options.push(
+        {
+          icon: isPinned ? "unpin" : "pin-3",
+          display: isPinned
+            ? createMessage(UNPIN_COMMENT)
+            : createMessage(PIN_COMMENT),
+          onClick: pin,
+        },
+        {
+          icon: "link-2",
+          display: createMessage(COPY_LINK),
+          onClick: copyCommentLink,
+        },
+      );
+    }
+
+    if (isCreatedByMe) {
+      if (!isParentComment) {
+        options.push({
+          icon: "trash",
+          display: createMessage(DELETE_COMMENT),
+          onClick: deleteComment,
+        });
+      } else {
+        options.push({
+          icon: "trash",
+          display: createMessage(DELETE_THREAD),
+          onClick: deleteThread,
+        });
+      }
+
+      options.push({
+        icon: "edit",
+        display: createMessage(EDIT_COMMENT),
+        onClick: switchToEditCommentMode,
+      });
+    }
+
+    return options;
+  }, [isPinned]);
 
   const handleInteraction = useCallback((isOpen) => {
     setIsOpen(isOpen);
@@ -91,6 +122,8 @@ function CommentContextMenu({ pin, copyCommentLink, deleteComment }: Props) {
     option.onClick();
   }, []);
 
+  if (!options.length) return null;
+
   return (
     <Popover2
       content={
@@ -98,7 +131,11 @@ function CommentContextMenu({ pin, copyCommentLink, deleteComment }: Props) {
           {options.map((option) => (
             <MenuItem key={option.icon} onClick={() => handleClick(option)}>
               <MenuIcon>
-                <StyledIcon name={option.icon as IconName} size={IconSize.XL} />
+                <Icon
+                  keepColors
+                  name={option.icon as IconName}
+                  size={IconSize.XL}
+                />
               </MenuIcon>
               <MenuTitle>{option.display}</MenuTitle>
             </MenuItem>
@@ -107,11 +144,12 @@ function CommentContextMenu({ pin, copyCommentLink, deleteComment }: Props) {
       }
       isOpen={isOpen}
       minimal
+      modifiers={{ offset: { enabled: true, options: { offset: [7, 15] } } }}
       onInteraction={handleInteraction}
       placement={"bottom-end"}
       portalClassName="comment-context-menu"
     >
-      <StyledIcon name="context-menu" size={IconSize.LARGE} />
+      <StyledIcon name="comment-context-menu" size={IconSize.LARGE} />
     </Popover2>
   );
 }
diff --git a/app/client/src/comments/CommentCard/ResolveCommentButton.tsx b/app/client/src/comments/CommentCard/ResolveCommentButton.tsx
index a5e2e5081c..2c3062ba0e 100644
--- a/app/client/src/comments/CommentCard/ResolveCommentButton.tsx
+++ b/app/client/src/comments/CommentCard/ResolveCommentButton.tsx
@@ -6,7 +6,6 @@ import { Theme } from "constants/DefaultTheme";
 const Container = styled.div`
   display: flex;
   cursor: pointer;
-  margin-right: ${(props) => props.theme.spaces[4]}px;
 `;
 
 type Props = {
@@ -15,30 +14,51 @@ type Props = {
   theme: Theme;
 };
 
-const StyledResolveIcon = styled(Icon)<{ strokeColor: string }>`
-  & circle,
-  & path {
-    stroke: ${(props) => props.strokeColor};
+const StyledResolveIcon = styled(Icon)<{
+  strokeColorCircle: string;
+  strokeColorPath: string;
+  fillColor: string;
+}>`
+  & circle {
+    stroke: ${(props) => props.strokeColorCircle};
   }
   && path {
+    stroke: ${(props) => props.strokeColorPath};
     fill: transparent;
   }
+  && svg {
+    fill: ${(props) => props.fillColor};
+  }
 `;
 
 const ResolveCommentButton = withTheme(
   ({ handleClick, resolved, theme }: Props) => {
     const {
       resolved: resolvedColor,
+      resolvedFill: resolvedFillColor,
+      resolvedPath: resolvedPathColor,
       unresolved: unresolvedColor,
+      unresolvedFill: unresolvedFillColor,
     } = theme.colors.comments;
-    const strokeColor = resolved ? resolvedColor : unresolvedColor;
+
+    const strokeColorCircle = resolved ? resolvedColor : unresolvedColor;
+    const strokeColorPath = resolved ? resolvedPathColor : unresolvedColor;
+    const fillColor = resolved ? resolvedFillColor : unresolvedFillColor;
+
+    const _handleClick = (e: React.MouseEvent) => {
+      e.stopPropagation();
+      handleClick();
+    };
+
     return (
-      <Container onClick={handleClick}>
+      <Container onClick={_handleClick}>
         <StyledResolveIcon
-          fillColor={"transparent"}
+          fillColor={fillColor}
+          keepColors
           name="oval-check"
           size={IconSize.XXL}
-          strokeColor={strokeColor}
+          strokeColorCircle={strokeColorCircle}
+          strokeColorPath={strokeColorPath}
         />
       </Container>
     );
diff --git a/app/client/src/comments/CommentThread/CommentThread.tsx b/app/client/src/comments/CommentThread/CommentThread.tsx
index c6f4fb9b86..9071fcb4df 100644
--- a/app/client/src/comments/CommentThread/CommentThread.tsx
+++ b/app/client/src/comments/CommentThread/CommentThread.tsx
@@ -1,5 +1,5 @@
 import React, { useRef } from "react";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 
 import CommentCard from "comments/CommentCard/CommentCard";
 import AddCommentInput from "comments/inlineComments/AddCommentInput";
@@ -7,38 +7,46 @@ import ScrollToLatest from "./ScrollToLatest";
 
 import {
   addCommentToThreadRequest,
+  markThreadAsReadRequest,
+  resetVisibleThread,
   setCommentResolutionRequest,
 } from "actions/commentActions";
 
+import { shouldShowResolved as shouldShowResolvedSelector } from "selectors/commentsSelectors";
+
 import useIsScrolledToBottom from "utils/hooks/useIsScrolledToBottom";
 
 import { CommentThread } from "entities/Comments/CommentsInterfaces";
 import { RawDraftContentState } from "draft-js";
 
 import styled from "styled-components";
+import { animated } from "react-spring";
+import { AppState } from "reducers";
+import { useEffect } from "react";
 
-const ThreadContainer = styled.div`
-  width: 400px;
+const ThreadContainer = styled(animated.div)<{
+  visible?: boolean;
+  inline?: boolean;
+  pinned?: boolean;
+}>`
+  width: 280px;
   max-width: 100%;
+  background-color: ${(props) =>
+    props.inline
+      ? "transparent"
+      : props.pinned
+      ? props.theme.colors.comments.pinnedThreadBackground
+      : props.visible
+      ? props.theme.colors.comments.visibleThreadBackground
+      : "transparent"};
+  max-height: ${(props) =>
+    props.inline ? `calc(100vh - ${props.theme.smallHeaderHeight})` : "unset"};
+  /* overflow: auto collapses the comment threads in the sidebar */
+  overflow: ${(props) => (props.inline ? "auto" : "unset")};
 `;
 
 const CommentsContainer = styled.div<{ inline?: boolean }>`
   position: relative;
-  max-height: ${(props) => (!props.inline ? "unset" : "285px")};
-  overflow: auto;
-`;
-
-const ChildCommentsContainer = styled.div`
-  display: flex;
-`;
-
-const ChildCommentIndent = styled.div`
-  width: 1px;
-  background-color: ${(props) =>
-    props.theme.colors.comments.childCommentsIndent};
-  margin-left: ${(props) => props.theme.spaces[11]}px;
-  margin-bottom: ${(props) => props.theme.spaces[7]}px;
-  margin-top: ${(props) => props.theme.spaces[5]}px;
 `;
 
 const ChildComments = styled.div`
@@ -47,19 +55,38 @@ const ChildComments = styled.div`
 
 function CommentThreadContainer({
   commentThread,
+  hideChildren,
   hideInput,
   inline,
+  showSubheader,
 }: {
   commentThread: CommentThread;
   isOpen?: boolean;
   hideInput?: boolean;
   inline?: boolean;
+  hideChildren?: boolean;
+  showSubheader?: boolean;
 }) {
   const dispatch = useDispatch();
-  const { comments, id: commentThreadId } = commentThread;
+  const { comments, id: commentThreadId } = commentThread || {};
   const messagesBottomRef = useRef<HTMLDivElement>(null);
   const commentsContainerRef = useRef<HTMLDivElement>(null);
 
+  const shouldShowResolved = useSelector(shouldShowResolvedSelector);
+  const isThreadVisible =
+    shouldShowResolved || !commentThread?.resolvedState?.active;
+
+  const isVisible = useSelector(
+    (state: AppState) =>
+      state.ui.comments.visibleCommentThreadId === commentThreadId,
+  );
+
+  useEffect(() => {
+    if (isVisible && !commentThread?.isViewed) {
+      dispatch(markThreadAsReadRequest(commentThreadId));
+    }
+  }, [isVisible, commentThread?.isViewed]);
+
   // Check if the comments window is scrolled to the bottom
   // We don't autoscroll for the user receiving the updates
   // for better UX, instead we'd show a helper message to indicate
@@ -90,42 +117,58 @@ function CommentThreadContainer({
   const resolveCommentThread = () => {
     dispatch(
       setCommentResolutionRequest({
-        threadId: commentThread.id,
-        resolved: !commentThread.resolved,
+        threadId: commentThread?.id,
+        resolved: !commentThread?.resolvedState?.active,
       }),
     );
   };
 
   const parentComment = Array.isArray(comments) && comments[0];
   const childComments = Array.isArray(comments) && comments.slice(1);
+  const numberOfReplies =
+    (Array.isArray(childComments) && childComments.length) || 0;
 
-  return (
-    <ThreadContainer tabIndex={0}>
+  const handleCancel = () => dispatch(resetVisibleThread(commentThreadId));
+
+  if (!commentThread) return null;
+
+  return isThreadVisible ? (
+    <ThreadContainer
+      inline={inline}
+      pinned={commentThread.pinnedState?.active}
+      tabIndex={0}
+      visible={isVisible}
+    >
       <div style={{ position: "relative" }}>
         <CommentsContainer inline={inline} ref={commentsContainerRef}>
           {parentComment && (
             <CommentCard
               comment={parentComment}
               commentThreadId={commentThreadId}
+              inline={inline}
               isParentComment
               key={parentComment.id}
-              resolved={!!commentThread.resolved}
+              numberOfReplies={numberOfReplies}
+              resolved={!!commentThread.resolvedState?.active}
+              showReplies={hideChildren}
+              showSubheader={showSubheader}
               toggleResolved={resolveCommentThread}
+              unread={!commentThread.isViewed}
+              visible={isVisible}
             />
           )}
-          {childComments && childComments.length > 0 && (
-            <ChildCommentsContainer>
-              <ChildCommentIndent />
-              <ChildComments>
-                {childComments.map((comment) => (
-                  <CommentCard
-                    comment={comment}
-                    commentThreadId={commentThreadId}
-                    key={comment.id}
-                  />
-                ))}
-              </ChildComments>
-            </ChildCommentsContainer>
+          {!hideChildren && childComments && childComments.length > 0 && (
+            <ChildComments>
+              {childComments.map((comment) => (
+                <CommentCard
+                  comment={comment}
+                  commentThreadId={commentThreadId}
+                  inline={inline}
+                  key={comment.id}
+                  visible={isVisible}
+                />
+              ))}
+            </ChildComments>
           )}
           <div ref={messagesBottomRef} />
         </CommentsContainer>
@@ -133,9 +176,11 @@ function CommentThreadContainer({
           <ScrollToLatest scrollToBottom={scrollToBottom} />
         )}
       </div>
-      {!hideInput && <AddCommentInput onSave={addComment} />}
+      {!hideInput && (
+        <AddCommentInput onCancel={handleCancel} onSave={addComment} />
+      )}
     </ThreadContainer>
-  );
+  ) : null;
 }
 
 export default CommentThreadContainer;
diff --git a/app/client/src/comments/CommentThread/ScrollToLatest.tsx b/app/client/src/comments/CommentThread/ScrollToLatest.tsx
index 0f442099a6..8727e18b05 100644
--- a/app/client/src/comments/CommentThread/ScrollToLatest.tsx
+++ b/app/client/src/comments/CommentThread/ScrollToLatest.tsx
@@ -1,15 +1,37 @@
+import Icon from "components/ads/Icon";
+import { Theme } from "constants/DefaultTheme";
 import React from "react";
-import styled from "styled-components";
+import styled, { withTheme } from "styled-components";
+import { getTypographyByKey } from "constants/DefaultTheme";
+import { VIEW_LATEST, createMessage } from "constants/messages";
 
 const Container = styled.div`
   position: absolute;
   right: 10px;
   bottom: 10px;
   cursor: pointer;
+  color: ${(props) => props.theme.colors.comments.viewLatest};
+  text-transform: uppercase;
+  display: flex;
+  ${(props) => getTypographyByKey(props, "btnMedium")}
+  & .view-latest {
+    margin-right: ${(props) => props.theme.spaces[1]}px;
+  }
 `;
 
-function ScrollToLatest({ scrollToBottom }: { scrollToBottom: () => void }) {
-  return <Container onClick={scrollToBottom}>View latest</Container>;
-}
+const ScrollToLatest = withTheme(
+  ({ scrollToBottom, theme }: { scrollToBottom: () => void; theme: Theme }) => {
+    return (
+      <Container onClick={scrollToBottom}>
+        <span className="view-latest">{createMessage(VIEW_LATEST)}</span>
+        <Icon
+          fillColor={theme.colors.comments.viewLatest}
+          hoverFillColor={theme.colors.comments.viewLatest}
+          name="down-arrow-2"
+        />
+      </Container>
+    );
+  },
+);
 
 export default ScrollToLatest;
diff --git a/app/client/src/comments/CommentsShowcaseCarousel/CommentsCarouselModal.tsx b/app/client/src/comments/CommentsShowcaseCarousel/CommentsCarouselModal.tsx
new file mode 100644
index 0000000000..066d2418fc
--- /dev/null
+++ b/app/client/src/comments/CommentsShowcaseCarousel/CommentsCarouselModal.tsx
@@ -0,0 +1,29 @@
+import React from "react";
+import ModalComponent from "components/designSystems/blueprint/ModalComponent";
+import { Layers } from "constants/Layers";
+
+function ShowcaseCarouselModal({ children }: { children: React.ReactNode }) {
+  return (
+    <ModalComponent
+      bottom={25}
+      canEscapeKeyClose
+      canOutsideClickClose
+      data-cy={"help-modal"}
+      hasBackDrop={false}
+      isOpen
+      left={25}
+      onClose={() => {
+        // TODO (rishabh) handle close
+      }}
+      overlayClassName="comments-onboarding-carousel"
+      portalClassName="comments-onboarding-carousel-portal"
+      scrollContents
+      width={325}
+      zIndex={Layers.appComments}
+    >
+      {children}
+    </ModalComponent>
+  );
+}
+
+export default ShowcaseCarouselModal;
diff --git a/app/client/src/comments/CommentsShowcaseCarousel/ProfileForm.tsx b/app/client/src/comments/CommentsShowcaseCarousel/ProfileForm.tsx
new file mode 100644
index 0000000000..03f749f8b1
--- /dev/null
+++ b/app/client/src/comments/CommentsShowcaseCarousel/ProfileForm.tsx
@@ -0,0 +1,81 @@
+import React from "react";
+
+import { reduxForm } from "redux-form";
+
+import FormGroup from "components/ads/formFields/FormGroup";
+import FormTextField from "components/ads/formFields/TextField";
+
+import UserProfileImagePicker from "components/ads/UserProfileImagePicker";
+
+import { createMessage, DISPLAY_NAME, EMAIL_ADDRESS } from "constants/messages";
+import styled from "styled-components";
+
+import { isEmail, isEmptyString } from "utils/formhelpers";
+
+export type FormValues = {
+  fullName?: string;
+  displayName?: string;
+  emailAddress?: string;
+};
+
+const Container = styled.div`
+  padding: ${(props) => props.theme.spaces[5]}px;
+`;
+
+export const PROFILE_FORM = "PROFILE_FORM";
+
+const fieldNames = {
+  displayName: "displayName",
+  emailAddress: "emailAddress",
+};
+
+const validate = (values: any) => {
+  const errors: any = {};
+  const displayName = values[fieldNames.displayName] || "";
+  const emailAddress = values[fieldNames.emailAddress] || "";
+
+  if (!displayName || isEmptyString(displayName)) {
+    errors[fieldNames.displayName] = "Required";
+  }
+  if (!emailAddress || isEmptyString(emailAddress) || !isEmail(emailAddress)) {
+    errors[fieldNames.emailAddress] = "Required";
+  }
+
+  return errors;
+};
+
+function ProfileForm(props: any) {
+  return (
+    <Container>
+      <div style={{ marginBottom: 10 }}>
+        <UserProfileImagePicker />
+      </div>
+      <FormGroup label={createMessage(DISPLAY_NAME)}>
+        <FormTextField
+          hideErrorMessage
+          name={fieldNames.displayName}
+          placeholder={createMessage(DISPLAY_NAME)}
+        />
+      </FormGroup>
+      <FormGroup label={createMessage(EMAIL_ADDRESS)}>
+        <FormTextField
+          disabled={props.emailDisabled}
+          hideErrorMessage
+          name={fieldNames.emailAddress}
+          placeholder={createMessage(EMAIL_ADDRESS)}
+          type="email"
+        />
+      </FormGroup>
+    </Container>
+  );
+}
+
+export default reduxForm({
+  // Currently while using this feature,
+  // a destroy action is dispatched
+  // so the initial values don't get set
+  // TODO: triage this issue
+  destroyOnUnmount: false,
+  form: PROFILE_FORM,
+  validate,
+})(ProfileForm);
diff --git a/app/client/src/comments/CommentsShowcaseCarousel/index.tsx b/app/client/src/comments/CommentsShowcaseCarousel/index.tsx
new file mode 100644
index 0000000000..76d725e080
--- /dev/null
+++ b/app/client/src/comments/CommentsShowcaseCarousel/index.tsx
@@ -0,0 +1,176 @@
+import React from "react";
+
+import Text, { TextType } from "components/ads/Text";
+import ShowcaseCarousel, { Steps } from "components/ads/ShowcaseCarousel";
+import ProfileForm, { PROFILE_FORM } from "./ProfileForm";
+import CommentsCarouselModal from "./CommentsCarouselModal";
+
+import styled, { withTheme } from "styled-components";
+import { Theme } from "constants/DefaultTheme";
+import { useDispatch, useSelector } from "react-redux";
+import { getFormSyncErrors } from "redux-form";
+import { getFormValues } from "redux-form";
+
+import { isIntroCarouselVisibleSelector } from "selectors/commentsSelectors";
+import { getCurrentUser } from "selectors/usersSelectors";
+
+import { setActiveTour } from "actions/tourActions";
+import { TourType } from "entities/Tour";
+import { hideCommentsIntroCarousel } from "actions/commentActions";
+import { setCommentsIntroSeen } from "utils/storage";
+
+import { updateUserDetails } from "actions/userActions";
+
+import { S3_BUCKET_URL } from "constants/ThirdPartyConstants";
+
+const getBanner = (step: number) =>
+  `${S3_BUCKET_URL}/comments/step-${step}.png`;
+
+const introSteps = [
+  {
+    title: "Introducing Live Comments",
+    content:
+      "We are introducing live comments. From now on you will be able to comment on your apps, tag other people and exchange thoughts in threads. Click ‘Next’ to learn more about comments and start commenting.",
+    banner: getBanner(1),
+    hideBackBtn: true,
+  },
+  {
+    title: "Give feedback",
+    content:
+      "Comment on your co-worker’s work and share your thoughts on what works and what needs change.",
+    banner: getBanner(2),
+  },
+  {
+    title: "Invite other people to your conversations",
+    content:
+      "When leaving a comment you can tag other people by writing ‘@’ and their name. This way the person you tagged will get a notification and an e-mail that you tagged them in a comment.",
+    banner: getBanner(3),
+  },
+  {
+    title: "Tag a comment to a widget",
+    content:
+      "If you click on a component while in a comment mode you will tag that comment to that widget. This way if the widget is moved the comment will be moved as well. You can disconnect the comment and widget y simply moving the the comment away from the widget.",
+    banner: getBanner(4),
+  },
+  {
+    title: "You are all set!",
+    content:
+      "By clicking on the comments icon in the top right corner you will activate the ‘collaboration mode’ and will be able to start a thread or answer to someone else’s comment.",
+    banner: getBanner(5),
+  },
+];
+
+const IntroContentContainer = styled.div`
+  padding: ${(props) => props.theme.spaces[5]}px;
+`;
+
+const StyledImg = styled.img`
+  width: 100%;
+  object-fit: contain;
+`;
+
+function IntroStep(props: {
+  title: string;
+  content: string;
+  banner: string;
+  theme: Theme;
+}) {
+  return (
+    <>
+      <StyledImg alt="" src={props.banner} />
+      <IntroContentContainer>
+        <div style={{ marginBottom: props.theme.spaces[4] }}>
+          <Text
+            style={{
+              color: props.theme.colors.comments.introTitle,
+            }}
+            type={TextType.H1}
+          >
+            {props.title}
+          </Text>
+        </div>
+        <Text
+          style={{ color: props.theme.colors.comments.introContent }}
+          type={TextType.P1}
+        >
+          {props.content}
+        </Text>
+      </IntroContentContainer>
+    </>
+  );
+}
+
+const IntroStepThemed = withTheme(IntroStep);
+
+const getSteps = (
+  onSubmitProfileForm: any,
+  isSubmitProfileFormDisabled: boolean,
+  startTutorial: () => void,
+  initialProfileFormValues: { emailAddress?: string; displayName?: string },
+  emailDisabled: boolean,
+) => [
+  ...introSteps.slice(0, 4).map((stepConfig: any) => ({
+    props: stepConfig,
+    component: IntroStepThemed,
+  })),
+  {
+    component: ProfileForm,
+    props: {
+      isSubmitDisabled: isSubmitProfileFormDisabled,
+      onSubmit: onSubmitProfileForm,
+      initialValues: initialProfileFormValues,
+      emailDisabled,
+    },
+  },
+  {
+    component: IntroStepThemed,
+    props: {
+      ...introSteps[4],
+      hideBackBtn: true,
+      nextBtnText: "Start Tutorial",
+      onSubmit: startTutorial,
+    },
+  },
+];
+
+export default function CommentsShowcaseCarousel() {
+  const dispatch = useDispatch();
+  const isIntroCarouselVisible = useSelector(isIntroCarouselVisibleSelector);
+  const profileFormValues = useSelector(getFormValues(PROFILE_FORM));
+  const profileFormErrors = useSelector(getFormSyncErrors("PROFILE_FORM"));
+  const isSubmitDisabled = Object.keys(profileFormErrors).length !== 0;
+
+  const currentUser = useSelector(getCurrentUser);
+  const { email, name } = currentUser || {};
+
+  const initialProfileFormValues = { emailAddress: email, displayName: name };
+  const onSubmitProfileForm = () => {
+    const { displayName: name, emailAddress: email } = profileFormValues as {
+      displayName: string;
+      emailAddress: string;
+    };
+    dispatch(updateUserDetails({ name, email }));
+  };
+
+  const startTutorial = () => {
+    dispatch(setActiveTour(TourType.COMMENTS_TOUR));
+    dispatch(hideCommentsIntroCarousel());
+    setCommentsIntroSeen(true);
+  };
+
+  const steps = getSteps(
+    onSubmitProfileForm,
+    isSubmitDisabled,
+    startTutorial,
+    initialProfileFormValues,
+    !!email,
+  );
+
+  if (!isIntroCarouselVisible) return null;
+
+  return (
+    <CommentsCarouselModal>
+      <ShowcaseCarousel steps={steps as Steps} />
+    </CommentsCarouselModal>
+  );
+}
diff --git a/app/client/src/comments/ToggleCommentModeButton.tsx b/app/client/src/comments/ToggleCommentModeButton.tsx
deleted file mode 100644
index 0c69ec17b4..0000000000
--- a/app/client/src/comments/ToggleCommentModeButton.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import React, { useCallback, useEffect } from "react";
-import styled from "styled-components";
-import { useDispatch, useSelector } from "react-redux";
-import { ReactComponent as ToggleCommmentMode } from "assets/icons/comments/toggle-comment-mode.svg";
-import {
-  setCommentMode as setCommentModeAction,
-  fetchApplicationCommentsRequest,
-} from "actions/commentActions";
-import {
-  commentModeSelector,
-  areCommentsEnabledForUser as areCommentsEnabledForUserSelector,
-} from "../selectors/commentsSelectors";
-import { useLocation } from "react-router";
-import history from "utils/history";
-
-const StyledToggleCommentMode = styled.div<{ isCommentMode: boolean }>`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-
-  background: ${(props) =>
-    !props.isCommentMode
-      ? props.theme.colors.comments.commentModeButtonBackground
-      : props.theme.colors.comments.commentModeButtonIcon};
-  svg path {
-    fill: ${(props) =>
-      props.isCommentMode
-        ? "#fff"
-        : props.theme.colors.comments.commentModeButtonIcon};
-  }
-
-  height: ${(props) => props.theme.smallHeaderHeight};
-  width: ${(props) => props.theme.smallHeaderHeight};
-`;
-
-// update isCommentMode in the store based on the query search param
-const useUpdateCommentModeInStore = () => {
-  const location = useLocation();
-  const dispatch = useDispatch();
-
-  const setCommentModeInStore = useCallback(
-    (updatedIsCommentMode) =>
-      dispatch(setCommentModeAction(updatedIsCommentMode)),
-    [],
-  );
-
-  useEffect(() => {
-    if (window.location.href) {
-      const searchParams = new URL(window.location.href).searchParams;
-      const isCommentMode = searchParams.get("isCommentMode");
-      if (isCommentMode) {
-        const updatedIsCommentMode = isCommentMode === "true" ? true : false;
-        setCommentModeInStore(updatedIsCommentMode);
-      }
-    }
-  }, [location]);
-};
-
-/**
- * Toggle comment mode:
- * This component is also responsible for fetching
- * application comments
- */
-function ToggleCommentModeButton() {
-  const dispatch = useDispatch();
-
-  const commentsEnabled = useSelector(areCommentsEnabledForUserSelector);
-  const isCommentMode = useSelector(commentModeSelector);
-
-  const setCommentModeInUrl = useCallback(() => {
-    const currentURL = new URL(window.location.href);
-    const searchParams = currentURL.searchParams;
-    searchParams.set("isCommentMode", `${!isCommentMode}`);
-    // remove comment link params so that they don't get retriggered
-    // on toggling comment mode
-    searchParams.delete("commentId");
-    searchParams.delete("commentThreadId");
-    history.replace({
-      pathname: currentURL.pathname,
-      search: searchParams.toString(),
-      hash: currentURL.hash,
-    });
-  }, [isCommentMode]);
-
-  // fetch applications comments when comment mode is turned on
-  useEffect(() => {
-    if (isCommentMode) {
-      dispatch(fetchApplicationCommentsRequest());
-    }
-  }, [isCommentMode]);
-
-  useUpdateCommentModeInStore();
-
-  return commentsEnabled ? (
-    <StyledToggleCommentMode
-      isCommentMode={isCommentMode}
-      onClick={setCommentModeInUrl}
-    >
-      <ToggleCommmentMode />
-    </StyledToggleCommentMode>
-  ) : null;
-}
-
-export default ToggleCommentModeButton;
diff --git a/app/client/src/comments/init.ts b/app/client/src/comments/init.ts
deleted file mode 100644
index f3db7d4a4b..0000000000
--- a/app/client/src/comments/init.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { updateAndSaveLayout } from "actions/pageActions";
-import { uniqueId } from "lodash";
-
-const dsl = require("./dsl.json");
-
-export const updateLayout = () => updateAndSaveLayout(dsl.widgets as any);
-
-export const getTestComments = () => {
-  const commentThreads = Object.entries(dsl.widgets).map(([widgetId]) => {
-    return {
-      refId: widgetId,
-      position: { top: 10, left: 15 },
-      id: uniqueId(),
-      comments: [{ body: widgetId, authorName: uniqueId() }],
-    };
-  });
-
-  // const [widgetId] = Object.entries(dsl.widgets)[0];
-  // const commentThreads = [
-  //   {
-  //     refId: widgetId,
-  //     meta: {
-  //       position: { top: 10, left: 15 },
-  //     },
-  //     id: `${1}`,
-  //     comments: [{ body: widgetId }],
-  //   },
-  // ];
-
-  return commentThreads;
-};
diff --git a/app/client/src/comments/inlineComments/AddCommentInput.tsx b/app/client/src/comments/inlineComments/AddCommentInput.tsx
index 5d140e9147..e8b7d44aff 100644
--- a/app/client/src/comments/inlineComments/AddCommentInput.tsx
+++ b/app/client/src/comments/inlineComments/AddCommentInput.tsx
@@ -6,35 +6,38 @@ import React, {
   useMemo,
   useState,
 } from "react";
-import Icon, { IconSize } from "components/ads/Icon";
-import styled, { withTheme } from "styled-components";
-import { EditorState, convertToRaw, Modifier, SelectionState } from "draft-js";
 import EmojiPicker from "components/ads/EmojiPicker";
-import MentionsInput from "components/ads/MentionsInput";
-import useOrgUsers from "./useOrgUsers";
-import { MentionData } from "@draft-js-plugins/mention";
-import { OrgUser } from "constants/orgConstants";
-import { IEmojiData } from "emoji-picker-react";
+import MentionsInput, { Trigger } from "components/ads/MentionsInput";
+import Button, { Category } from "components/ads/Button";
 
-import { createMessage, ADD_COMMENT_PLACEHOLDER } from "constants/messages";
+import { BaseEmoji } from "emoji-mart";
+import styled from "styled-components";
+import { EditorState, convertToRaw, Modifier, SelectionState } from "draft-js";
+import { MentionData } from "@draft-js-plugins/mention";
+
+import { OrgUser } from "constants/orgConstants";
+import useOrgUsers from "./useOrgUsers";
+
+import { RawDraftContentState } from "draft-js";
+
+import {
+  createMessage,
+  ADD_COMMENT_PLACEHOLDER,
+  CANCEL,
+  POST,
+} from "constants/messages";
+
+import { setShowAppInviteUsersDialog } from "actions/applicationActions";
+import { useDispatch } from "react-redux";
+import { change } from "redux-form";
+
+import { INVITE_USERS_TO_ORG_FORM } from "constants/forms";
+
+import { isEmail } from "utils/formhelpers";
 
 const StyledInputContainer = styled.div`
-  display: flex;
-  align-items: center;
   width: 100%;
-  padding: ${(props) =>
-    `${props.theme.spaces[3]}px ${props.theme.spaces[4]}px`};
-  background: ${(props) =>
-    props.theme.colors.comments.addCommentInputBackground};
-`;
-
-const StyledSendButton = styled.button`
-  display: inline-flex;
-  background: transparent;
-  border: none;
-  align-items: center;
-  position: relative;
-  top: -1px;
+  margin-bottom: ${(props) => props.theme.spaces[7]}px;
 `;
 
 const StyledEmojiTrigger = styled.div`
@@ -43,11 +46,24 @@ const StyledEmojiTrigger = styled.div`
   margin-right: ${(props) => props.theme.spaces[4]}px;
 `;
 
-const PaddingContainer = styled.div`
+const PaddingContainer = styled.div<{ removePadding?: boolean }>`
   padding: ${(props) =>
-    `${props.theme.spaces[4]}px ${props.theme.spaces[6]}px`};
+    !props.removePadding
+      ? `${props.theme.spaces[7]}px ${props.theme.spaces[5]}px`
+      : 0};
+
+  & .cancel-button {
+    margin-right: ${(props) => props.theme.spaces[5]}px;
+  }
 `;
 
+const Row = styled.div`
+  display: flex;
+  justify-content: space-between;
+`;
+
+// Trigger tests
+
 const insertCharacter = (
   characterToInsert: string,
   editorState: EditorState,
@@ -95,88 +111,150 @@ const resetEditorState = (editorState: EditorState) => {
   return editorState;
 };
 
+const otherSuggestions = [{ name: "appsmith" }];
+
 const useUserSuggestions = (
   users: Array<OrgUser>,
   setSuggestions: Dispatch<SetStateAction<Array<MentionData>>>,
 ) => {
   useEffect(() => {
-    setSuggestions(users.map((user) => ({ name: user.username })));
+    setSuggestions([
+      ...otherSuggestions,
+      ...users.map((user) => ({ name: user.name || user.username, user })),
+    ]);
   }, [users]);
 };
 
-const AddCommentInput = withTheme(({ onSave, theme }: any) => {
+function AddCommentInput({
+  initialEditorState,
+  onCancel,
+  onSave,
+  removePadding,
+}: {
+  removePadding?: boolean;
+  initialEditorState?: EditorState;
+  onSave: (state: RawDraftContentState) => void;
+  onCancel?: () => void;
+}) {
+  const dispatch = useDispatch();
   const users = useOrgUsers();
   const [suggestions, setSuggestions] = useState<Array<MentionData>>([]);
+  const [trigger, setTrigger] = useState<Trigger>();
   useUserSuggestions(users, setSuggestions);
-  const [editorState, setEditorState] = useState(EditorState.createEmpty());
+  const [editorState, setEditorState] = useState(
+    initialEditorState || EditorState.createEmpty(),
+  );
   const [suggestionsQuery, setSuggestionsQuery] = useState("");
 
+  const clearEditor = useCallback(() => {
+    setEditorState(resetEditorState(editorState));
+  }, [editorState]);
+
+  const _onCancel = () => {
+    clearEditor();
+    if (onCancel) onCancel();
+  };
+
   const onSaveComment = useCallback(
     (editorStateArg?: EditorState) => {
       const latestEditorState = editorStateArg || editorState;
+      const plainText = latestEditorState.getCurrentContent().getPlainText();
 
-      if (!latestEditorState.getCurrentContent().hasText()) return;
+      if (!plainText || plainText.trim().length === 0) return;
 
       const contentState = latestEditorState.getCurrentContent();
       const rawContent = convertToRaw(contentState);
+      clearEditor();
       onSave(rawContent);
-      setEditorState(resetEditorState(latestEditorState));
     },
     [editorState],
   );
   const handleSubmit = useCallback(() => onSaveComment(), [editorState]);
 
   const handleEmojiClick = useCallback(
-    (e: React.MouseEvent, emojiObject: IEmojiData) => {
-      const newEditorState = insertCharacter(emojiObject.emoji, editorState);
+    (e: React.MouseEvent, emojiObject: BaseEmoji) => {
+      const newEditorState = insertCharacter(emojiObject.native, editorState);
       setEditorState(newEditorState);
     },
     [editorState],
   );
 
   const onSearchChange = useCallback(
-    ({ value }: { value: string }) => {
+    ({ trigger, value }: { trigger: string; value: string }) => {
       setSuggestionsQuery(value);
+      setTrigger(trigger as Trigger);
     },
     [suggestions],
   );
 
   const filteredSuggestions = useMemo(() => {
-    if (!suggestionsQuery) return suggestions;
+    let suggestionResults = suggestions;
+    if (!suggestionsQuery) return suggestionResults;
     else {
-      return suggestions.filter((suggestion) => {
-        const str = suggestion.name.toLowerCase();
+      suggestionResults = suggestions.filter((suggestion) => {
+        const name = suggestion.name.toLowerCase();
+        const username = suggestion.user?.username.toLowerCase() || "";
         const filter = suggestionsQuery.toLowerCase();
-        return str.indexOf(filter) !== -1;
+        return name.indexOf(filter) !== -1 || username.indexOf(filter) !== -1;
       });
     }
-  }, [suggestionsQuery, suggestions]);
+
+    if (suggestionResults.length !== 0) return suggestionResults;
+
+    if (isEmail(suggestionsQuery)) {
+      return [{ name: suggestionsQuery, isInviteTrigger: true }];
+    }
+
+    return [];
+  }, [suggestionsQuery, suggestions, trigger]);
+
+  const onAddMention = (mention: MentionData) => {
+    if (isEmail(mention.name) && mention.isInviteTrigger) {
+      dispatch(setShowAppInviteUsersDialog(true));
+      dispatch(change(INVITE_USERS_TO_ORG_FORM, "users", mention.name));
+    }
+  };
 
   return (
-    <PaddingContainer>
-      <StyledInputContainer>
-        <MentionsInput
-          autoFocus
-          editorState={editorState}
-          onSearchSuggestions={onSearchChange}
-          onSubmit={onSaveComment}
-          placeholder={createMessage(ADD_COMMENT_PLACEHOLDER)}
-          setEditorState={setEditorState}
-          suggestions={filteredSuggestions}
-        />
+    <PaddingContainer removePadding={removePadding}>
+      <Row>
+        <StyledInputContainer>
+          <MentionsInput
+            autoFocus
+            editorState={editorState}
+            onAddMention={onAddMention}
+            onSearchSuggestions={onSearchChange}
+            onSubmit={onSaveComment}
+            placeholder={createMessage(ADD_COMMENT_PLACEHOLDER)}
+            setEditorState={setEditorState}
+            suggestions={filteredSuggestions}
+          />
+        </StyledInputContainer>
+      </Row>
+      <Row>
         <StyledEmojiTrigger>
           <EmojiPicker onSelectEmoji={handleEmojiClick} />
         </StyledEmojiTrigger>
-        <StyledSendButton data-cy="add-comment-submit" onClick={handleSubmit}>
-          <Icon
-            fillColor={theme.colors.comments.sendButton}
-            name="send-button"
-            size={IconSize.XL}
+        <Row>
+          <Button
+            category={Category.tertiary}
+            className={"cancel-button"}
+            onClick={_onCancel}
+            text={createMessage(CANCEL)}
+            type="button"
           />
-        </StyledSendButton>
-      </StyledInputContainer>
+          <Button
+            category={Category.primary}
+            data-cy="add-comment-submit"
+            disabled={!editorState.getCurrentContent().hasText()}
+            onClick={handleSubmit}
+            text={createMessage(POST)}
+            type="button"
+          />
+        </Row>
+      </Row>
     </PaddingContainer>
   );
-});
+}
 
 export default AddCommentInput;
diff --git a/app/client/src/comments/inlineComments/Comments.tsx b/app/client/src/comments/inlineComments/Comments.tsx
index 822c45e7b9..5533ffa719 100644
--- a/app/client/src/comments/inlineComments/Comments.tsx
+++ b/app/client/src/comments/inlineComments/Comments.tsx
@@ -1,12 +1,53 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
 import UnpublishedCommentThread from "./UnpublishedCommentThread";
 import InlineCommentPin from "./InlineCommentPin";
 import {
+  commentThreadsSelector,
   refCommentThreadsSelector,
   unpublishedCommentThreadSelector,
 } from "../../selectors/commentsSelectors";
-import { getCurrentApplicationId } from "selectors/editorSelectors";
+import {
+  getCurrentApplicationId,
+  getCurrentPageId,
+} from "selectors/editorSelectors";
+import { useLocation } from "react-router";
+
+// TODO refactor application comment threads by page id to optimise
+// if lists turn out to be expensive
+function InlinePageCommentPin({
+  commentThreadId,
+  focused,
+}: {
+  commentThreadId: string;
+  focused: boolean;
+}) {
+  const commentThread = useSelector(commentThreadsSelector(commentThreadId));
+  const currentPageId = useSelector(getCurrentPageId);
+
+  if (commentThread && commentThread.pageId !== currentPageId) return null;
+
+  return (
+    <InlineCommentPin commentThreadId={commentThreadId} focused={focused} />
+  );
+}
+
+const MemoisedInlinePageCommentPin = React.memo(InlinePageCommentPin);
+
+const useSelectCommentThreadUsingQuery = () => {
+  const location = useLocation();
+  const [commentThreadIdInUrl, setCommentThreadIdInUrl] = useState<
+    string | null
+  >();
+
+  useEffect(() => {
+    const searchParams = new URL(window.location.href).searchParams;
+    const commentThreadIdInUrl = searchParams.get("commentThreadId");
+    setCommentThreadIdInUrl(commentThreadIdInUrl);
+  }, [location]);
+
+  return commentThreadIdInUrl;
+};
 
 /**
  * Renders comment threads associated with a refId (for example widgetId)
@@ -21,13 +62,15 @@ function Comments({ refId }: { refId: string }) {
   const unpublishedCommentThread = useSelector(
     unpublishedCommentThreadSelector(refId),
   );
+  const commentThreadIdInUrl = useSelectCommentThreadUsingQuery();
 
   return (
     <>
       {Array.isArray(commentsThreadIds) &&
         commentsThreadIds.map((commentsThreadId: any) => (
-          <InlineCommentPin
+          <MemoisedInlinePageCommentPin
             commentThreadId={commentsThreadId}
+            focused={commentThreadIdInUrl === commentsThreadId}
             key={commentsThreadId}
           />
         ))}
diff --git a/app/client/src/comments/inlineComments/InlineCommentPin.tsx b/app/client/src/comments/inlineComments/InlineCommentPin.tsx
index 6a265d8a40..1bbd94e97a 100644
--- a/app/client/src/comments/inlineComments/InlineCommentPin.tsx
+++ b/app/client/src/comments/inlineComments/InlineCommentPin.tsx
@@ -1,107 +1,213 @@
 import React, { useEffect } from "react";
 import { useSelector, useDispatch } from "react-redux";
-import styled, { withTheme } from "styled-components";
+import styled from "styled-components";
 import CommentThread from "comments/CommentThread/CommentThread";
 import Icon, { IconSize } from "components/ads/Icon";
-import { Popover } from "@blueprintjs/core";
 import { get } from "lodash";
-import { commentThreadsSelector } from "selectors/commentsSelectors";
-import { Theme } from "constants/DefaultTheme";
-import { setIsCommentThreadVisible as setIsCommentThreadVisibleAction } from "actions/commentActions";
+import {
+  commentThreadsSelector,
+  shouldShowResolved as shouldShowResolvedSelector,
+} from "selectors/commentsSelectors";
+import { getTypographyByKey } from "constants/DefaultTheme";
+import {
+  setVisibleThread,
+  resetVisibleThread,
+  markThreadAsReadRequest,
+} from "actions/commentActions";
+import scrollIntoView from "scroll-into-view-if-needed";
+import { AppState } from "reducers";
 
+import "@blueprintjs/popover2/lib/css/blueprint-popover2.css";
+import { Popover2 } from "@blueprintjs/popover2";
+
+/**
+ * The relavent pixel position is bottom right for the comment cursor
+ * instead of the top left for the default arrow cursor
+ */
 const CommentTriggerContainer = styled.div<{ top: number; left: number }>`
   position: absolute;
-  top: ${(props) => props.top}%;
-  left: ${(props) => props.left}%;
+  bottom: calc(${(props) => 100 - props.top}% - 2px);
+  right: calc(${(props) => 100 - props.left}% - 2px);
   z-index: 1;
 `;
 
-const useSelectCommentThreadUsingQuery = (commentThreadId: string) => {
-  const dispatch = useDispatch();
-  useEffect(() => {
-    const searchParams = new URL(window.location.href).searchParams;
-    const commentThreadIdInUrl = searchParams.get("commentThreadId");
-    if (commentThreadIdInUrl && commentThreadIdInUrl === commentThreadId) {
-      const elements = document.getElementsByClassName(
-        `comment-thread-pin-${commentThreadId}`,
-      );
-      const commentPin = elements && elements[0];
-      commentPin?.scrollIntoView();
-      // set comment thread visible after scrollIntoView is complete
-      setTimeout(() => {
-        dispatch(
-          setIsCommentThreadVisibleAction({
-            commentThreadId,
-            isVisible: true,
-          }),
-        );
+const StyledPinContainer = styled.div<{ unread?: boolean }>`
+  position: relative;
+  & .pin-id {
+    position: absolute;
+    top: 15%;
+    left: 50%;
+    transform: translate(-50%);
+    color: ${(props) =>
+      props.unread ? "#fff" : props.theme.colors.comments.pinId};
+    ${(props) => getTypographyByKey(props, "p1")}
+    max-width: 25px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+  & svg {
+    width: 30px;
+    height: 30px;
+    box-shadow: 0px 8px 10px rgb(0 0 0 / 15%);
+    border-radius: 15px;
+    overflow: visible;
+  }
+  cursor: pointer;
+`;
+
+function Pin({
+  commentThreadId,
+  onClick,
+  sequenceId = "",
+  unread,
+}: {
+  commentThreadId: string;
+  sequenceId?: string;
+  unread?: boolean;
+  onClick: () => void;
+}) {
+  return (
+    <StyledPinContainer onClick={onClick} unread={unread}>
+      <Icon
+        className={`comment-thread-pin-${commentThreadId}`}
+        data-cy={`t--inline-comment-pin-trigger-${commentThreadId}`}
+        keepColors
+        name={unread ? "unread-pin" : "read-pin"}
+        size={IconSize.XXL}
+      />
+      <div className="pin-id">{sequenceId.slice(1)}</div>
+    </StyledPinContainer>
+  );
+}
+
+const Container = document.getElementById("root");
+
+const modifiers = {
+  preventOverflow: { enabled: true },
+  offset: {
+    enabled: true,
+    options: {
+      offset: [-8, 10] as [
+        number | null | undefined,
+        number | null | undefined,
+      ],
+    },
+  },
+};
+
+const focusThread = (commentThreadId: string) => {
+  if (commentThreadId) {
+    const elements = document.getElementsByClassName(
+      `comment-thread-pin-${commentThreadId}`,
+    );
+    const commentPin = elements && elements[0];
+    if (commentPin) {
+      scrollIntoView(commentPin, {
+        scrollMode: "if-needed",
+        block: "nearest",
+        inline: "nearest",
       });
     }
-  }, []);
+  }
 };
 
 /**
  * Comment pins that toggle comment thread popover visibility on click
  * They position themselves using position absolute based on top and left values (in percent)
  */
-const InlineCommentPin = withTheme(
-  ({ commentThreadId, theme }: { commentThreadId: string; theme: Theme }) => {
-    const commentThread = useSelector(commentThreadsSelector(commentThreadId));
-    const { top, left } = get(commentThread, "position", {
-      top: 0,
-      left: 0,
-    });
+function InlineCommentPin({
+  commentThreadId,
+  focused,
+}: {
+  commentThreadId: string;
+  focused: boolean;
+}) {
+  const commentThread = useSelector(commentThreadsSelector(commentThreadId));
+  const { left, top } = get(commentThread, "position", {
+    top: 0,
+    left: 0,
+  });
 
-    const dispatch = useDispatch();
-    const setIsCommentThreadVisible = (isVisible: boolean) =>
-      dispatch(
-        setIsCommentThreadVisibleAction({
-          commentThreadId,
-          isVisible,
-        }),
-      );
+  const dispatch = useDispatch();
 
-    useSelectCommentThreadUsingQuery(commentThreadId);
+  const isPinVisible = useSelector(
+    (state: AppState) =>
+      shouldShowResolvedSelector(state) ||
+      !commentThread?.resolvedState?.active,
+  );
 
-    return (
-      <CommentTriggerContainer
-        data-cy="inline-comment-pin"
-        left={left}
-        onClick={(e: any) => {
-          // capture clicks so that create new thread is not triggered
-          e.preventDefault();
-          e.stopPropagation();
-        }}
-        top={top}
-      >
-        <Popover
-          autoFocus
-          canEscapeKeyClose
-          hasBackdrop
-          isOpen={!!commentThread.isVisible}
-          minimal
-          // isOpen is controlled so that newly created threads are set to be visible
-          onInteraction={(nextOpenState) => {
-            setIsCommentThreadVisible(nextOpenState);
-          }}
-          popoverClassName="comment-thread"
-        >
-          <Icon
-            className={`comment-thread-pin-${commentThreadId}`}
-            data-cy={`t--inline-comment-pin-trigger-${commentThreadId}`}
-            fillColor={theme.colors.comments.pin}
-            name="pin"
-            size={IconSize.XXL}
-          />
+  const isCommentThreadVisible = useSelector(
+    (state: AppState) =>
+      state.ui.comments.visibleCommentThreadId === commentThreadId,
+  );
+
+  const handlePinClick = () => {
+    if (!commentThread?.isViewed) {
+      dispatch(markThreadAsReadRequest(commentThreadId));
+    }
+  };
+
+  useEffect(() => {
+    if (focused) {
+      focusThread(commentThreadId);
+      // set comment thread visible after scrollIntoView is complete
+      setTimeout(() => {
+        dispatch(setVisibleThread(commentThreadId));
+      });
+    }
+  }, [focused]);
+
+  if (!commentThread) return null;
+
+  return isPinVisible ? (
+    <CommentTriggerContainer
+      data-cy="inline-comment-pin"
+      draggable="true"
+      left={left}
+      onClick={(e: any) => {
+        // capture clicks so that create new thread is not triggered
+        e.preventDefault();
+        e.stopPropagation();
+      }}
+      top={top}
+    >
+      <Popover2
+        autoFocus={false}
+        boundary={Container as HTMLDivElement}
+        canEscapeKeyClose
+        content={
           <CommentThread
             commentThread={commentThread}
             inline
-            isOpen={!!commentThread.isVisible}
+            isOpen={!!isCommentThreadVisible}
           />
-        </Popover>
-      </CommentTriggerContainer>
-    );
-  },
-);
+        }
+        enforceFocus={false}
+        hasBackdrop
+        // isOpen is controlled so that newly created threads are set to be visible
+        isOpen={!!isCommentThreadVisible}
+        minimal
+        modifiers={modifiers}
+        onInteraction={(nextOpenState: boolean) => {
+          if (nextOpenState) {
+            dispatch(setVisibleThread(commentThreadId));
+          } else {
+            dispatch(resetVisibleThread(commentThreadId));
+          }
+        }}
+        placement={"right-start"}
+        popoverClassName="comment-thread"
+        portalClassName="inline-comment-thread"
+      >
+        <Pin
+          commentThreadId={commentThreadId}
+          onClick={handlePinClick}
+          sequenceId={commentThread.sequenceId}
+          unread={!commentThread.isViewed || isCommentThreadVisible}
+        />
+      </Popover2>
+    </CommentTriggerContainer>
+  ) : null;
+}
 
 export default InlineCommentPin;
diff --git a/app/client/src/comments/inlineComments/OverlayCommentsWrapper.tsx b/app/client/src/comments/inlineComments/OverlayCommentsWrapper.tsx
index 77527580b9..1abbbcd639 100644
--- a/app/client/src/comments/inlineComments/OverlayCommentsWrapper.tsx
+++ b/app/client/src/comments/inlineComments/OverlayCommentsWrapper.tsx
@@ -4,54 +4,21 @@ import { useSelector, useDispatch } from "react-redux";
 import Comments from "./Comments";
 import { commentModeSelector } from "selectors/commentsSelectors";
 import { createUnpublishedCommentThreadRequest } from "actions/commentActions";
-import commentIcon from "assets/icons/ads/commentIcon.png";
+import commentIcon from "assets/icons/comments/commentCursor.png";
+import { getOffsetPos } from "comments/utils";
+import useProceedToNextTourStep from "utils/hooks/useProceedToNextTourStep";
+import { TourType } from "entities/Tour";
 
 type Props = {
   children: React.ReactNode;
   refId: string;
 };
 
-/**
- * Returns the offset position relative to the container
- * using the coordinates from the click event
- * @param clickEvent
- * @param containerRef
- */
-const getOffsetPos = (
-  clickEvent: React.MouseEvent,
-  containerRef: HTMLDivElement,
-) => {
-  const boundingClientRect = containerRef.getBoundingClientRect();
-  const containerPosition = {
-    left: boundingClientRect.left,
-    top: boundingClientRect.top,
-  };
-  const clickPosition = {
-    left: clickEvent.clientX,
-    top: clickEvent.clientY,
-  };
-
-  const offsetLeft = clickPosition.left - containerPosition.left;
-  const offsetTop = clickPosition.top - containerPosition.top;
-
-  const offsetLeftPercent = parseInt(
-    `${(offsetLeft / boundingClientRect.width) * 100}`,
-  );
-  const offsetTopPercent = parseInt(
-    `${(offsetTop / boundingClientRect.height) * 100}`,
-  );
-
-  return {
-    left: offsetLeftPercent,
-    top: offsetTopPercent,
-  };
-};
-
 const Container = styled.div`
   width: 100%;
   height: 100%;
   position: relative;
-  cursor: -webkit-image-set(url("${commentIcon}") 2x) 11 17, auto;
+  cursor: url("${commentIcon}") 25 20 , auto;
 `;
 
 /**
@@ -62,8 +29,15 @@ function OverlayCommentsWrapper({ children, refId }: Props) {
   const containerRef = useRef<HTMLDivElement>(null);
   const isCommentMode = useSelector(commentModeSelector);
   const dispatch = useDispatch();
+
+  const proceedToNextTourStep = useProceedToNextTourStep(
+    TourType.COMMENTS_TOUR,
+    1,
+  );
+
   // create new unpublished thread
   const clickHandler = (e: any) => {
+    proceedToNextTourStep();
     e.persist();
     if (containerRef.current) {
       const position = getOffsetPos(e, containerRef.current);
diff --git a/app/client/src/comments/inlineComments/StyledComponents.tsx b/app/client/src/comments/inlineComments/StyledComponents.tsx
index bcb4d26b1e..6846d03527 100644
--- a/app/client/src/comments/inlineComments/StyledComponents.tsx
+++ b/app/client/src/comments/inlineComments/StyledComponents.tsx
@@ -2,9 +2,7 @@ import styled from "styled-components";
 import { getTypographyByKey } from "constants/DefaultTheme";
 
 export const ThreadContainer = styled.div`
-  border: 1px solid
-    ${(props) => props.theme.colors.comments.threadContainerBorder};
-  width: 400px;
+  width: 280px;
   max-width: 100%;
 `;
 
@@ -21,6 +19,4 @@ export const ThreadHeaderTitle = styled.div`
 
 export const CommentsContainer = styled.div`
   position: relative;
-  max-height: 285px;
-  overflow: auto;
 `;
diff --git a/app/client/src/comments/inlineComments/UnpublishedCommentThread.tsx b/app/client/src/comments/inlineComments/UnpublishedCommentThread.tsx
index 5861dbd56c..087d396127 100644
--- a/app/client/src/comments/inlineComments/UnpublishedCommentThread.tsx
+++ b/app/client/src/comments/inlineComments/UnpublishedCommentThread.tsx
@@ -1,93 +1,94 @@
 import React from "react";
 import { Popover, Position } from "@blueprintjs/core";
 import AddCommentInput from "./AddCommentInput";
-import {
-  ThreadContainer,
-  ThreadHeaderTitle,
-  ThreadHeader,
-} from "./StyledComponents";
+import { ThreadContainer } from "./StyledComponents";
 import { useDispatch } from "react-redux";
-import styled, { withTheme } from "styled-components";
+import styled from "styled-components";
 import { get } from "lodash";
 import {
   createCommentThreadRequest as createCommentThreadAction,
   removeUnpublishedCommentThreads,
 } from "actions/commentActions";
-import Icon, { IconSize } from "components/ads/Icon";
-import { Theme } from "constants/DefaultTheme";
+import Icon from "components/ads/Icon";
 import { RawDraftContentState } from "draft-js";
 import { CommentThread } from "entities/Comments/CommentsInterfaces";
 
 const CommentTriggerContainer = styled.div<{ top: number; left: number }>`
   position: absolute;
-  top: ${(props) => props.top}%;
-  left: ${(props) => props.left}%;
+  bottom: calc(${(props) => 100 - props.top}% - 2px);
+  right: calc(${(props) => 100 - props.left}% - 2px);
+
+  & svg {
+    width: 30px;
+    height: 30px;
+    box-shadow: 0px 8px 10px rgb(0 0 0 / 15%);
+    border-radius: 15px;
+    overflow: visible;
+  }
 `;
 
 // TODO look into drying this up using comment thread component
-const UnpublishedCommentThread = withTheme(
-  ({
-    theme,
-    commentThread,
-  }: {
-    commentThread: CommentThread;
-    theme: Theme;
-  }) => {
-    const { top, left } = get(commentThread, "position", {
-      top: 0,
-      left: 0,
-    });
-    const dispatch = useDispatch();
-    const onClosing = () => {
-      dispatch(removeUnpublishedCommentThreads());
-    };
+function UnpublishedCommentThread({
+  commentThread,
+}: {
+  commentThread: CommentThread;
+}) {
+  const { left, top } = get(commentThread, "position", {
+    top: 0,
+    left: 0,
+  });
+  const dispatch = useDispatch();
+  const onClosing = () => {
+    dispatch(removeUnpublishedCommentThreads());
+  };
 
-    const createCommentThread = (text: RawDraftContentState) => {
-      dispatch(createCommentThreadAction({ commentBody: text, commentThread }));
-    };
+  const createCommentThread = (text: RawDraftContentState) => {
+    dispatch(createCommentThreadAction({ commentBody: text, commentThread }));
+  };
 
-    return (
-      <div
-        data-cy="unpublished-comment-thread"
-        key={`${top}-${left}`}
-        onClick={(e: any) => {
-          // capture clicks so that create new thread is not triggered
-          e.preventDefault();
-          e.stopPropagation();
-        }}
-      >
-        <CommentTriggerContainer left={left} top={top}>
-          <Popover
-            autoFocus
-            boundary="viewport"
-            canEscapeKeyClose
-            hasBackdrop
-            isOpen
-            minimal
-            onInteraction={(nextOpenState) => {
-              if (!nextOpenState) {
-                onClosing();
-              }
-            }}
-            popoverClassName="comment-thread"
-            position={Position.BOTTOM_RIGHT}
-          >
-            <Icon
-              fillColor={theme.colors.comments.pin}
-              name="pin"
-              size={IconSize.XXL}
+  return (
+    <div
+      data-cy="unpublished-comment-thread"
+      key={`${top}-${left}`}
+      onClick={(e: any) => {
+        // capture clicks so that create new thread is not triggered
+        e.preventDefault();
+        e.stopPropagation();
+      }}
+    >
+      <CommentTriggerContainer left={left} top={top}>
+        <Popover
+          autoFocus
+          boundary="viewport"
+          canEscapeKeyClose
+          hasBackdrop
+          isOpen
+          minimal
+          modifiers={{
+            offset: {
+              enabled: true,
+              offset: "-8, 10",
+            },
+          }}
+          onInteraction={(nextOpenState) => {
+            if (!nextOpenState) {
+              onClosing();
+            }
+          }}
+          popoverClassName="comment-thread"
+          position={Position.RIGHT_TOP}
+        >
+          <Icon keepColors name="unread-pin" />
+          <ThreadContainer tabIndex={0}>
+            <AddCommentInput
+              onCancel={onClosing}
+              onSave={createCommentThread}
             />
-            <ThreadContainer tabIndex={0}>
-              <ThreadHeader>
-                <ThreadHeaderTitle>Add a Comment</ThreadHeaderTitle>
-              </ThreadHeader>
-              <AddCommentInput onSave={createCommentThread} />
-            </ThreadContainer>
-          </Popover>
-        </CommentTriggerContainer>
-      </div>
-    );
-  },
-);
+          </ThreadContainer>
+        </Popover>
+      </CommentTriggerContainer>
+    </div>
+  );
+}
 
 export default UnpublishedCommentThread;
diff --git a/app/client/src/comments/inlineComments/useOrgUsers.tsx b/app/client/src/comments/inlineComments/useOrgUsers.tsx
index 642a49c28b..bcf055d5f1 100644
--- a/app/client/src/comments/inlineComments/useOrgUsers.tsx
+++ b/app/client/src/comments/inlineComments/useOrgUsers.tsx
@@ -8,12 +8,14 @@ const useOrgUsers = () => {
   const orgId = useSelector(getCurrentOrgId);
   const orgUsers = useSelector(getAllUsers);
   useEffect(() => {
-    dispatch({
-      type: ReduxActionTypes.FETCH_ALL_USERS_INIT,
-      payload: {
-        orgId,
-      },
-    });
+    if (!orgUsers || !orgUsers.length) {
+      dispatch({
+        type: ReduxActionTypes.FETCH_ALL_USERS_INIT,
+        payload: {
+          orgId,
+        },
+      });
+    }
   }, [orgId]);
   return orgUsers;
 };
diff --git a/app/client/src/comments/tests/Comments.test.tsx b/app/client/src/comments/tests/Comments.test.tsx
index 07ad0806b6..dd3cb0fb05 100644
--- a/app/client/src/comments/tests/Comments.test.tsx
+++ b/app/client/src/comments/tests/Comments.test.tsx
@@ -49,7 +49,7 @@ describe("Comment threads", () => {
   });
 
   it("can be created", async (done) => {
-    const { getByDataCy, getAllByDataCy, findByDataCy, findByText } = render(
+    const { findByDataCy, findByText, getAllByDataCy, getByDataCy } = render(
       <OverlayCommentsWrapper refId="0">
         <div style={{ height: 100, width: 100 }} />
       </OverlayCommentsWrapper>,
@@ -87,7 +87,7 @@ describe("Comment threads", () => {
     done();
   });
   it("accept replies", async (done) => {
-    const { getByDataCy, findByText, findByDataCy } = render(
+    const { findByDataCy, findByText, getByDataCy } = render(
       <OverlayCommentsWrapper refId="0">
         <div style={{ height: 100, width: 100 }} />
       </OverlayCommentsWrapper>,
diff --git a/app/client/src/comments/tour/AddCommentTourComponent.tsx b/app/client/src/comments/tour/AddCommentTourComponent.tsx
new file mode 100644
index 0000000000..c8bfe95bca
--- /dev/null
+++ b/app/client/src/comments/tour/AddCommentTourComponent.tsx
@@ -0,0 +1,22 @@
+import React from "react";
+import styled from "styled-components";
+import TourTooltipWrapper from "components/ads/tour/TourTooltipWrapper";
+import { TourType } from "entities/Tour";
+
+const Dot = styled.div`
+  position: fixed;
+  top: 50%;
+  left: calc(125px + 50%);
+  width: 0px;
+  height: 0px;
+`;
+
+export default function AddCommentTourComponent() {
+  return (
+    <Dot>
+      <TourTooltipWrapper tourIndex={1} tourType={TourType.COMMENTS_TOUR}>
+        <div />
+      </TourTooltipWrapper>
+    </Dot>
+  );
+}
diff --git a/app/client/src/comments/tour/commentsTourSteps.ts b/app/client/src/comments/tour/commentsTourSteps.ts
new file mode 100644
index 0000000000..fdf40b8bfd
--- /dev/null
+++ b/app/client/src/comments/tour/commentsTourSteps.ts
@@ -0,0 +1,11 @@
+const steps = [
+  {
+    id: "ENTER_COMMENTS_MODE",
+    data: { message: "Click on the comment icon \n to enter comments mode" },
+  },
+  {
+    id: "CREATE_UNPUBLISHED_COMMENT",
+    data: { message: "Click anywhere on the canvas \n and leave a comment." },
+  },
+];
+export default steps;
diff --git a/app/client/src/comments/utils.ts b/app/client/src/comments/utils.ts
index 2beb5e03ee..fbd25f8116 100644
--- a/app/client/src/comments/utils.ts
+++ b/app/client/src/comments/utils.ts
@@ -1,4 +1,9 @@
 import { CommentThread } from "entities/Comments/CommentsInterfaces";
+import {
+  BUILDER_PAGE_URL,
+  getApplicationViewerPageURL,
+} from "constants/routes";
+import { APP_MODE } from "reducers/entityReducers/appReducer";
 
 // used for dev
 export const reduceCommentsByRef = (comments: any[]) => {
@@ -42,3 +47,77 @@ export const transformUnpublishCommentThreadToCreateNew = (payload: any) => {
     comments: [{ body: commentBody }],
   };
 };
+
+/**
+ * Returns the offset position relative to the container
+ * using the coordinates from the click event
+ * @param clickEvent
+ * @param containerRef
+ */
+export const getOffsetPos = (
+  clickEvent: React.MouseEvent,
+  containerRef: HTMLDivElement,
+) => {
+  const boundingClientRect = containerRef.getBoundingClientRect();
+  const containerPosition = {
+    left: boundingClientRect.left,
+    top: boundingClientRect.top,
+  };
+  const clickPosition = {
+    left: clickEvent.clientX,
+    top: clickEvent.clientY,
+  };
+
+  const offsetLeft = clickPosition.left - containerPosition.left;
+  const offsetTop = clickPosition.top - containerPosition.top;
+
+  const offsetLeftPercent = parseFloat(
+    `${(offsetLeft / boundingClientRect.width) * 100}`,
+  );
+  const offsetTopPercent = parseFloat(
+    `${(offsetTop / boundingClientRect.height) * 100}`,
+  );
+
+  return {
+    left: offsetLeftPercent,
+    top: offsetTopPercent,
+  };
+};
+
+export const getCommentThreadURL = ({
+  applicationId,
+  commentThreadId,
+  isResolved,
+  pageId,
+  mode = APP_MODE.PUBLISHED,
+}: {
+  applicationId?: string;
+  commentThreadId: string;
+  isResolved?: boolean;
+  pageId?: string;
+  mode?: APP_MODE;
+}) => {
+  const queryParams: Record<string, any> = {
+    commentThreadId,
+    isCommentMode: true,
+  };
+
+  if (isResolved) {
+    queryParams.isResolved = true;
+  }
+
+  const urlBuilder =
+    mode === APP_MODE.PUBLISHED
+      ? getApplicationViewerPageURL
+      : BUILDER_PAGE_URL;
+
+  const url = new URL(
+    `${window.location.origin}${urlBuilder(
+      applicationId,
+      pageId,
+      queryParams,
+    )}`,
+  );
+
+  return url;
+};
diff --git a/app/client/src/components/ads/Button.tsx b/app/client/src/components/ads/Button.tsx
index ea97229575..f1379ff564 100644
--- a/app/client/src/components/ads/Button.tsx
+++ b/app/client/src/components/ads/Button.tsx
@@ -70,7 +70,7 @@ const defaultProps = {
   size: Size.small,
   isLoading: false,
   disabled: false,
-  fill: false,
+  fill: undefined,
   tag: "a",
 };
 
@@ -380,7 +380,7 @@ function TextLoadingState({ text }: { text?: string }) {
   return <VisibilityWrapper>{text}</VisibilityWrapper>;
 }
 
-function IconLoadingState({ size, icon }: { size?: Size; icon?: IconName }) {
+function IconLoadingState({ icon, size }: { size?: Size; icon?: IconName }) {
   return <Icon invisible name={icon} size={IconSizeProp(size)} />;
 }
 
diff --git a/app/client/src/components/ads/Callout.tsx b/app/client/src/components/ads/Callout.tsx
index 2df99e39a2..9e57b0e257 100644
--- a/app/client/src/components/ads/Callout.tsx
+++ b/app/client/src/components/ads/Callout.tsx
@@ -73,7 +73,11 @@ Callout.defaultProps = {
 
 function Callout(props: CalloutProps) {
   return (
-    <CalloutContainer fill={props.fill} variant={props.variant || Variant.info}>
+    <CalloutContainer
+      className={props.className}
+      fill={props.fill}
+      variant={props.variant || Variant.info}
+    >
       {props.text && props.variant !== Variant.info ? (
         <Icon name={props.variant} size={IconSize.MEDIUM} />
       ) : null}
diff --git a/app/client/src/components/ads/Checkbox.tsx b/app/client/src/components/ads/Checkbox.tsx
index a8ab84d1ae..c9041b0aef 100644
--- a/app/client/src/components/ads/Checkbox.tsx
+++ b/app/client/src/components/ads/Checkbox.tsx
@@ -9,12 +9,14 @@ export type CheckboxProps = CommonComponentProps & {
   isDefaultChecked?: boolean;
   onCheckChange?: (isChecked: boolean) => void;
   info?: string;
+  backgroundColor?: string;
 };
 
 const Checkmark = styled.span<{
   disabled?: boolean;
   isChecked?: boolean;
   info?: string;
+  backgroundColor?: string;
 }>`
   position: absolute;
   top: ${(props) => (props.info ? "6px" : "1px")};
@@ -25,14 +27,14 @@ const Checkmark = styled.span<{
     props.isChecked
       ? props.disabled
         ? props.theme.colors.checkbox.disabled
-        : props.theme.colors.info.main
+        : props.backgroundColor || props.theme.colors.info.main
       : "transparent"};
   border: 2px solid
     ${(props) =>
       props.isChecked
         ? props.disabled
           ? props.theme.colors.checkbox.disabled
-          : props.theme.colors.info.main
+          : props.backgroundColor || props.theme.colors.info.main
         : props.theme.colors.checkbox.unchecked};
 
   &::after {
@@ -129,6 +131,7 @@ function Checkbox(props: CheckboxProps) {
         type="checkbox"
       />
       <Checkmark
+        backgroundColor={props.backgroundColor}
         disabled={props.disabled}
         info={props.info}
         isChecked={checked}
diff --git a/app/client/src/components/ads/ColorPickerComponent.tsx b/app/client/src/components/ads/ColorPickerComponent.tsx
index 83deb47adc..c24d907c3e 100644
--- a/app/client/src/components/ads/ColorPickerComponent.tsx
+++ b/app/client/src/components/ads/ColorPickerComponent.tsx
@@ -64,13 +64,14 @@ const ColorTab = styled.div<{ color: string }>`
 `;
 
 const defaultColors: string[] = [
-  "rgb(3, 179, 101)",
+  "#03b365",
   "#FFC13D",
   "#38AFF4",
   "#DD4B34",
   "#3366FF",
   "#2E3D49",
   "#F6F7F8",
+  "#FFFFFF",
   "#231F20",
 ];
 
diff --git a/app/client/src/components/ads/DisplayImageUpload.tsx b/app/client/src/components/ads/DisplayImageUpload.tsx
new file mode 100644
index 0000000000..8bd949d98f
--- /dev/null
+++ b/app/client/src/components/ads/DisplayImageUpload.tsx
@@ -0,0 +1,198 @@
+import React, { useEffect, useState } from "react";
+import { ReactComponent as ProfileImagePlaceholder } from "assets/images/profile-placeholder.svg";
+import Uppy from "@uppy/core";
+import Dialog from "components/ads/DialogComponent";
+
+import { Dashboard, useUppy } from "@uppy/react";
+import { getTypographyByKey } from "constants/DefaultTheme";
+
+import styled from "styled-components";
+import ImageEditor from "@uppy/image-editor";
+import { REMOVE, createMessage } from "constants/messages";
+
+import "@uppy/core/dist/style.css";
+import "@uppy/dashboard/dist/style.css";
+import "@uppy/image-editor/dist/style.css";
+import "@blueprintjs/popover2/lib/css/blueprint-popover2.css";
+
+type Props = {
+  onChange: (file: File) => void;
+  onRemove?: () => void;
+  submit: (uppy: Uppy.Uppy) => void;
+  value: string;
+  label?: string;
+};
+
+const Container = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  & .input-component {
+    display: none;
+  }
+
+  & .view {
+    cursor: pointer;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .image-view {
+      width: 80px;
+      height: 80px;
+
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background-color: ${(props) =>
+        props.theme.colors.displayImageUpload.background};
+      border-radius: 50%;
+      margin-bottom: ${(props) => props.theme.spaces[7]}px;
+
+      img {
+        height: 100%;
+        width: 100%;
+        border-radius: 50%;
+        object-fit: cover;
+      }
+    }
+
+    .label {
+      ${(props) => getTypographyByKey(props, "h6")}
+      color: ${(props) => props.theme.colors.displayImageUpload.label};
+    }
+  }
+`;
+
+const defaultLabel = "Upload Display Picture";
+
+export default function DisplayImageUpload({
+  onChange,
+  onRemove,
+  submit,
+  value,
+}: Props) {
+  const [loadError, setLoadError] = useState(false);
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const uppy = useUppy(() => {
+    const uppy = Uppy({
+      id: "uppy",
+      autoProceed: false,
+      allowMultipleUploads: false,
+      restrictions: {
+        maxNumberOfFiles: 1,
+        maxFileSize: 250000,
+        allowedFileTypes: [".jpg", ".jpeg", ".png"],
+      },
+      infoTimeout: 5000,
+      locale: {
+        strings: {},
+      },
+    });
+
+    uppy.setOptions({
+      locale: {
+        strings: {
+          cancel: "Cancel",
+          done: "Cancel",
+        },
+      },
+    });
+
+    uppy.use(ImageEditor, {
+      id: "ImageEditor",
+      quality: 0.8,
+      cropperOptions: {
+        viewMode: 1,
+        background: false,
+        autoCropArea: 1,
+        responsive: true,
+      },
+      actions: {
+        revert: false,
+        rotate: false,
+        flip: false,
+        zoomIn: false,
+        zoomOut: false,
+        cropSquare: false,
+        cropWidescreen: false,
+        cropWidescreenVertical: false,
+      },
+    });
+
+    uppy.on("file-added", (file: File) => {
+      onChange(file);
+      // TO trigger edit modal
+      const dashboard = uppy.getPlugin("uppy-img-upload-dashboard");
+      setTimeout(() => {
+        (dashboard as any).openFileEditor(file);
+      });
+    });
+
+    uppy.on("upload", () => {
+      submit(uppy);
+      setIsModalOpen(false);
+    });
+
+    uppy.on("file-editor:complete", (updatedFile) => {
+      onChange(updatedFile);
+    });
+
+    return uppy;
+  });
+
+  useEffect(() => {
+    if (value) setLoadError(false);
+  }, [value]);
+
+  return (
+    <Container onClick={() => setIsModalOpen(true)}>
+      <Dialog
+        canEscapeKeyClose
+        canOutsideClickClose
+        className="file-picker-dialog"
+        isOpen={isModalOpen}
+        maxHeight={"80vh"}
+        trigger={
+          <div className="view">
+            <div className="image-view">
+              {!value || loadError ? (
+                <ProfileImagePlaceholder />
+              ) : (
+                <img
+                  onError={() => {
+                    setLoadError(true);
+                  }}
+                  onLoad={() => setLoadError(false)}
+                  src={value}
+                />
+              )}
+            </div>
+            {(!value || loadError) && (
+              <span className="label">{defaultLabel}</span>
+            )}
+            {value && !loadError && (
+              <span
+                className="label"
+                onClick={(e) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  if (onRemove) onRemove();
+                }}
+              >
+                {createMessage(REMOVE)}
+              </span>
+            )}
+          </div>
+        }
+      >
+        <Dashboard
+          id="uppy-img-upload-dashboard"
+          plugins={["ImageEditor"]}
+          uppy={uppy}
+        />
+      </Dialog>
+    </Container>
+  );
+}
diff --git a/app/client/src/components/ads/DraggableList.tsx b/app/client/src/components/ads/DraggableList.tsx
index 79a03ed66d..a14d9bc176 100644
--- a/app/client/src/components/ads/DraggableList.tsx
+++ b/app/client/src/components/ads/DraggableList.tsx
@@ -32,7 +32,7 @@ const updateSpringStyles = (
 // Styles when items are dragged/idle
 const dragIdleSpringStyles = (
   order: Array<number>,
-  { down, originalIndex, curIndex, y, itemHeight }: SpringStyleProps,
+  { curIndex, down, itemHeight, originalIndex, y }: SpringStyleProps,
 ) => (index: number) => {
   // picked/dragged item style
   if (down && index === originalIndex) {
@@ -59,7 +59,7 @@ const DraggableListWrapper = styled.div`
   }
 `;
 
-function DraggableList({ items, ItemRenderer, onUpdate, itemHeight }: any) {
+function DraggableList({ itemHeight, ItemRenderer, items, onUpdate }: any) {
   // order of items in the list
   const order = useRef<any>(items.map((_: any, index: any) => index));
 
@@ -119,7 +119,7 @@ function DraggableList({ items, ItemRenderer, onUpdate, itemHeight }: any) {
       }}
       style={{ height: items.length * itemHeight }}
     >
-      {springs.map(({ zIndex, y, scale }, i) => (
+      {springs.map(({ scale, y, zIndex }, i) => (
         <animated.div
           {...bind(i)}
           data-rbd-draggable-id={items[i].id}
diff --git a/app/client/src/components/ads/DraggableListComponent.tsx b/app/client/src/components/ads/DraggableListComponent.tsx
index 2f12242fe0..6273e73048 100644
--- a/app/client/src/components/ads/DraggableListComponent.tsx
+++ b/app/client/src/components/ads/DraggableListComponent.tsx
@@ -45,15 +45,15 @@ export class DroppableComponent extends React.Component<
 
   render() {
     const {
-      renderComponent,
       deleteOption,
-      updateOption,
-      toggleVisibility,
       onEdit,
+      renderComponent,
+      toggleVisibility,
+      updateOption,
     } = this.props;
     return (
       <DraggableList
-        ItemRenderer={({ item, index }: any) =>
+        ItemRenderer={({ index, item }: any) =>
           renderComponent({
             deleteOption,
             updateOption,
diff --git a/app/client/src/components/ads/Dropdown.tsx b/app/client/src/components/ads/Dropdown.tsx
index 77e7ce9191..8741a6a8da 100644
--- a/app/client/src/components/ads/Dropdown.tsx
+++ b/app/client/src/components/ads/Dropdown.tsx
@@ -1,9 +1,10 @@
-import React, { useState, useEffect, useCallback } from "react";
+import React, { ReactNode, useState, useEffect, useCallback } from "react";
 import Icon, { IconName, IconSize } from "./Icon";
 import { CommonComponentProps, Classes } from "./common";
 import Text, { TextType } from "./Text";
 import { Popover, Position } from "@blueprintjs/core";
 import styled from "constants/DefaultTheme";
+import { Colors } from "constants/Colors";
 
 export type DropdownOption = {
   label?: string;
@@ -16,6 +17,22 @@ export type DropdownOption = {
   onSelect?: (value?: string) => void;
 };
 
+export interface DefaultDropDownValueNodeProps {
+  selected: DropdownOption;
+  showLabelOnly?: boolean;
+  isOpen?: boolean;
+}
+
+export interface RenderDropdownOptionType {
+  option: DropdownOption;
+  optionClickHandler?: (dropdownOption: DropdownOption) => void;
+}
+
+type RenderOption = ({
+  option,
+  optionClickHandler,
+}: RenderDropdownOptionType) => ReactNode;
+
 export type DropdownProps = CommonComponentProps & {
   options: DropdownOption[];
   selected: DropdownOption;
@@ -25,7 +42,10 @@ export type DropdownProps = CommonComponentProps & {
   showLabelOnly?: boolean;
   optionWidth?: string;
   showDropIcon?: boolean;
+  headerLabel?: string;
   SelectedValueNode?: typeof DefaultDropDownValueNode;
+  bgColor?: string;
+  renderOption?: RenderOption;
 };
 
 export const DropdownContainer = styled.div<{ width: string; height: string }>`
@@ -38,12 +58,15 @@ const Selected = styled.div<{
   isOpen: boolean;
   disabled?: boolean;
   height: string;
+  bgColor?: string;
 }>`
   padding: ${(props) => props.theme.spaces[2]}px
     ${(props) => props.theme.spaces[3]}px;
   background: ${(props) =>
     props.disabled
       ? props.theme.colors.dropdown.header.disabledBg
+      : !!props.bgColor
+      ? props.bgColor
       : props.theme.colors.dropdown.header.bg};
   display: flex;
   align-items: center;
@@ -53,21 +76,31 @@ const Selected = styled.div<{
   cursor: pointer;
   ${(props) =>
     props.isOpen
-      ? `border: 1px solid ${props.theme.colors.info.main}`
+      ? `border: 1px solid ${
+          !!props.bgColor ? props.bgColor : props.theme.colors.info.main
+        }`
       : props.disabled
       ? `border: 1px solid ${props.theme.colors.dropdown.header.disabledBg}`
-      : `border: 1px solid ${props.theme.colors.dropdown.header.bg}`};
+      : `border: 1px solid ${
+          !!props.bgColor
+            ? props.bgColor
+            : props.theme.colors.dropdown.header.bg
+        }`};
   ${(props) =>
     props.isOpen && !props.disabled ? "box-sizing: border-box" : null};
   ${(props) =>
-    props.isOpen && !props.disabled
+    props.isOpen && !props.disabled && !props.bgColor
       ? "box-shadow: 0px 0px 4px 4px rgba(203, 72, 16, 0.18)"
       : null};
   .${Classes.TEXT} {
     ${(props) =>
       props.disabled
         ? `color: ${props.theme.colors.dropdown.header.disabledText}`
-        : `color: ${props.theme.colors.dropdown.header.text}`};
+        : `color: ${
+            !!props.bgColor
+              ? Colors.WHITE
+              : props.theme.colors.dropdown.header.text
+          }`};
   }
 `;
 
@@ -159,6 +192,12 @@ const StyledSubText = styled(Text)`
   }
 `;
 
+const HeaderWrapper = styled.div`
+  color: #6d6d6d;
+  font-size: 10px;
+  padding: 0px 7px 7px 7px;
+`;
+
 const SelectedDropDownHolder = styled.div`
   display: flex;
   align-items: center;
@@ -185,17 +224,17 @@ const SelectedIcon = styled(Icon)`
   }
 `;
 
-function DefaultDropDownValueNode({
+export function DefaultDropDownValueNode({
   selected,
   showLabelOnly,
-}: {
-  selected: DropdownOption;
-  showLabelOnly?: boolean;
-}) {
+}: DefaultDropDownValueNodeProps) {
   return (
     <SelectedDropDownHolder>
       {selected.icon ? (
-        <SelectedIcon name={selected.icon} size={IconSize.XXS} />
+        <SelectedIcon
+          name={selected.icon}
+          size={selected.iconSize || IconSize.XXS}
+        />
       ) : null}
       <Text type={TextType.P1}>
         {showLabelOnly ? selected.label : selected.value}
@@ -209,6 +248,7 @@ export default function Dropdown(props: DropdownProps) {
     onSelect,
     showDropIcon = true,
     SelectedValueNode = DefaultDropDownValueNode,
+    renderOption,
   } = { ...props };
   const [isOpen, setIsOpen] = useState<boolean>(false);
   const [selected, setSelected] = useState<DropdownOption>(props.selected);
@@ -242,6 +282,7 @@ export default function Dropdown(props: DropdownProps) {
         position={Position.BOTTOM_LEFT}
       >
         <Selected
+          bgColor={props.bgColor}
           className={props.className}
           disabled={props.disabled}
           height={props.height || "38px"}
@@ -249,13 +290,23 @@ export default function Dropdown(props: DropdownProps) {
           onClick={() => setIsOpen(!isOpen)}
         >
           <SelectedValueNode
+            isOpen={isOpen}
             selected={selected}
             showLabelOnly={props.showLabelOnly}
           />
           {showDropIcon && <Icon name="downArrow" size={IconSize.XXS} />}
         </Selected>
         <DropdownWrapper width={props.optionWidth || "260px"}>
+          {props.headerLabel && (
+            <HeaderWrapper>{props.headerLabel}</HeaderWrapper>
+          )}
           {props.options.map((option: DropdownOption, index: number) => {
+            if (renderOption) {
+              return renderOption({
+                option,
+                optionClickHandler,
+              });
+            }
             return (
               <OptionWrapper
                 className="t--dropdown-option"
diff --git a/app/client/src/components/ads/EditableText.tsx b/app/client/src/components/ads/EditableText.tsx
index bca0528165..cc80f9a32a 100644
--- a/app/client/src/components/ads/EditableText.tsx
+++ b/app/client/src/components/ads/EditableText.tsx
@@ -43,6 +43,7 @@ export type EditableTextProps = CommonComponentProps & {
   hideEditIcon?: boolean;
   fill?: boolean;
   underline?: boolean;
+  isError?: boolean;
 };
 
 export const EditableTextWrapper = styled.div<{
@@ -154,11 +155,12 @@ const IconWrapper = styled.div`
 
 export function EditableText(props: EditableTextProps) {
   const {
-    onBlur,
-    onTextChanged,
-    isInvalid: inputValidation,
     defaultValue,
     isEditingDefault,
+    isError,
+    isInvalid: inputValidation,
+    onBlur,
+    onTextChanged,
     valueTransform,
   } = props;
   const [isEditing, setIsEditing] = useState(!!isEditingDefault);
@@ -170,6 +172,14 @@ export function EditableText(props: EditableTextProps) {
     SavingState.NOT_STARTED,
   );
 
+  useEffect(() => {
+    if (isError) {
+      // if there is any error occurs while saving appname.
+      // last saved app name will be shown to user.
+      setValue(defaultValue);
+    }
+  }, [isError]);
+
   useEffect(() => {
     setSavingState(props.savingState);
   }, [props.savingState]);
diff --git a/app/client/src/components/ads/EmojiPicker.tsx b/app/client/src/components/ads/EmojiPicker.tsx
index 7829e7ec0e..09f1937f86 100644
--- a/app/client/src/components/ads/EmojiPicker.tsx
+++ b/app/client/src/components/ads/EmojiPicker.tsx
@@ -1,46 +1,62 @@
 import React, { useCallback, useState } from "react";
-import Picker, { IEmojiData } from "emoji-picker-react";
-import { withTheme } from "styled-components";
-import Icon, { IconSize } from "components/ads/Icon";
-import { Popover, Position } from "@blueprintjs/core";
-import { Theme } from "constants/DefaultTheme";
+import { Picker, BaseEmoji } from "emoji-mart";
+import { Popover2 } from "@blueprintjs/popover2";
+import Icon, { IconName, IconSize } from "components/ads/Icon";
+
+import { withTheme } from "styled-components";
+import { Theme } from "constants/DefaultTheme";
+import "@blueprintjs/popover2/lib/css/blueprint-popover2.css";
+import "emoji-mart/css/emoji-mart.css";
 
-// TODO remove: (trigger tests)
 const EmojiPicker = withTheme(
   ({
-    theme,
+    iconName,
+    iconSize,
     onSelectEmoji,
+    theme,
   }: {
+    iconName?: IconName;
     theme: Theme;
-    onSelectEmoji: (e: React.MouseEvent, emojiObject: IEmojiData) => void;
+    onSelectEmoji: (e: React.MouseEvent, emojiObject: BaseEmoji) => void;
+    iconSize?: IconSize;
   }) => {
     const [isOpen, setIsOpen] = useState(false);
 
     const handleSelectEmoji = useCallback(
-      (e: React.MouseEvent, emojiObject: IEmojiData) => {
-        onSelectEmoji(e, emojiObject);
+      (emoji, event) => {
+        onSelectEmoji(event, emoji);
         setIsOpen(false);
       },
       [onSelectEmoji],
     );
 
     return (
-      <Popover
-        boundary="viewport"
+      <Popover2
+        content={
+          <Picker
+            onClick={handleSelectEmoji}
+            showPreview={false}
+            showSkinTones={false}
+            style={{
+              border: "none",
+              borderRadius: 0,
+            }}
+          />
+        }
         isOpen={isOpen}
         minimal
         onInteraction={(nextOpenState) => {
           setIsOpen(nextOpenState);
         }}
-        position={Position.BOTTOM_RIGHT}
+        portalClassName="emoji-picker-portal"
       >
         <Icon
           fillColor={theme.colors.comments.emojiPicker}
-          name="emoji"
-          size={IconSize.LARGE}
+          keepColors
+          name={iconName || "emoji"}
+          size={iconSize || IconSize.XXXL}
         />
-        <Picker onEmojiClick={handleSelectEmoji} />
-      </Popover>
+      </Popover2>
     );
   },
 );
diff --git a/app/client/src/components/ads/EmojiReactions.tsx b/app/client/src/components/ads/EmojiReactions.tsx
new file mode 100644
index 0000000000..cd57d6f64e
--- /dev/null
+++ b/app/client/src/components/ads/EmojiReactions.tsx
@@ -0,0 +1,185 @@
+import React from "react";
+import styled from "styled-components";
+import EmojiPicker from "./EmojiPicker";
+import { IconSize } from "./Icon";
+import TooltipComponent from "./Tooltip";
+
+const Container = styled.div`
+  display: flex;
+  flex-wrap: wrap;
+`;
+
+const Bubble = styled.div<{ active?: boolean }>`
+  font-size: 16px; // emoji
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  padding: ${(props) => `2px ${props.theme.spaces[2]}px`};
+
+  background-color: ${(props) =>
+    props.active
+      ? props.theme.colors.reactionsComponent.reactionBackgroundActive
+      : props.theme.colors.reactionsComponent.reactionBackground};
+
+  border: 1px solid
+    ${(props) =>
+      props.active
+        ? props.theme.colors.reactionsComponent.borderActive
+        : "transparent"};
+
+  border-radius: ${(props) => `${props.theme.radii[4]}px`};
+  margin-left: ${(props) => `${props.theme.radii[1]}px`};
+  &:first-child {
+    margin-left: 0;
+  }
+`;
+
+const Count = styled.div<{ active?: boolean }>`
+  display: inline;
+  color: ${(props) =>
+    props.active
+      ? props.theme.colors.reactionsComponent.textActive
+      : props.theme.colors.reactionsComponent.text};
+  margin-left: ${(props) => props.theme.spaces[1]}px;
+  max-width: 30px;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+`;
+
+const ReactionsByContainer = styled.span`
+  max-width: 200px;
+  display: inline-block;
+`;
+
+function ReactionsBy(props: { reaction: Reaction }) {
+  const { reaction } = props;
+
+  if (!reaction?.users) return null;
+  const isSliced = reaction?.users.length > 5;
+  const users = reaction?.users.slice(0, 5);
+
+  if (isSliced) users.push("...");
+  if (reaction.active) users.unshift("You");
+
+  return <ReactionsByContainer>{users.join(", ")}</ReactionsByContainer>;
+}
+
+export type Reaction = {
+  count: number;
+  reactionEmoji: string;
+  active?: boolean;
+  users?: Array<string>;
+};
+
+export type Reactions = Record<string, Reaction>;
+
+const transformReactions = (reactions: Reactions): Array<Reaction> => {
+  return Object.keys(reactions).map((emojiReaction: string) => ({
+    ...reactions[emojiReaction],
+    emojiReaction,
+  }));
+};
+
+export enum ReactionOperation {
+  ADD = "ADD",
+  REMOVE = "REMOVE",
+}
+
+function EmojiReactions({
+  onSelectReaction,
+  reactions = {},
+  hideReactions = false,
+  iconSize = IconSize.XXL,
+}: {
+  onSelectReaction: (
+    event: React.MouseEvent,
+    emojiData: string,
+    updatedReactions: Reactions,
+    addOrRemove: ReactionOperation,
+  ) => void;
+  reactions?: Reactions;
+  hideReactions?: boolean;
+  iconSize?: IconSize;
+}) {
+  const handleSelectReaction = (
+    _event: React.MouseEvent,
+    emojiData: string,
+  ) => {
+    const reactionsObject = reactions[emojiData];
+    let addOrRemove;
+    if (reactionsObject) {
+      if (reactionsObject.active) {
+        addOrRemove = ReactionOperation.REMOVE;
+        reactions[emojiData] = {
+          active: false,
+          reactionEmoji: emojiData,
+          count: reactionsObject.count - 1,
+        };
+        if (reactions[emojiData].count === 0) delete reactions[emojiData];
+      } else {
+        addOrRemove = ReactionOperation.ADD;
+        reactions[emojiData] = {
+          active: true,
+          reactionEmoji: emojiData,
+          count: reactionsObject.count + 1,
+        };
+      }
+    } else {
+      addOrRemove = ReactionOperation.ADD;
+      reactions[emojiData] = {
+        active: true,
+        reactionEmoji: emojiData,
+        count: 1,
+      };
+    }
+    onSelectReaction(
+      _event,
+      emojiData,
+      { ...reactions },
+      addOrRemove as ReactionOperation,
+    );
+  };
+
+  return (
+    <Container>
+      {!hideReactions &&
+        transformReactions(reactions).map((reaction: Reaction) => (
+          <TooltipComponent
+            boundary={"viewport"}
+            content={<ReactionsBy reaction={reaction} />}
+            disabled={!reaction.users || reaction.users.length === 0}
+            key={reaction.reactionEmoji}
+            modifiers={{ preventOverflow: { enabled: true } }}
+          >
+            <Bubble
+              active={reaction.active}
+              onClick={(e) => handleSelectReaction(e, reaction.reactionEmoji)}
+            >
+              <span>{reaction.reactionEmoji}</span>
+              {reaction.count > 1 && (
+                <Count active={reaction.active}>{reaction.count}</Count>
+              )}
+            </Bubble>
+          </TooltipComponent>
+        ))}
+      {!hideReactions ? (
+        <Bubble>
+          <EmojiPicker
+            iconName="reaction"
+            iconSize={iconSize}
+            onSelectEmoji={(e, emoji) => handleSelectReaction(e, emoji.native)}
+          />
+        </Bubble>
+      ) : (
+        <EmojiPicker
+          iconName="reaction-2"
+          iconSize={iconSize}
+          onSelectEmoji={(e, emoji) => handleSelectReaction(e, emoji.native)}
+        />
+      )}
+    </Container>
+  );
+}
+
+export default EmojiReactions;
diff --git a/app/client/src/components/ads/FilePicker.tsx b/app/client/src/components/ads/FilePicker.tsx
index 1d5d6936b4..4ccffaa125 100644
--- a/app/client/src/components/ads/FilePicker.tsx
+++ b/app/client/src/components/ads/FilePicker.tsx
@@ -3,28 +3,52 @@ import styled from "styled-components";
 import Button, { Category, Size } from "./Button";
 import axios from "axios";
 import { ReactComponent as UploadIcon } from "../../assets/icons/ads/upload.svg";
+import { ReactComponent as UploadSuccessIcon } from "../../assets/icons/ads/upload_success.svg";
 import { DndProvider, useDrop, DropTargetMonitor } from "react-dnd";
 import HTML5Backend, { NativeTypes } from "react-dnd-html5-backend";
 import Text, { TextType } from "./Text";
 import { Classes, Variant } from "./common";
 import { Toaster } from "./Toast";
-import { createMessage, ERROR_FILE_TOO_LARGE } from "constants/messages";
-
+import {
+  createMessage,
+  ERROR_FILE_TOO_LARGE,
+  REMOVE_FILE_TOOL_TIP,
+} from "constants/messages";
+import TooltipComponent from "components/ads/Tooltip";
+import { Position } from "@blueprintjs/core/lib/esm/common/position";
+import Icon, { IconSize } from "./Icon";
 const CLOUDINARY_PRESETS_NAME = "";
 const CLOUDINARY_CLOUD_NAME = "";
 
+const FileEndings = {
+  IMAGE: ".jpeg,.png,.svg",
+  JSON: ".json",
+  TEXT: ".txt",
+  ANY: "*",
+};
+
+export enum FileType {
+  IMAGE = "IMAGE",
+  JSON = "JSON",
+  TEXT = "TEXT",
+  ANY = "ANY",
+}
+
 type FilePickerProps = {
   onFileUploaded?: (fileUrl: string) => void;
   onFileRemoved?: () => void;
   fileUploader?: FileUploader;
   url?: string;
   logoUploadError?: string;
+  fileType: FileType;
+  delayedUpload?: boolean;
 };
 
 const ContainerDiv = styled.div<{
   isUploaded: boolean;
   isActive: boolean;
   canDrop: boolean;
+  fileType: FileType;
 }>`
   width: 320px;
   height: 190px;
@@ -41,7 +65,7 @@ const ContainerDiv = styled.div<{
     color: ${(props) => props.theme.colors.filePicker.color};
   }
 
-  .bg-image {
+  .upload-form-container {
     width: 100%;
     height: 100%;
     display: grid;
@@ -51,15 +75,36 @@ const ContainerDiv = styled.div<{
     background-size: contain;
   }
 
+  .centered {
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+
+    .success-container {
+      display: flex;
+      align-items: center;
+      .success-icon {
+        margin-right: ${(props) => props.theme.spaces[4]}px;
+      }
+
+      .success-text {
+        color: #03b365;
+        margin-right: ${(props) => props.theme.spaces[4]}px;
+      }
+    }
+  }
+
   .file-description {
     width: 95%;
-    margin-top: auto;
+    margin: 0 auto;
+    margin-top: ${(props) =>
+      props.fileType === FileType.IMAGE ? "auto" : "0px"};
     margin-bottom: ${(props) => props.theme.spaces[6] + 1}px;
     display: none;
   }
 
   .file-spec {
-    margin-bottom: ${(props) => props.theme.spaces[2]}px;
+    margin-bottom: ${(props) => props.theme.spaces[3]}px;
     span {
       margin-right: ${(props) => props.theme.spaces[4]}px;
     }
@@ -116,6 +161,11 @@ const ContainerDiv = styled.div<{
   }
 `;
 
+const IconWrapper = styled.div`
+  width: ${(props) => props.theme.spaces[9]}px;
+  padding-left: ${(props) => props.theme.spaces[2]}px;
+`;
+
 export type SetProgress = (percentage: number) => void;
 export type UploadCallback = (url: string) => void;
 export type FileUploader = (
@@ -159,7 +209,7 @@ export function CloudinaryUploader(
 }
 
 function FilePickerComponent(props: FilePickerProps) {
-  const { logoUploadError } = props;
+  const { fileType, logoUploadError } = props;
   const [fileInfo, setFileInfo] = useState<{ name: string; size: number }>({
     name: "",
     size: 0,
@@ -207,7 +257,7 @@ function FilePickerComponent(props: FilePickerProps) {
     }
     if (uploadPercentage === 100) {
       setIsUploaded(true);
-      if (fileDescRef.current && bgRef.current) {
+      if (fileDescRef.current && bgRef.current && fileType === FileType.IMAGE) {
         fileDescRef.current.style.display = "none";
         bgRef.current.style.opacity = "1";
       }
@@ -219,6 +269,35 @@ function FilePickerComponent(props: FilePickerProps) {
   }
 
   function handleFileUpload(files: FileList | null) {
+    if (fileType === FileType.IMAGE) {
+      handleImageFileUpload(files);
+    } else {
+      handleOtherFileUpload(files);
+    }
+  }
+
+  function handleOtherFileUpload(files: FileList | null) {
+    const file = files && files[0];
+    let fileSize = 0;
+    if (!file) {
+      return;
+    }
+    fileSize = Math.floor(file.size / 1024);
+    setFileInfo({ name: file.name, size: fileSize });
+    if (props.delayedUpload) {
+      setIsUploaded(true);
+      setProgress(100);
+    }
+    if (fileDescRef.current) {
+      fileDescRef.current.style.display = "flex";
+    }
+    if (fileContainerRef.current) {
+      fileContainerRef.current.style.display = "none";
+    }
+    props.fileUploader && props.fileUploader(file, setProgress, onUpload);
+  }
+
+  function handleImageFileUpload(files: FileList | null) {
     const file = files && files[0];
     let fileSize = 0;
 
@@ -253,10 +332,15 @@ function FilePickerComponent(props: FilePickerProps) {
   }
 
   function removeFile() {
-    if (fileContainerRef.current && bgRef.current) {
+    if (fileContainerRef.current) {
       setFileUrl("");
+      if (fileDescRef.current) {
+        fileDescRef.current.style.display = "none";
+      }
       fileContainerRef.current.style.display = "flex";
-      bgRef.current.style.backgroundImage = "url('')";
+      if (bgRef.current) {
+        bgRef.current.style.backgroundImage = "url('')";
+      }
       setIsUploaded(false);
       props.onFileRemoved && props.onFileRemoved();
     }
@@ -275,8 +359,9 @@ function FilePickerComponent(props: FilePickerProps) {
     }
   }, [props.url]);
 
+  // Following hook should be used only if file type is image.
   useEffect(() => {
-    if (fileUrl && !isUploaded) {
+    if (fileUrl && !isUploaded && fileType === FileType.IMAGE) {
       setIsUploaded(true);
       if (bgRef.current) {
         bgRef.current.style.backgroundImage = `url(${fileUrl})`;
@@ -291,42 +376,47 @@ function FilePickerComponent(props: FilePickerProps) {
     }
   }, [fileUrl, logoUploadError]);
 
-  return (
-    <ContainerDiv
-      canDrop={canDrop}
-      isActive={isActive}
-      isUploaded={isUploaded}
-      ref={drop}
-    >
-      <div className="bg-image" ref={bgRef}>
-        <div className="button-wrapper" ref={fileContainerRef}>
-          <UploadIcon />
-          <Text className="drag-drop-text" type={TextType.P2}>
-            Drag & Drop files to upload or
-          </Text>
-          <form>
-            <input
-              accept=".jpeg,.png,.svg"
-              id="fileInput"
-              multiple={false}
-              onChange={(el) => handleFileUpload(el.target.files)}
-              ref={inputRef}
-              type="file"
-              value={""}
-            />
-            <Button
-              category={Category.tertiary}
-              onClick={(el) => ButtonClick(el)}
-              size={Size.medium}
-              text="Browse"
-            />
-          </form>
-        </div>
+  // <UploadSuccessIcon />
+
+  const uploadFileForm = (
+    <div className="button-wrapper" ref={fileContainerRef}>
+      <UploadIcon />
+      <Text className="drag-drop-text" type={TextType.P2}>
+        Drag & Drop files to upload or
+      </Text>
+      <form>
+        <input
+          accept={FileEndings[fileType]}
+          id="fileInput"
+          multiple={false}
+          onChange={(el) => handleFileUpload(el.target.files)}
+          ref={inputRef}
+          type="file"
+          value={""}
+        />
+        <Button
+          category={Category.tertiary}
+          onClick={(el) => ButtonClick(el)}
+          size={Size.medium}
+          text="Browse"
+        />
+      </form>
+    </div>
+  );
+
+  const uploadStatus = (
+    <div className="file-spec">
+      <Text type={TextType.H6}>{fileInfo.name}</Text>
+      <Text type={TextType.H6}>{fileInfo.size}KB</Text>
+    </div>
+  );
+
+  const imageUploadComponent = (
+    <>
+      <div className="upload-form-container" ref={bgRef}>
+        {uploadFileForm}
         <div className="file-description" id="fileDesc" ref={fileDescRef}>
-          <div className="file-spec">
-            <Text type={TextType.H6}>{fileInfo.name}</Text>
-            <Text type={TextType.H6}>{fileInfo.size}KB</Text>
-          </div>
+          {uploadStatus}
           <div className="progress-container">
             <div className="progress-inner" ref={progressRef} />
           </div>
@@ -341,6 +431,45 @@ function FilePickerComponent(props: FilePickerProps) {
           text="remove"
         />
       </div>
+    </>
+  );
+
+  const uploadComponent = (
+    <div className="upload-form-container">
+      {uploadFileForm}
+      <div
+        className="file-description centered"
+        id="fileDesc"
+        ref={fileDescRef}
+      >
+        {uploadStatus}
+        <div className="success-container">
+          <UploadSuccessIcon className="success-icon" />
+          <Text className="success-text" type={TextType.H4}>
+            Successfully Uploaded!
+          </Text>
+          <TooltipComponent
+            content={REMOVE_FILE_TOOL_TIP()}
+            position={Position.TOP}
+          >
+            <IconWrapper className="icon-wrapper" onClick={() => removeFile()}>
+              <Icon name="close" size={IconSize.XL} />
+            </IconWrapper>
+          </TooltipComponent>
+        </div>
+      </div>
+    </div>
+  );
+
+  return (
+    <ContainerDiv
+      canDrop={canDrop}
+      fileType={fileType}
+      isActive={isActive}
+      isUploaded={isUploaded}
+      ref={drop}
+    >
+      {fileType === FileType.IMAGE ? imageUploadComponent : uploadComponent}
     </ContainerDiv>
   );
 }
diff --git a/app/client/src/components/ads/Icon.tsx b/app/client/src/components/ads/Icon.tsx
index 17c778094a..109f5a704e 100644
--- a/app/client/src/components/ads/Icon.tsx
+++ b/app/client/src/components/ads/Icon.tsx
@@ -3,6 +3,7 @@ import { ReactComponent as DeleteIcon } from "assets/icons/ads/delete.svg";
 import { ReactComponent as BookIcon } from "assets/icons/ads/book.svg";
 import { ReactComponent as BugIcon } from "assets/icons/ads/bug.svg";
 import { ReactComponent as CancelIcon } from "assets/icons/ads/cancel.svg";
+import { ReactComponent as ExpandMore } from "assets/icons/ads/expand-more.svg";
 import { ReactComponent as CrossIcon } from "assets/icons/ads/cross.svg";
 import { ReactComponent as OpenIcon } from "assets/icons/ads/open.svg";
 import { ReactComponent as UserIcon } from "assets/icons/ads/user.svg";
@@ -39,6 +40,7 @@ import { ReactComponent as NoResponseIcon } from "assets/icons/ads/no-response.s
 import { ReactComponent as LightningIcon } from "assets/icons/ads/lightning.svg";
 import { ReactComponent as AddMoreIcon } from "assets/icons/ads/add-more.svg";
 import { ReactComponent as RightArrowIcon } from "assets/icons/ads/right-arrow.svg";
+import { ReactComponent as TrendingFlat } from "assets/icons/ads/trending-flat.svg";
 import { ReactComponent as DatasourceIcon } from "assets/icons/ads/datasource.svg";
 import { ReactComponent as PlayIcon } from "assets/icons/ads/play.svg";
 import { ReactComponent as DesktopIcon } from "assets/icons/ads/desktop.svg";
@@ -53,8 +55,24 @@ import { ReactComponent as Pin } from "assets/icons/comments/pin.svg";
 import { ReactComponent as OvalCheck } from "assets/icons/comments/check-oval.svg";
 import { ReactComponent as ContextMenu } from "assets/icons/ads/context-menu.svg";
 import { ReactComponent as Trash } from "assets/icons/comments/trash.svg";
-import { ReactComponent as Pin2 } from "assets/icons/comments/pin_2.svg";
+import { ReactComponent as ReadPin } from "assets/icons/comments/read-pin.svg";
+import { ReactComponent as UnreadPin } from "assets/icons/comments/unread-pin.svg";
 import { ReactComponent as Link2 } from "assets/icons/comments/link.svg";
+import { ReactComponent as CommentContextMenu } from "assets/icons/comments/context-menu.svg";
+import { ReactComponent as DownArrow2 } from "assets/icons/comments/down-arrow.svg";
+import { ReactComponent as Filter } from "assets/icons/comments/filter.svg";
+import { ReactComponent as Chat } from "assets/icons/comments/chat.svg";
+import { ReactComponent as Pin3 } from "assets/icons/comments/pin_3.svg";
+import { ReactComponent as Unpin } from "assets/icons/comments/unpin.svg";
+import { ReactComponent as Reaction } from "assets/icons/comments/reaction.svg";
+import { ReactComponent as Reaction2 } from "assets/icons/comments/reaction-2.svg";
+import { ReactComponent as Upload } from "assets/icons/ads/upload.svg";
+import { ReactComponent as Download } from "assets/icons/ads/download.svg";
+import { ReactComponent as ArrowForwardIcon } from "assets/icons/control/arrow_forward.svg";
+import { ReactComponent as CapSolidIcon } from "assets/icons/control/cap_solid.svg";
+import { ReactComponent as CapDotIcon } from "assets/icons/control/cap_dot.svg";
+import { ReactComponent as LineDottedIcon } from "assets/icons/control/line_dotted.svg";
+import { ReactComponent as LineDashedIcon } from "assets/icons/control/line_dashed.svg";
 import styled from "styled-components";
 import { CommonComponentProps, Classes } from "./common";
 import { noop } from "lodash";
@@ -108,11 +126,14 @@ export const sizeHandler = (size?: IconSize) => {
 };
 
 export const IconCollection = [
+  "upload",
+  "download",
   "book",
   "bug",
   "cancel",
   "cross",
   "delete",
+  "expand-more",
   "open",
   "user",
   "general",
@@ -149,6 +170,7 @@ export const IconCollection = [
   "lightning",
   "add-more",
   "right-arrow",
+  "trending-flat",
   "datasource",
   "play",
   "desktop",
@@ -168,9 +190,23 @@ export const IconCollection = [
   "PARAGRAPH_TWO",
   "context-menu",
   "trash",
-  "pin-2",
   "link-2",
   "close-x",
+  "comment-context-menu",
+  "down-arrow-2",
+  "read-pin",
+  "unread-pin",
+  "filter",
+  "chat",
+  "pin-3",
+  "unpin",
+  "reaction",
+  "reaction-2",
+  "arrow-forward",
+  "cap-solid",
+  "cap-dot",
+  "line-dotted",
+  "line-dashed",
 ] as const;
 
 export type IconName = typeof IconCollection[number];
@@ -203,17 +239,22 @@ export const IconWrapper = styled.span<IconProps>`
       !props.keepColors
         ? `
     path {
-      fill: ${props.theme.colors.icon.hover};
+      fill: ${props.hoverFillColor || props.theme.colors.icon.hover};
     }
     `
         : ""}
   }
 
-  &:active {
+  &:hover {
     cursor: pointer;
+    ${(props) =>
+      !props.keepColors
+        ? `
     path {
-      fill: ${(props) => props.theme.colors.icon.active};
+      fill: ${props.hoverFillColor || props.theme.colors.icon.hover};
     }
+    `
+        : ""}
   }
 `;
 
@@ -224,6 +265,7 @@ export type IconProps = {
   className?: string;
   onClick?: (e: React.MouseEvent) => void;
   fillColor?: string;
+  hoverFillColor?: string;
   keepColors?: boolean;
 };
 
@@ -246,6 +288,9 @@ const Icon = forwardRef(
       case "delete":
         returnIcon = <DeleteIcon />;
         break;
+      case "expand-more":
+        returnIcon = <ExpandMore />;
+        break;
       case "open":
         returnIcon = <OpenIcon />;
         break;
@@ -358,6 +403,9 @@ const Icon = forwardRef(
       case "right-arrow":
         returnIcon = <RightArrowIcon />;
         break;
+      case "trending-flat":
+        returnIcon = <TrendingFlat />;
+        break;
       case "datasource":
         returnIcon = <DatasourceIcon />;
         break;
@@ -405,8 +453,12 @@ const Icon = forwardRef(
         returnIcon = <ContextMenu />;
         break;
 
-      case "pin-2":
-        returnIcon = <Pin2 />;
+      case "read-pin":
+        returnIcon = <ReadPin />;
+        break;
+
+      case "unread-pin":
+        returnIcon = <UnreadPin />;
         break;
 
       case "link-2":
@@ -417,6 +469,66 @@ const Icon = forwardRef(
         returnIcon = <Trash />;
         break;
 
+      case "comment-context-menu":
+        returnIcon = <CommentContextMenu />;
+        break;
+
+      case "down-arrow-2":
+        returnIcon = <DownArrow2 />;
+        break;
+
+      case "filter":
+        returnIcon = <Filter />;
+        break;
+
+      case "chat":
+        returnIcon = <Chat />;
+        break;
+
+      case "pin-3":
+        returnIcon = <Pin3 />;
+        break;
+
+      case "unpin":
+        returnIcon = <Unpin />;
+        break;
+
+      case "reaction":
+        returnIcon = <Reaction />;
+        break;
+
+      case "reaction-2":
+        returnIcon = <Reaction2 />;
+        break;
+
+      case "upload":
+        returnIcon = <Upload />;
+        break;
+
+      case "download":
+        returnIcon = <Download />;
+        break;
+
+      case "arrow-forward":
+        returnIcon = <ArrowForwardIcon />;
+        break;
+
+      case "cap-solid":
+        returnIcon = <CapSolidIcon />;
+        break;
+
+      case "cap-dot":
+        returnIcon = <CapDotIcon />;
+        break;
+
+      case "line-dotted":
+        returnIcon = <LineDottedIcon />;
+        break;
+
+      case "line-dashed":
+        returnIcon = <LineDashedIcon />;
+        break;
+
       default:
         returnIcon = null;
         break;
diff --git a/app/client/src/components/ads/IconTabsComponent.tsx b/app/client/src/components/ads/IconTabsComponent.tsx
index 0ea7d8e293..a4c7909255 100644
--- a/app/client/src/components/ads/IconTabsComponent.tsx
+++ b/app/client/src/components/ads/IconTabsComponent.tsx
@@ -3,7 +3,8 @@ import styled from "styled-components";
 import { ControlIcons, ControlIconName } from "icons/ControlIcons";
 
 const ItemWrapper = styled.div<{ selected: boolean }>`
-  width: 32px;
+  width: auto;
+  padding: 0 5px;
   height: 32px;
   display: flex;
   align-items: center;
@@ -30,6 +31,7 @@ const FlexWrapper = styled.div`
 export interface IconTabOption {
   icon: string;
   value: string;
+  width?: number;
 }
 
 interface IconTabsComponentProps {
@@ -41,21 +43,23 @@ interface IconTabsComponentProps {
 function IconTabsComponent(props: IconTabsComponentProps) {
   return (
     <FlexWrapper>
-      {props.options.map((option: IconTabOption, index: number) => {
-        const controlIconName: ControlIconName = option.icon;
-        const ControlIcon = ControlIcons[controlIconName];
-        const isSelected = props.value === option.value;
-        return (
-          <ItemWrapper
-            className={`t--icon-tab-${option.value}`}
-            key={index}
-            onClick={() => props.selectOption(option.value)}
-            selected={isSelected}
-          >
-            <ControlIcon height={24} width={24} />
-          </ItemWrapper>
-        );
-      })}
+      {props.options.map(
+        ({ icon, value, width = 24 }: IconTabOption, index: number) => {
+          const controlIconName: ControlIconName = icon;
+          const ControlIcon = ControlIcons[controlIconName];
+          const isSelected = props.value === value;
+          return (
+            <ItemWrapper
+              className={`t--icon-tab-${value}`}
+              key={index}
+              onClick={() => props.selectOption(value)}
+              selected={isSelected}
+            >
+              <ControlIcon height={24} width={width} />
+            </ItemWrapper>
+          );
+        },
+      )}
     </FlexWrapper>
   );
 }
diff --git a/app/client/src/components/ads/MentionsInput.tsx b/app/client/src/components/ads/MentionsInput.tsx
index 94525cb16f..18640a24db 100644
--- a/app/client/src/components/ads/MentionsInput.tsx
+++ b/app/client/src/components/ads/MentionsInput.tsx
@@ -1,16 +1,126 @@
 import React, { useCallback, useMemo, useRef, useState } from "react";
 import { DraftHandleValue, EditorState } from "draft-js";
 import Editor from "@draft-js-plugins/editor";
+import ProfileImage, { Profile } from "pages/common/ProfileImage";
+
 import createMentionPlugin, { MentionData } from "@draft-js-plugins/mention";
 import styled from "styled-components";
 
 import "@draft-js-plugins/mention/lib/plugin.css";
 import "draft-js/dist/Draft.css";
+import { getTypographyByKey } from "constants/DefaultTheme";
+import { EntryComponentProps } from "@draft-js-plugins/mention/lib/MentionSuggestions/Entry/Entry";
+
+import Icon from "components/ads/Icon";
+
+import { INVITE_A_NEW_USER, createMessage } from "constants/messages";
+import { USER_PHOTO_URL } from "constants/userConstants";
+
+const StyledMention = styled.span`
+  color: ${(props) => props.theme.colors.comments.mention};
+`;
+
+export function MentionComponent(props: {
+  children: React.ReactNode;
+  entityKey: string;
+}) {
+  const { children } = props;
+  return <StyledMention>@{children}</StyledMention>;
+}
+
+export enum Trigger {
+  "@" = "@",
+  "+" = "+",
+}
+
+const StyledSuggestionsComponent = styled.div<{ isFocused?: boolean }>`
+  display: flex;
+  padding: ${(props) =>
+    `${props.theme.spaces[4]}px ${props.theme.spaces[6]}px`};
+
+  & ${Profile} {
+    margin-right: ${(props) => props.theme.spaces[4]}px;
+  }
+  align-items: center;
+
+  &:hover {
+    background-color: ${(props) => props.theme.colors.mentionSuggestion.hover};
+  }
+
+  ${(props) =>
+    props.isFocused
+      ? `
+  background-color: ${props.theme.colors.mentionSuggestion.hover};
+  `
+      : ""}
+`;
+
+const Name = styled.div`
+  ${(props) => getTypographyByKey(props, "h5")}
+  color: ${(props) => props.theme.colors.mentionSuggestion.nameText};
+`;
+
+const Username = styled.div`
+  ${(props) => getTypographyByKey(props, "p3")}
+  color: ${(props) => props.theme.colors.mentionSuggestion.usernameText};
+`;
+
+const PlusCircle = styled.div`
+  width: 25px;
+  height: 25px;
+  display: flex;
+  border-radius: 50%;
+  align-items: center;
+  justify-content: center;
+  background-color: ${(props) =>
+    props.theme.colors.mentionsInput.mentionsInviteBtnPlusIcon};
+  & svg path {
+    stroke: #fff;
+  }
+  margin-right: ${(props) => props.theme.spaces[4]}px;
+`;
+
+function SuggestionComponent(props: EntryComponentProps) {
+  // eslint-disable-next-line  @typescript-eslint/no-unused-vars
+  const { theme, ...parentProps } = props;
+  const { user } = props.mention;
+
+  if (props.mention?.isInviteTrigger) {
+    return (
+      <StyledSuggestionsComponent {...parentProps}>
+        <PlusCircle>
+          <Icon fillColor="#fff" name="plus" />
+        </PlusCircle>
+        <div>
+          <Name>{createMessage(INVITE_A_NEW_USER)}</Name>
+          <Username>{props.mention.name}</Username>
+        </div>
+      </StyledSuggestionsComponent>
+    );
+  }
+
+  return (
+    <StyledSuggestionsComponent {...parentProps}>
+      <ProfileImage
+        side={25}
+        source={`/api/${USER_PHOTO_URL}/${user?.username}`}
+        userName={user?.username || ""}
+      />
+      <div>
+        <Name>{props.mention.name}</Name>
+        <Username>{user?.username}</Username>
+      </div>
+    </StyledSuggestionsComponent>
+  );
+}
 
 const StyledContainer = styled.div`
-  max-height: 60px;
   overflow: auto;
   flex: 1;
+
+  & [id^="mentions-list"] {
+    padding: 0;
+  }
 `;
 
 type Props = {
@@ -19,24 +129,30 @@ type Props = {
   editorState: EditorState;
   setEditorState: (editorState: EditorState) => void;
   readOnly?: boolean;
-  onSearchSuggestions: ({ value }: { value: string }) => void;
+  onSearchSuggestions: (props: { value: string; trigger: string }) => void;
   autoFocus: boolean;
   placeholder?: string;
+  onAddMention?: (mention: MentionData) => void;
 };
 
 function MentionsInput({
-  onSubmit,
-  suggestions,
-  onSearchSuggestions,
-  editorState,
-  setEditorState,
   autoFocus,
+  editorState,
+  onAddMention,
+  onSearchSuggestions,
+  onSubmit,
   placeholder,
+  setEditorState,
+  suggestions,
 }: Props) {
   const ref = useRef<Editor | null>(null);
   const [open, setOpen] = useState(false);
   const { MentionSuggestions, plugins } = useMemo(() => {
-    const mentionPlugin = createMentionPlugin({ mentionTrigger: "@" });
+    const mentionPlugin = createMentionPlugin({
+      mentionRegExp: "[\\w@\\._]",
+      mentionTrigger: ["@", "+"],
+      mentionComponent: MentionComponent,
+    });
     const { MentionSuggestions } = mentionPlugin;
     return { plugins: [mentionPlugin], MentionSuggestions };
   }, []);
@@ -79,13 +195,16 @@ function MentionsInput({
         ref={setRef}
       />
       <MentionSuggestions
+        entryComponent={SuggestionComponent}
+        onAddMention={(mention: MentionData) => {
+          if (onAddMention) {
+            onAddMention(mention);
+          }
+        }}
         onOpenChange={onOpenChange}
         onSearchChange={onSearchSuggestions}
         open={open}
         suggestions={suggestions}
-        // onAddMention={() => {
-        //   // get the mention object selected
-        // }}
       />
     </StyledContainer>
   );
diff --git a/app/client/src/components/ads/Menu.tsx b/app/client/src/components/ads/Menu.tsx
index dc3437cba9..b235273c38 100644
--- a/app/client/src/components/ads/Menu.tsx
+++ b/app/client/src/components/ads/Menu.tsx
@@ -12,6 +12,8 @@ type MenuProps = CommonComponentProps & {
   onOpening?: (node: HTMLElement) => void;
   onClosing?: (node: HTMLElement) => void;
   modifiers?: PopperModifiers;
+  isOpen?: boolean;
+  onClose?: () => void;
 };
 
 const MenuWrapper = styled.div`
@@ -30,8 +32,10 @@ function Menu(props: MenuProps) {
       className={props.className}
       data-cy={props.cypressSelector}
       disabled={props.disabled}
+      isOpen={props.isOpen}
       minimal
       modifiers={props.modifiers}
+      onClose={props.onClose}
       onClosing={props.onClosing}
       onOpening={props.onOpening}
       portalClassName={props.className}
diff --git a/app/client/src/components/ads/Radio.tsx b/app/client/src/components/ads/Radio.tsx
index 2d89c7e2d3..cbb38db562 100644
--- a/app/client/src/components/ads/Radio.tsx
+++ b/app/client/src/components/ads/Radio.tsx
@@ -15,6 +15,7 @@ export type RadioProps = CommonComponentProps & {
   defaultValue: string;
   onSelect?: (value: string) => void;
   options: OptionProps[];
+  backgroundColor?: string;
 };
 
 const RadioGroup = styled.div<{
@@ -35,10 +36,11 @@ const RadioGroup = styled.div<{
       : null};
 `;
 
-const Radio = styled.label<{
+export const Radio = styled.label<{
   disabled?: boolean;
   columns?: number;
   rows?: number;
+  backgroundColor?: string;
 }>`
   display: block;
   position: relative;
@@ -100,7 +102,8 @@ const Radio = styled.label<{
     ${(props) =>
       props.disabled
         ? `background-color: ${props.theme.colors.radio.disabled}`
-        : `background-color: ${props.theme.colors.info.main};`};
+        : `background-color: ${props.backgroundColor ||
+            props.theme.colors.info.main};`};
     top: ${(props) => props.theme.spaces[1] - 2}px;
     left: ${(props) => props.theme.spaces[1] - 2}px;
     border-radius: 50%;
@@ -137,6 +140,7 @@ export default function RadioComponent(props: RadioProps) {
     >
       {props.options.map((option: OptionProps, index: number) => (
         <Radio
+          backgroundColor={props.backgroundColor}
           columns={props.columns}
           disabled={props.disabled || option.disabled}
           key={index}
diff --git a/app/client/src/components/ads/ScrollIndicator.tsx b/app/client/src/components/ads/ScrollIndicator.tsx
index c9219337b0..7ffc3fafef 100644
--- a/app/client/src/components/ads/ScrollIndicator.tsx
+++ b/app/client/src/components/ads/ScrollIndicator.tsx
@@ -53,11 +53,11 @@ interface Props {
   mode?: "DARK" | "LIGHT";
 }
 function ScrollIndicator({
-  containerRef,
-  top,
-  bottom,
-  right,
   alwaysShowScrollbar,
+  bottom,
+  containerRef,
+  right,
+  top,
 }: Props) {
   const [{ thumbPosition }, setThumbPosition] = useSpring<{
     thumbPosition: number;
diff --git a/app/client/src/components/ads/ShowcaseCarousel.tsx b/app/client/src/components/ads/ShowcaseCarousel.tsx
new file mode 100644
index 0000000000..007fd9689a
--- /dev/null
+++ b/app/client/src/components/ads/ShowcaseCarousel.tsx
@@ -0,0 +1,117 @@
+import React, { useState } from "react";
+import Button, { Category, Size } from "components/ads/Button";
+
+import styled from "styled-components";
+import { createMessage, NEXT, BACK } from "constants/messages";
+import { useTransition, animated } from "react-spring";
+
+const Container = styled.div`
+  box-shadow: 1px 0px 10px 5px rgba(0, 0, 0, 0.15);
+`;
+
+const Footer = styled.div`
+  padding: ${(props) => props.theme.spaces[7]}px;
+  justify-content: space-between;
+  display: flex;
+`;
+
+const Dot = styled.div<{ active: boolean }>`
+  width: 5px;
+  height: 5px;
+  border-radius: 50%;
+  margin-right: ${(props) => props.theme.spaces[1]}px;
+  background-color: ${(props) =>
+    props.active
+      ? props.theme.colors.showcaseCarousel.activeStepDot
+      : props.theme.colors.showcaseCarousel.inactiveStepDot};
+`;
+
+const Row = styled.div`
+  display: flex;
+  align-items: center;
+`;
+
+const Buttons = styled.div`
+  display: flex;
+  & button:last-child {
+    margin-left: ${(props) => props.theme.spaces[1]}px;
+`;
+
+type Step = {
+  component: any;
+  props: any;
+};
+
+export type Steps = Array<Step>;
+
+type Props = {
+  steps: Steps;
+};
+
+type DotsProps = {
+  count: number;
+  activeIndex: number;
+};
+
+function Dots(props: DotsProps) {
+  return (
+    <Row>
+      {Array.from(new Array(props.count)).map((_a, index) => (
+        <Dot active={index === props.activeIndex} key={index} />
+      ))}
+    </Row>
+  );
+}
+
+export default function ShowcaseCarousel(props: Props) {
+  const { steps } = props;
+  const [activeIndex, setCurrentIdx] = useState(0);
+  const currentStep = steps[activeIndex];
+  const { component: ContentComponent, props: componentProps } = currentStep;
+  const length = steps.length;
+
+  const transition = useTransition("key", null, {
+    from: { transform: "translateY(+2%)" },
+    enter: { transform: "translateY(0%)" },
+    leave: { transform: "translateY(0%)" },
+    config: { duration: 300 },
+  });
+
+  return (
+    <Container>
+      {transition.map(
+        ({ item, props: springProps }: { item: string; props: any }) => (
+          <animated.div key={item} style={springProps}>
+            <ContentComponent {...componentProps} />
+          </animated.div>
+        ),
+      )}
+      <Footer>
+        <Dots activeIndex={activeIndex} count={length} />
+        <Buttons>
+          {!componentProps.hideBackBtn && (
+            <Button
+              category={Category.tertiary}
+              onClick={() => setCurrentIdx(Math.max(0, activeIndex - 1))}
+              size={Size.large}
+              tag="button"
+              text={createMessage(BACK)}
+            />
+          )}
+          <Button
+            disabled={componentProps.isSubmitDisabled}
+            onClick={() => {
+              setCurrentIdx(Math.min(length - 1, activeIndex + 1));
+              if (typeof componentProps.onSubmit === "function") {
+                componentProps.onSubmit();
+              }
+            }}
+            size={Size.large}
+            tag="button"
+            text={componentProps.nextBtnText || createMessage(NEXT)}
+          />
+        </Buttons>
+      </Footer>
+    </Container>
+  );
+}
diff --git a/app/client/src/components/ads/Table.tsx b/app/client/src/components/ads/Table.tsx
index fdfd1501be..2c1f3d8e5c 100644
--- a/app/client/src/components/ads/Table.tsx
+++ b/app/client/src/components/ads/Table.tsx
@@ -93,14 +93,14 @@ interface TableProps {
 }
 
 function Table(props: TableProps) {
-  const { data, columns } = props;
+  const { columns, data } = props;
 
   const {
-    getTableProps,
     getTableBodyProps,
+    getTableProps,
     headerGroups,
-    rows,
     prepareRow,
+    rows,
   } = useTable({ columns, data }, useSortBy);
 
   return (
diff --git a/app/client/src/components/ads/Tabs.tsx b/app/client/src/components/ads/Tabs.tsx
index a70206d531..2a52390282 100644
--- a/app/client/src/components/ads/Tabs.tsx
+++ b/app/client/src/components/ads/Tabs.tsx
@@ -11,10 +11,13 @@ export type TabProp = {
   count?: number;
   panelComponent: JSX.Element;
   icon?: IconName;
+  iconSize?: IconSize;
 };
 
-const TabsWrapper = styled.div<{ shouldOverflow?: boolean }>`
-  user-select: none;
+const TabsWrapper = styled.div<{
+  shouldOverflow?: boolean;
+  vertical?: boolean;
+}>`
   border-radius: 0px;
   height: 100%;
   .react-tabs {
@@ -27,9 +30,9 @@ const TabsWrapper = styled.div<{ shouldOverflow?: boolean }>`
   .react-tabs__tab-list {
     margin: 0px;
     display: flex;
-    align-items: center;
-    border-bottom: ${(props) => props.theme.spaces[1] - 2}px solid
-      ${(props) => props.theme.colors.tabs.border};
+    flex-direction: ${(props) => (!!props.vertical ? "column" : "row")};
+    align-items: ${(props) => (!!props.vertical ? "flex-start" : "center")};
+    border-bottom: none;
     color: ${(props) => props.theme.colors.tabs.normal};
     path {
       fill: ${(props) => props.theme.colors.tabs.normal};
@@ -46,8 +49,10 @@ const TabsWrapper = styled.div<{ shouldOverflow?: boolean }>`
     display: flex;
     align-items: center;
     justify-content: flex-start;
-    padding: ${(props) => props.theme.spaces[3] - 1}px 0
-      ${(props) => props.theme.spaces[4]}px 0;
+    padding: ${(props) => props.theme.spaces[3] - 1}px
+      ${(props) => (props.vertical ? `${props.theme.spaces[4] - 1}px` : 0)}
+      ${(props) => props.theme.spaces[4]}px
+      ${(props) => (props.vertical ? `${props.theme.spaces[4] - 1}px` : 0)};
     margin-right: ${(props) => props.theme.spaces[12] - 3}px;
     text-align: center;
     display: inline-flex;
@@ -73,10 +78,15 @@ const TabsWrapper = styled.div<{ shouldOverflow?: boolean }>`
     &::after {
       content: "";
       position: absolute;
-      width: 100%;
-      bottom: ${(props) => props.theme.spaces[0] - 1}px;
+      width: ${(props) =>
+        props.vertical ? `${props.theme.spaces[1] - 2}px` : "100%"};
+      bottom: ${(props) =>
+        props.vertical ? "0%" : `${props.theme.spaces[0] - 1}px`};
+      top: ${(props) =>
+        props.vertical ? `${props.theme.spaces[0] - 1}px` : "100%"};
       left: ${(props) => props.theme.spaces[0]}px;
-      height: ${(props) => props.theme.spaces[1] - 2}px;
+      height: ${(props) =>
+        props.vertical ? "100%" : `${props.theme.spaces[1] - 2}px`};
       background-color: ${(props) => props.theme.colors.info.main};
     }
   }
@@ -84,10 +94,15 @@ const TabsWrapper = styled.div<{ shouldOverflow?: boolean }>`
     &::after {
       content: "";
       position: absolute;
-      width: 100%;
-      bottom: ${(props) => props.theme.spaces[0] - 1}px;
+      width: ${(props) =>
+        props.vertical ? `${props.theme.spaces[1] - 2}px` : "100%"};
+      bottom: ${(props) =>
+        props.vertical ? "0%" : `${props.theme.spaces[0] - 1}px`};
+      top: ${(props) =>
+        props.vertical ? `${props.theme.spaces[0] - 1}px` : "100%"};
       left: ${(props) => props.theme.spaces[0]}px;
-      height: ${(props) => props.theme.spaces[1] - 2}px;
+      height: ${(props) =>
+        props.vertical ? "100%" : `${props.theme.spaces[1] - 2}px`};
       background-color: ${(props) => props.theme.colors.info.main};
     }
     box-shadow: none;
@@ -102,19 +117,19 @@ const TabTitleWrapper = styled.div`
   display: flex;
   align-items: center;
   .${Classes.ICON} {
-    margin-right: ${(props) => props.theme.spaces[3]}px;
+    margin-right: ${(props) => props.theme.spaces[2]}px;
   }
 `;
 
-const TabTitle = styled.span`
+export const TabTitle = styled.span`
   font-size: ${(props) => props.theme.typography.h5.fontSize}px;
   font-weight: ${(props) => props.theme.typography.h5.fontWeight};
   line-height: ${(props) => props.theme.typography.h5.lineHeight - 3}px;
   letter-spacing: ${(props) => props.theme.typography.h5.letterSpacing}px;
-  margin: 0 5px;
+  margin: 0;
 `;
 
-const TabCount = styled.div`
+export const TabCount = styled.div`
   background-color: ${(props) => props.theme.colors.tabs.countBg};
   border-radius: 8px;
   width: 17px;
@@ -128,6 +143,7 @@ type TabbedViewComponentType = CommonComponentProps & {
   selectedIndex?: number;
   onSelect?: (tabIndex: number) => void;
   overflow?: boolean;
+  vertical?: boolean;
 };
 
 export function TabComponent(props: TabbedViewComponentType) {
@@ -135,6 +151,7 @@ export function TabComponent(props: TabbedViewComponentType) {
     <TabsWrapper
       data-cy={props.cypressSelector}
       shouldOverflow={props.overflow}
+      vertical={props.vertical}
     >
       <Tabs
         onSelect={(index: number) => {
@@ -144,10 +161,13 @@ export function TabComponent(props: TabbedViewComponentType) {
       >
         <TabList>
           {props.tabs.map((tab) => (
-            <Tab key={tab.key}>
+            <Tab data-cy={`t--tab-${tab.key}`} key={tab.key}>
               <TabTitleWrapper>
                 {tab.icon ? (
-                  <Icon name={tab.icon} size={IconSize.XXXL} />
+                  <Icon
+                    name={tab.icon}
+                    size={tab.iconSize ? tab.iconSize : IconSize.XXXL}
+                  />
                 ) : null}
                 <TabTitle>{tab.title}</TabTitle>
                 {tab.count && tab.count > 0 ? (
diff --git a/app/client/src/components/ads/Text.tsx b/app/client/src/components/ads/Text.tsx
index c2a58a9a06..e2a3a526bb 100644
--- a/app/client/src/components/ads/Text.tsx
+++ b/app/client/src/components/ads/Text.tsx
@@ -32,6 +32,7 @@ export type TextProps = CommonComponentProps & {
   className?: string;
   weight?: FontWeight;
   highlight?: boolean;
+  textAlign?: string;
 };
 
 const typeSelector = (props: TextProps & ThemeProp): string => {
@@ -72,6 +73,7 @@ const Text = styled.span.attrs((props: TextProps) => ({
   color: ${(props) =>
     props.highlight ? props.theme.colors.text.highlight : typeSelector(props)};
   text-transform: ${(props) => (props.case ? props.case : "none")};
+  text-align: ${(props) => (props.textAlign ? props.textAlign : "normal")};
 `;
 
 export default Text;
diff --git a/app/client/src/components/ads/TextInput.tsx b/app/client/src/components/ads/TextInput.tsx
index 633528236b..4fc64505d0 100644
--- a/app/client/src/components/ads/TextInput.tsx
+++ b/app/client/src/components/ads/TextInput.tsx
@@ -84,7 +84,7 @@ const boxStyles = (
 const StyledInput = styled((props) => {
   // we are removing non input related props before passing them in the components
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { inputStyle, inputRef, dataType, theme, ...inputProps } = props;
+  const { dataType, inputRef, inputStyle, theme, ...inputProps } = props;
   return props.asyncControl ? (
     <AsyncControllableInput
       {...inputProps}
diff --git a/app/client/src/components/ads/Toast.tsx b/app/client/src/components/ads/Toast.tsx
index 8685e03e1c..4a77ed1755 100644
--- a/app/client/src/components/ads/Toast.tsx
+++ b/app/client/src/components/ads/Toast.tsx
@@ -17,6 +17,7 @@ type ToastProps = ToastOptions &
     duration?: number;
     onUndo?: () => void;
     dispatchableAction?: { type: ReduxActionType; payload: any };
+    showDebugButton?: boolean;
     hideProgressBar?: boolean;
   };
 
@@ -36,7 +37,7 @@ const WrappedToastContainer = styled.div`
     margin-bottom: ${(props) => props.theme.spaces[4]}px;
   }
   .Toastify__toast-container--top-right {
-    top: 4em;
+    top: 8em;
   }
 `;
 export function StyledToastContainer(props: ToastOptions) {
@@ -96,6 +97,7 @@ const ToastBody = styled.div<{
       color: ${props.theme.colors.toast.undo};
       line-height: 18px;
       font-weight: 600;
+      white-space: nowrap
     }
     `
       : null}
@@ -131,7 +133,7 @@ function ToastComponent(props: ToastProps & { undoAction?: () => void }) {
         ) : null}
         <div>
           <Text type={TextType.P1}>{props.text}</Text>
-          {props.variant === Variant.danger ? (
+          {props.variant === Variant.danger && props.showDebugButton ? (
             <StyledDebugButton source={"TOAST"} />
           ) : null}
         </div>
diff --git a/app/client/src/components/ads/Tooltip.tsx b/app/client/src/components/ads/Tooltip.tsx
index da2b2d7b23..ce1c37a1b8 100644
--- a/app/client/src/components/ads/Tooltip.tsx
+++ b/app/client/src/components/ads/Tooltip.tsx
@@ -2,13 +2,15 @@ import React from "react";
 import { CommonComponentProps } from "./common";
 import { Position, Tooltip, PopperBoundary } from "@blueprintjs/core";
 import { GLOBAL_STYLE_TOOLTIP_CLASSNAME } from "globalStyles/tooltip";
+import { Modifiers } from "popper.js";
 
 type Variant = "dark" | "light";
 
 type TooltipProps = CommonComponentProps & {
   content: JSX.Element | string;
+  disabled?: boolean;
   position?: Position;
-  children: JSX.Element;
+  children: JSX.Element | React.ReactNode;
   variant?: Variant;
   maxWidth?: string;
   boundary?: PopperBoundary;
@@ -17,21 +19,29 @@ type TooltipProps = CommonComponentProps & {
   autoFocus?: boolean;
   hoverOpenDelay?: number;
   minimal?: boolean;
+  modifiers?: Modifiers;
+  isOpen?: boolean;
 };
 
+const portalContainer = document.getElementById("tooltip-root");
+
 function TooltipComponent(props: TooltipProps) {
   return (
     <Tooltip
       autoFocus={props.autoFocus}
       boundary={props.boundary || "scrollParent"}
       content={props.content}
+      disabled={props.disabled}
       hoverOpenDelay={props.hoverOpenDelay}
+      isOpen={props.isOpen}
       minimal={props.minimal}
       modifiers={{
         preventOverflow: { enabled: false },
+        ...props.modifiers,
       }}
       openOnTargetFocus={props.openOnTargetFocus}
       popoverClassName={GLOBAL_STYLE_TOOLTIP_CLASSNAME}
+      portalContainer={portalContainer as HTMLDivElement}
       position={props.position}
       usePortal
     >
diff --git a/app/client/src/components/ads/TreeDropdown.tsx b/app/client/src/components/ads/TreeDropdown.tsx
index bede261783..be5315306c 100644
--- a/app/client/src/components/ads/TreeDropdown.tsx
+++ b/app/client/src/components/ads/TreeDropdown.tsx
@@ -19,6 +19,7 @@ export type TreeDropdownOption = DropdownOption & {
   children?: TreeDropdownOption[];
   className?: string;
   type?: string;
+  icon?: React.ReactNode;
 };
 
 type Setter = (value: TreeDropdownOption, defaultVal?: string) => void;
@@ -137,13 +138,13 @@ function getSelectedOption(
 
 export default function TreeDropdown(props: TreeDropdownProps) {
   const {
-    selectedValue,
     defaultText,
-    optionTree,
-    onSelect,
-    getDefaults,
-    selectedLabelModifier,
     displayValue,
+    getDefaults,
+    onSelect,
+    optionTree,
+    selectedLabelModifier,
+    selectedValue,
     toggle,
   } = props;
   const selectedOption = getSelectedOption(
diff --git a/app/client/src/components/ads/UserProfileImagePicker.tsx b/app/client/src/components/ads/UserProfileImagePicker.tsx
new file mode 100644
index 0000000000..72a50becb8
--- /dev/null
+++ b/app/client/src/components/ads/UserProfileImagePicker.tsx
@@ -0,0 +1,54 @@
+import React, { useState, useRef, useEffect } from "react";
+import { updatePhoto, removePhoto } from "actions/userActions";
+import { useDispatch } from "react-redux";
+
+import DisplayImageUpload from "components/ads/DisplayImageUpload";
+
+import UserApi from "api/UserApi";
+import Uppy from "@uppy/core";
+
+function FormDisplayImage() {
+  const [file, setFile] = useState<any>();
+  const [imageURL, setImageURL] = useState(`/api/${UserApi.photoURL}`);
+  const dispatch = useDispatch();
+  const dispatchActionRef = useRef<(uppy: Uppy.Uppy) => void | null>();
+
+  const onUploadComplete = (uppy: Uppy.Uppy) => {
+    uppy.reset();
+    setImageURL(`/api/${UserApi.photoURL}?${new Date().getTime()}`);
+  };
+
+  const onSelectFile = (file: any) => {
+    setFile(file.data);
+  };
+
+  useEffect(() => {
+    dispatchActionRef.current = (uppy: Uppy.Uppy) => {
+      dispatch(updatePhoto({ file, callback: () => onUploadComplete(uppy) }));
+    };
+  }, [file]);
+
+  const upload = (uppy: Uppy.Uppy) => {
+    if (typeof dispatchActionRef.current === "function")
+      dispatchActionRef.current(uppy);
+  };
+
+  const removeProfileImage = () => {
+    dispatch(
+      removePhoto(() => {
+        setImageURL(`/api/${UserApi.photoURL}?${new Date().getTime()}`);
+      }),
+    );
+  };
+
+  return (
+    <DisplayImageUpload
+      onChange={onSelectFile}
+      onRemove={removeProfileImage}
+      submit={upload}
+      value={imageURL}
+    />
+  );
+}
+
+export default FormDisplayImage;
diff --git a/app/client/src/components/ads/formFields/TextField.tsx b/app/client/src/components/ads/formFields/TextField.tsx
index 38df047f1d..1e1b62ab36 100644
--- a/app/client/src/components/ads/formFields/TextField.tsx
+++ b/app/client/src/components/ads/formFields/TextField.tsx
@@ -19,7 +19,9 @@ const renderComponent = (
   return (
     <>
       <InputComponent {...componentProps} {...componentProps.input} fill />
-      <FormFieldError error={showError && componentProps.meta.error} />
+      {!componentProps.hideErrorMessage && (
+        <FormFieldError error={showError && componentProps.meta.error} />
+      )}
     </>
   );
 };
@@ -32,6 +34,7 @@ type FormTextFieldProps = {
   intent?: Intent;
   disabled?: boolean;
   autoFocus?: boolean;
+  hideErrorMessage?: boolean;
 };
 
 function FormTextField(props: FormTextFieldProps) {
diff --git a/app/client/src/components/ads/tour/TourTooltipWrapper.tsx b/app/client/src/components/ads/tour/TourTooltipWrapper.tsx
new file mode 100644
index 0000000000..abd14b7a81
--- /dev/null
+++ b/app/client/src/components/ads/tour/TourTooltipWrapper.tsx
@@ -0,0 +1,110 @@
+import React, { useEffect, useRef } from "react";
+import TooltipComponent from "components/ads/Tooltip";
+import { useSelector } from "react-redux";
+import Text, { TextType } from "../Text";
+import { Position } from "@blueprintjs/core";
+import { getActiveTourIndex, getActiveTourType } from "selectors/tourSelectors";
+import { TourType } from "entities/Tour";
+import TourStepsByType from "constants/TourSteps";
+import { AppState } from "reducers";
+import { noop } from "lodash";
+import styled, { CSSProperties } from "styled-components";
+import { Modifiers } from "popper.js";
+import lottie from "lottie-web";
+import pulsatingDot from "assets/lottie/pulse-dot.json";
+import { Indices } from "constants/Layers";
+
+type Props = {
+  children: React.ReactNode;
+  hasOverlay?: boolean;
+  tourType: TourType;
+  tourIndex: number;
+  modifiers?: Modifiers;
+  onClick?: () => void;
+  pulseStyles?: CSSProperties;
+  showPulse?: boolean;
+};
+
+const Overlay = styled.div`
+  background-color: ${(props) => props.theme.colors.overlayColor};
+  height: 100%;
+  width: 100%;
+  left: 0;
+  top: 0;
+  position: fixed;
+  z-index: ${Indices.Layer1};
+`;
+
+const PulseDot = styled.div`
+  position: absolute;
+  height: 50px;
+  width: 50px;
+`;
+
+const Container = styled.div`
+  position: relative;
+  z-index: ${Indices.Layer1};
+`;
+
+function TourTooltipWrapper(props: Props) {
+  const { children, tourIndex, tourType } = props;
+  const isCurrentStepActive = useSelector(
+    (state: AppState) => getActiveTourIndex(state) === tourIndex,
+  );
+  const isCurrentTourActive = useSelector(
+    (state: AppState) => getActiveTourType(state) === tourType,
+  );
+  const tourStepsConfig = TourStepsByType[tourType as TourType];
+  const tourStepConfig = tourStepsConfig[tourIndex];
+  const isOpen = isCurrentStepActive && isCurrentTourActive;
+  const dotRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const anim = lottie.loadAnimation({
+      animationData: pulsatingDot,
+      autoplay: true,
+      container: dotRef?.current as HTMLDivElement,
+      renderer: "svg",
+      loop: true,
+    });
+
+    return () => {
+      anim?.destroy();
+    };
+  }, [isOpen, dotRef?.current]);
+
+  return (
+    <>
+      {/* A crude overlay which won't work with containers having overflow hidden */}
+      {isOpen && props.hasOverlay && <Overlay />}
+      <Container onClick={props.onClick ? props.onClick : noop}>
+        {isOpen && props.showPulse && (
+          <PulseDot ref={dotRef} style={props.pulseStyles} />
+        )}
+        <TooltipComponent
+          boundary={"viewport"}
+          content={
+            <Text
+              style={{
+                whiteSpace: "pre",
+                color: "#fff",
+                display: "flex",
+                textAlign: "center",
+              }}
+              type={TextType.P3}
+            >
+              {tourStepConfig?.data.message}
+            </Text>
+          }
+          isOpen={!!isOpen}
+          modifiers={props.modifiers}
+          position={Position.BOTTOM}
+        >
+          {children}
+        </TooltipComponent>
+      </Container>
+    </>
+  );
+}
+
+export default TourTooltipWrapper;
diff --git a/app/client/src/components/designSystems/appsmith/ChartComponent.tsx b/app/client/src/components/designSystems/appsmith/ChartComponent.tsx
index 43b3bf3b7b..c9b30a9583 100644
--- a/app/client/src/components/designSystems/appsmith/ChartComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/ChartComponent.tsx
@@ -72,7 +72,7 @@ class ChartComponent extends React.Component<ChartComponentProps> {
   chartInstance = new FusionCharts();
 
   getChartType = () => {
-    const { chartType, allowHorizontalScroll, chartData } = this.props;
+    const { allowHorizontalScroll, chartData, chartType } = this.props;
     const dataLength = Object.keys(chartData).length;
     const isMSChart = dataLength > 1;
     switch (chartType) {
@@ -307,6 +307,15 @@ class ChartComponent extends React.Component<ChartComponentProps> {
         renderAt: this.props.widgetId + "chart-container",
         width: "100%",
         height: "100%",
+        events: {
+          dataPlotClick: (evt: any) => {
+            const data = evt.data;
+            this.props.onDataPointClick({
+              x: data.categoryLabel,
+              y: data.dataValue,
+            });
+          },
+        },
         ...this.getCustomFusionChartDataSource(),
       };
       this.chartInstance = new FusionCharts(chartConfig);
diff --git a/app/client/src/components/designSystems/appsmith/ContainerComponent.tsx b/app/client/src/components/designSystems/appsmith/ContainerComponent.tsx
index 16cc613961..edda15651f 100644
--- a/app/client/src/components/designSystems/appsmith/ContainerComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/ContainerComponent.tsx
@@ -1,9 +1,11 @@
 import React, { ReactNode, useRef, useEffect, RefObject } from "react";
 import styled, { css } from "styled-components";
+import tinycolor from "tinycolor2";
 import { ComponentProps } from "./BaseComponent";
-import { getBorderCSSShorthand, invisible } from "constants/DefaultTheme";
+import { invisible } from "constants/DefaultTheme";
 import { Color } from "constants/Colors";
 import { generateClassName, getCanvasClassName } from "utils/generators";
+import { useCanvasMinHeightUpdateHook } from "utils/hooks/useCanvasMinHeightUpdateHook";
 
 const scrollContents = css`
   overflow-y: auto;
@@ -17,24 +19,44 @@ const StyledContainerComponent = styled.div<
   ${(props) =>
     props.containerStyle !== "none"
       ? `
-  border: ${getBorderCSSShorthand(props.theme.borders[2])};
+  box-shadow: 0px 0px 0px 1px #E7E7E7;
   border-radius: 0;`
       : ""}
   height: 100%;
   width: 100%;
   background: ${(props) => props.backgroundColor};
-
+  opacity: ${(props) => (props.resizeDisabled ? "0.8" : "1")};
+  position: relative;
   ${(props) => (!props.isVisible ? invisible : "")};
-  opacity: ${(props) => (props.resizeDisabled ? "0.5" : "1")};
-  pointer-events: ${(props) => (props.resizeDisabled ? "none" : "inherit")};
-  overflow: hidden;
-  ${(props) => (props.shouldScrollContents ? scrollContents : "")}
+  box-shadow: ${(props) =>
+    props.selected ? "0px 0px 0px 3px rgba(59,130,246,0.5)" : "none"};
+  z-index: ${(props) => (props.focused ? "3" : props.selected ? "2" : "1")};
+  ${(props) =>
+    props.shouldScrollContents === true
+      ? scrollContents
+      : props.shouldScrollContents === false
+      ? css`
+          overflow: hidden;
+        `
+      : ""}
+
+  &:hover {
+    z-index: ${(props) => (props.onClickCapture ? "2" : "1")};
+    cursor: ${(props) => (props.onClickCapture ? "pointer" : "inherit")};
+    background: ${(props) => {
+      return props.onClickCapture && props.backgroundColor
+        ? tinycolor(props.backgroundColor)
+            .darken(5)
+            .toString()
+        : props.backgroundColor;
+    }};
+  }
 }`;
 
 function ContainerComponent(props: ContainerComponentProps) {
   const containerStyle = props.containerStyle || "card";
   const containerRef: RefObject<HTMLDivElement> = useRef<HTMLDivElement>(null);
-
+  useCanvasMinHeightUpdateHook(props.widgetId, props.minHeight);
   useEffect(() => {
     if (!props.shouldScrollContents) {
       const supportsNativeSmoothScroll =
@@ -73,6 +95,9 @@ export interface ContainerComponentProps extends ComponentProps {
   backgroundColor?: Color;
   shouldScrollContents?: boolean;
   resizeDisabled?: boolean;
+  selected?: boolean;
+  focused?: boolean;
+  minHeight?: number;
 }
 
 export default ContainerComponent;
diff --git a/app/client/src/components/designSystems/appsmith/CreatableDropdown.tsx b/app/client/src/components/designSystems/appsmith/CreatableDropdown.tsx
index d6465d62a9..7220d1656c 100644
--- a/app/client/src/components/designSystems/appsmith/CreatableDropdown.tsx
+++ b/app/client/src/components/designSystems/appsmith/CreatableDropdown.tsx
@@ -77,14 +77,14 @@ const selectStyles = {
 class CreatableDropdown extends React.Component<DropdownProps> {
   render() {
     const {
-      placeholder,
-      options,
-      isLoading,
-      input,
-      noOptionsMessage,
       components,
+      input,
       inputValue,
+      isLoading,
+      noOptionsMessage,
       onInputChange,
+      options,
+      placeholder,
     } = this.props;
     const optionalProps: Partial<DropdownProps> = {};
     if (noOptionsMessage) optionalProps.noOptionsMessage = noOptionsMessage;
diff --git a/app/client/src/components/designSystems/appsmith/DraggableListComponent.tsx b/app/client/src/components/designSystems/appsmith/DraggableListComponent.tsx
index ca1fb37219..967ef2a981 100644
--- a/app/client/src/components/designSystems/appsmith/DraggableListComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/DraggableListComponent.tsx
@@ -81,16 +81,16 @@ export class DroppableComponent extends React.Component<
 
   render() {
     const {
-      renderComponent,
       deleteOption,
-      updateOption,
-      toggleVisibility,
       onEdit,
+      renderComponent,
+      toggleVisibility,
+      updateOption,
     } = this.props;
     return (
       <DragDropContext onDragEnd={this.onDragEnd}>
         <Droppable droppableId="droppable">
-          {({ innerRef, droppableProps, placeholder }) => (
+          {({ droppableProps, innerRef, placeholder }) => (
             <DroppableWrapper
               ref={innerRef as React.Ref<HTMLDivElement>}
               {...droppableProps}
@@ -103,7 +103,7 @@ export class DroppableComponent extends React.Component<
                       index={index}
                       key={item.id}
                     >
-                      {({ innerRef, draggableProps, dragHandleProps }) => (
+                      {({ draggableProps, dragHandleProps, innerRef }) => (
                         <ItemWrapper
                           ref={innerRef as React.Ref<HTMLDivElement>}
                           {...draggableProps}
diff --git a/app/client/src/components/designSystems/appsmith/Dropdown.tsx b/app/client/src/components/designSystems/appsmith/Dropdown.tsx
index ecade3fff9..29359e7c23 100644
--- a/app/client/src/components/designSystems/appsmith/Dropdown.tsx
+++ b/app/client/src/components/designSystems/appsmith/Dropdown.tsx
@@ -4,6 +4,7 @@ import Select from "react-select";
 import { WrappedFieldInputProps } from "redux-form";
 import { theme } from "constants/DefaultTheme";
 import { SelectComponentsConfig } from "react-select/src/components";
+import { LayersContext } from "../../../constants/Layers";
 
 export type DropdownProps = {
   options: Array<{
@@ -50,13 +51,21 @@ const selectStyles = {
     padding: "5px",
   }),
   indicatorSeparator: () => ({}),
+  menu: (provided: any) => ({ ...provided, zIndex: 2 }),
+  menuPortal: (base: any) => ({ ...base, zIndex: 2 }),
 };
 
 export function BaseDropdown(props: DropdownProps) {
-  const { input, customSelectStyles } = props;
+  const layer = React.useContext(LayersContext);
+  const { customSelectStyles, input } = props;
+  const menuPortalStyle = {
+    menuPortal: (styles: any) => ({ ...styles, zIndex: layer.max }),
+  };
+
   return (
     <Select
-      styles={{ ...selectStyles, ...customSelectStyles }}
+      menuPortalTarget={document.body}
+      styles={{ ...selectStyles, ...customSelectStyles, ...menuPortalStyle }}
       {...input}
       isDisabled={props.isDisabled}
       isSearchable={props.isSearchable}
diff --git a/app/client/src/components/designSystems/appsmith/ImageComponent.tsx b/app/client/src/components/designSystems/appsmith/ImageComponent.tsx
index ee3ea08429..e5b0f9b593 100644
--- a/app/client/src/components/designSystems/appsmith/ImageComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/ImageComponent.tsx
@@ -2,12 +2,15 @@ import * as React from "react";
 import { ComponentProps } from "./BaseComponent";
 import styled from "styled-components";
 import { TransformWrapper, TransformComponent } from "react-zoom-pan-pinch";
+import { Colors } from "constants/Colors";
 
 export interface StyledImageProps {
   defaultImageUrl: string;
+  enableRotation?: boolean;
   imageUrl?: string;
   backgroundColor?: string;
   showHoverPointer?: boolean;
+  objectFit: string;
   onClick?: (event: React.MouseEvent<HTMLElement>) => void;
 }
 
@@ -17,16 +20,16 @@ export const StyledImage = styled.div<
   }
 >`
   position: relative;
-  display: flex;                                                                                                                                                                                                                                                                                                                                                                          
+  display: flex;
   flex-direction: "row";
+  background-size: ${(props) => props.objectFit ?? "cover"};
   cursor: ${(props) =>
     props.showHoverPointer && props.onClick ? "pointer" : "inherit"};
   background: ${(props) => props.backgroundColor};
-  background-image: url("${(props) =>
-    props.imageError ? props.defaultImageUrl : props.imageUrl}");
+  background-image: ${(props) =>
+    `url(${props.imageError ? props.defaultImageUrl : props.imageUrl})`};
   background-position: center;
   background-repeat: no-repeat;
-  background-size: contain;
   height: 100%;
   width: 100%;
 `;
@@ -41,6 +44,46 @@ const Wrapper = styled.div`
   }
 `;
 
+const ControlBtnWrapper = styled.div`
+  position: absolute;
+  top: 2px;
+  right: 2px;
+  padding: 5px 0px;
+  z-index: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: white;
+`;
+
+const ControlBtn = styled.div`
+  height: 25px;
+  width: 45px;
+  color: white;
+  padding: 0px 10px;
+  display: inline-block;
+
+  &.separator {
+    border-right: 1px solid ${Colors.ALTO2};
+  }
+
+  & > div {
+    cursor: pointer;
+    height: 100%;
+    width: 100%;
+    padding: 4px;
+    transition: background 0.2s linear;
+
+    & > svg {
+      height: 16px;
+      width: 17px;
+    }
+    &: hover {
+      background: #ebebeb;
+    }
+  }
+`;
+
 enum ZoomingState {
   MAX_ZOOMED_OUT = "MAX_ZOOMED_OUT",
   MAX_ZOOMED_IN = "MAX_ZOOMED_IN",
@@ -49,6 +92,8 @@ class ImageComponent extends React.Component<
   ImageComponentProps,
   {
     imageError: boolean;
+    showImageControl: boolean;
+    imageRotation: number;
     zoomingState: ZoomingState;
   }
 > {
@@ -58,11 +103,14 @@ class ImageComponent extends React.Component<
     this.isPanning = false;
     this.state = {
       imageError: false,
+      showImageControl: false,
+      imageRotation: 0,
       zoomingState: ZoomingState.MAX_ZOOMED_OUT,
     };
   }
   render() {
     const { maxZoomLevel } = this.props;
+    const { imageRotation } = this.state;
     const zoomActive =
       maxZoomLevel !== undefined && maxZoomLevel > 1 && !this.isPanning;
     const isZoomingIn = this.state.zoomingState === ZoomingState.MAX_ZOOMED_OUT;
@@ -71,7 +119,10 @@ class ImageComponent extends React.Component<
       cursor = isZoomingIn ? "zoom-in" : "zoom-out";
     }
     return (
-      <Wrapper>
+      <Wrapper
+        onMouseEnter={this.onMouseEnter}
+        onMouseLeave={this.onMouseLeave}
+      >
         <TransformWrapper
           defaultScale={1}
           doubleClick={{
@@ -121,44 +172,162 @@ class ImageComponent extends React.Component<
           }}
         >
           {({ zoomIn, zoomOut }: any) => (
-            <TransformComponent>
-              <StyledImage
-                className={this.props.isLoading ? "bp3-skeleton" : ""}
-                imageError={this.state.imageError}
-                {...this.props}
-                data-testid="styledImage"
-                onClick={(event: React.MouseEvent<HTMLElement>) => {
-                  if (!this.isPanning) {
-                    if (isZoomingIn) {
-                      zoomIn(event);
-                    } else {
-                      zoomOut(event);
+            <>
+              {this.renderImageControl()}
+              <TransformComponent>
+                <StyledImage
+                  className={this.props.isLoading ? "bp3-skeleton" : ""}
+                  imageError={this.state.imageError}
+                  {...this.props}
+                  data-testid="styledImage"
+                  onClick={(event: React.MouseEvent<HTMLElement>) => {
+                    if (!this.isPanning) {
+                      if (isZoomingIn) {
+                        zoomIn(event);
+                      } else {
+                        zoomOut(event);
+                      }
+                      this.props.onClick && this.props.onClick(event);
                     }
-                    this.props.onClick && this.props.onClick(event);
-                  }
-                  this.isPanning = false;
-                }}
-                style={{
-                  cursor,
-                }}
-              >
-                <img
-                  alt={this.props.widgetName}
-                  onError={this.onImageError}
-                  onLoad={this.onImageLoad}
-                  src={this.props.imageUrl}
-                  style={{
-                    display: "none",
+                    this.isPanning = false;
                   }}
-                />
-              </StyledImage>
-            </TransformComponent>
+                  style={{
+                    cursor,
+                    transform: `rotate(${imageRotation}deg)`,
+                  }}
+                >
+                  {/* Used for running onImageError and onImageLoad Functions since Background Image doesn't have the functionality */}
+                  <img
+                    alt={this.props.widgetName}
+                    onError={this.onImageError}
+                    onLoad={this.onImageLoad}
+                    src={this.props.imageUrl}
+                    style={{
+                      display: "none",
+                    }}
+                  />
+                </StyledImage>
+              </TransformComponent>
+            </>
           )}
         </TransformWrapper>
       </Wrapper>
     );
   }
 
+  renderImageControl = () => {
+    const { enableDownload, enableRotation } = this.props;
+    const { showImageControl } = this.state;
+
+    if (showImageControl && (enableRotation || enableDownload)) {
+      return (
+        <ControlBtnWrapper>
+          {enableRotation && (
+            <>
+              <ControlBtn onClick={this.handleImageRotate(false)}>
+                <div>
+                  <svg
+                    fill="none"
+                    height="12"
+                    viewBox="0 0 12 12"
+                    width="12"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M2.28492 1.81862C3.27446 0.939565 4.57489 0.400391 6.00002 0.400391C9.08724 0.400391 11.6 2.91317 11.6 6.00039C11.6 9.08761 9.08724 11.6004 6.00002 11.6004C2.91281 11.6004 0.400024 9.08761 0.400024 6.00039H1.33336C1.33336 8.58317 3.41724 10.6671 6.00002 10.6671C8.58281 10.6671 10.6667 8.58317 10.6667 6.00039C10.6667 3.41761 8.58281 1.33372 6.00002 1.33372C4.82777 1.33372 3.76447 1.7682 2.94573 2.47943L4.13336 3.66706H1.33336V0.867057L2.28492 1.81862Z"
+                      fill="#858282"
+                      stroke="#858282"
+                      strokeWidth="0.5"
+                    />
+                  </svg>
+                </div>
+              </ControlBtn>
+              <ControlBtn
+                className="separator"
+                onClick={this.handleImageRotate(true)}
+              >
+                <div>
+                  <svg
+                    fill="none"
+                    height="12"
+                    viewBox="0 0 12 12"
+                    width="12"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M0.400024 6.00039C0.400024 2.91317 2.91281 0.400391 6.00002 0.400391C7.42515 0.400391 8.72559 0.939565 9.71513 1.81862L10.6667 0.867057V3.66706H7.86669L9.05432 2.47943C8.23558 1.7682 7.17228 1.33372 6.00002 1.33372C3.41724 1.33372 1.33336 3.41761 1.33336 6.00039C1.33336 8.58317 3.41724 10.6671 6.00002 10.6671C8.58281 10.6671 10.6667 8.58317 10.6667 6.00039H11.6C11.6 9.08761 9.08724 11.6004 6.00002 11.6004C2.91281 11.6004 0.400024 9.08761 0.400024 6.00039Z"
+                      fill="#858282"
+                      stroke="#858282"
+                      strokeWidth="0.5"
+                    />
+                  </svg>
+                </div>
+              </ControlBtn>
+            </>
+          )}
+          {enableDownload && (
+            <ControlBtn onClick={this.handleImageDownload}>
+              <div>
+                <svg fill="none" height="20" viewBox="0 0 20 20" width="20">
+                  <path
+                    clipRule="evenodd"
+                    d="M15.4547 16.4284H13.117H6.88326H4.54559C2.8243 16.4284 1.42871 14.8933 1.42871 12.9999C1.42871 11.3987 2.43157 10.0641 3.7804 9.68786C3.93001 6.28329 6.47884 3.57129 9.61053 3.57129C12.7072 3.57129 15.2349 6.22243 15.4352 9.57386C17.183 9.56015 18.5716 11.1167 18.5716 12.9999C18.5716 14.8933 17.176 16.4284 15.4547 16.4284ZM12.7266 11.4286L9.99929 14.8572L7.27202 11.4286L8.83045 11.4286L8.83045 8.00004L11.1681 8.00003V11.4286L12.7266 11.4286Z"
+                    fill="#939090"
+                    fillRule="evenodd"
+                  />
+                </svg>
+              </div>
+            </ControlBtn>
+          )}
+        </ControlBtnWrapper>
+      );
+    }
+  };
+
+  handleImageRotate = (rotateRight: boolean) => (e: any) => {
+    const { imageRotation } = this.state;
+
+    const nextRotation = rotateRight ? imageRotation + 90 : imageRotation - 90;
+
+    this.setState({ imageRotation: nextRotation % 360 });
+
+    if (!!e) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  };
+
+  handleImageDownload = (e: any) => {
+    const { imageUrl, widgetId } = this.props;
+    const fileName = `${widgetId}-download`;
+
+    const xhr = new XMLHttpRequest();
+    xhr.open("GET", imageUrl, true);
+    xhr.responseType = "blob";
+
+    xhr.onload = function() {
+      const urlCreator = window.URL || window.webkitURL;
+      const imageUrl = urlCreator.createObjectURL(this.response);
+      const tag = document.createElement("a");
+      tag.href = imageUrl;
+      tag.download = fileName;
+      document.body.appendChild(tag);
+      tag.click();
+      document.body.removeChild(tag);
+      window.URL.revokeObjectURL(imageUrl);
+    };
+    xhr.send();
+
+    if (!!e) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  };
+
+  onMouseEnter = () => this.setState({ showImageControl: true });
+
+  onMouseLeave = () => this.setState({ showImageControl: false });
+
   onImageError = () => {
     this.setState({
       imageError: true,
@@ -178,6 +347,9 @@ export interface ImageComponentProps extends ComponentProps {
   isLoading: boolean;
   showHoverPointer?: boolean;
   maxZoomLevel: number;
+  enableRotation?: boolean;
+  enableDownload?: boolean;
+  objectFit: string;
   disableDrag: (disabled: boolean) => void;
   onClick?: (event: React.MouseEvent<HTMLElement>) => void;
 }
diff --git a/app/client/src/components/designSystems/appsmith/PositionedContainer.tsx b/app/client/src/components/designSystems/appsmith/PositionedContainer.tsx
index db47d63a73..5e5bed6124 100644
--- a/app/client/src/components/designSystems/appsmith/PositionedContainer.tsx
+++ b/app/client/src/components/designSystems/appsmith/PositionedContainer.tsx
@@ -1,13 +1,15 @@
-import React, { CSSProperties, ReactNode, useMemo } from "react";
+import React, { CSSProperties, ReactNode, useCallback, useMemo } from "react";
 import { BaseStyle } from "widgets/BaseWidget";
 import { WIDGET_PADDING } from "constants/WidgetConstants";
 import { generateClassName } from "utils/generators";
 import styled from "styled-components";
 import { useClickOpenPropPane } from "utils/hooks/useClickOpenPropPane";
+import { stopEventPropagation } from "utils/AppsmithUtils";
+import { Layers } from "constants/Layers";
 
 const PositionedWidget = styled.div`
   &:hover {
-    z-index: 1;
+    z-index: ${Layers.positionedWidget + 1} !important;
   }
 `;
 type PositionedContainerProps = {
@@ -15,6 +17,9 @@ type PositionedContainerProps = {
   children: ReactNode;
   widgetId: string;
   widgetType: string;
+  selected?: boolean;
+  focused?: boolean;
+  resizeDisabled?: boolean;
 };
 
 export function PositionedContainer(props: PositionedContainerProps) {
@@ -22,7 +27,6 @@ export function PositionedContainer(props: PositionedContainerProps) {
   const y = props.style.yPosition + (props.style.yPositionUnit || "px");
   const padding = WIDGET_PADDING;
   const openPropertyPane = useClickOpenPropPane();
-
   // memoized classname
   const containerClassName = useMemo(() => {
     return (
@@ -42,14 +46,28 @@ export function PositionedContainer(props: PositionedContainerProps) {
       height: props.style.componentHeight + (props.style.heightUnit || "px"),
       width: props.style.componentWidth + (props.style.widthUnit || "px"),
       padding: padding + "px",
+      zIndex:
+        props.selected || props.focused
+          ? Layers.selectedWidget
+          : Layers.positionedWidget,
+      backgroundColor: "inherit",
     };
   }, [props.style]);
 
+  const openPropPane = useCallback((e) => openPropertyPane(e, props.widgetId), [
+    props.widgetId,
+    openPropertyPane,
+  ]);
+
   return (
     <PositionedWidget
       className={containerClassName}
+      data-testid="test-widget"
       id={props.widgetId}
-      onClickCapture={openPropertyPane}
+      key={`positioned-container-${props.widgetId}`}
+      onClick={stopEventPropagation}
+      // Positioned Widget is the top enclosure for all widgets and clicks on/inside the widget should not be propogated/bubbled out of this Container.
+      onClickCapture={openPropPane}
       //Before you remove: This is used by property pane to reference the element
       style={containerStyle}
     >
diff --git a/app/client/src/components/designSystems/appsmith/SearchComponent.tsx b/app/client/src/components/designSystems/appsmith/SearchComponent.tsx
index 46bfac9a87..5795ba92fa 100644
--- a/app/client/src/components/designSystems/appsmith/SearchComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/SearchComponent.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import styled from "styled-components";
 import { InputGroup } from "@blueprintjs/core";
 import { debounce } from "lodash";
+import { Colors } from "constants/Colors";
 
 interface SearchProps {
   onSearch: (value: any) => void;
@@ -13,9 +14,12 @@ const SearchInputWrapper = styled(InputGroup)`
   &&& input {
     box-shadow: none;
     font-size: 12px;
+    color: ${Colors.SILVER_CHALICE};
   }
   &&& svg {
-    opacity: 0.6;
+    path {
+      fill: ${Colors.SILVER_CHALICE};
+    }
   }
   margin: 5px 16px;
   width: 250px;
@@ -52,6 +56,7 @@ class SearchComponent extends React.Component<
   render() {
     return (
       <SearchInputWrapper
+        className="t--search-input"
         leftIcon="search"
         onChange={this.handleSearch}
         placeholder={this.props.placeholder}
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/AutoToolTipComponent.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/AutoToolTipComponent.tsx
index f8f9d93fba..1380448883 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/AutoToolTipComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/AutoToolTipComponent.tsx
@@ -85,7 +85,7 @@ function AutoToolTipComponent(props: Props) {
       updateToolTip(false);
     }
   }, [ref]);
-  if (props.columnType === ColumnTypes.URL) {
+  if (props.columnType === ColumnTypes.URL && props.title) {
     return <LinkWrapper {...props} />;
   }
   return (
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/CascadeFields.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/CascadeFields.tsx
index f0925d75e3..bbf90c2653 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/CascadeFields.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/CascadeFields.tsx
@@ -433,7 +433,7 @@ function CascadeField(props: CascadeFieldProps) {
 }
 
 function Fields(props: CascadeFieldProps & { state: CascadeFieldState }) {
-  const { index, removeFilter, applyFilter, hasAnyFilters } = props;
+  const { applyFilter, hasAnyFilters, index, removeFilter } = props;
   const [state, dispatch] = React.useReducer(CaseCaseFieldReducer, props.state);
   const handleRemoveFilter = () => {
     dispatch({ type: CascadeFieldActionTypes.DELETE_FILTER });
@@ -470,16 +470,16 @@ function Fields(props: CascadeFieldProps & { state: CascadeFieldState }) {
   };
 
   const {
-    operator,
     column,
     condition,
-    showConditions,
-    value,
-    showInput,
-    showDateInput,
     conditions,
     isDeleted,
     isUpdate,
+    operator,
+    showConditions,
+    showDateInput,
+    showInput,
+    value,
   } = state;
   useEffect(() => {
     if (!isDeleted && isUpdate) {
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/CommonUtilities.test.ts b/app/client/src/components/designSystems/appsmith/TableComponent/CommonUtilities.test.ts
index 026291ff16..bf008539d3 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/CommonUtilities.test.ts
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/CommonUtilities.test.ts
@@ -31,7 +31,6 @@ describe("TableUtilities", () => {
       "url",
       true,
     );
-    // console.log(JSON.stringify(sortedTableData));
     expect(sortedTableData).toStrictEqual(expected);
   });
 });
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/Constants.ts b/app/client/src/components/designSystems/appsmith/TableComponent/Constants.ts
index a8dbb7d807..88c74bac35 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/Constants.ts
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/Constants.ts
@@ -94,6 +94,7 @@ export interface CellLayoutProperties {
   buttonStyle?: string;
   buttonLabelColor?: string;
   buttonLabel?: string;
+  displayText?: string;
 }
 
 export interface TableColumnMetaProps {
@@ -144,6 +145,7 @@ export interface ColumnProperties {
   inputFormat?: string;
   dropdownOptions?: string;
   onOptionChange?: string;
+  displayText?: string;
 }
 
 export const ConditionFunctions: {
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/Table.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/Table.tsx
index aceab79e54..45e16fcd1e 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/Table.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/Table.tsx
@@ -1,10 +1,12 @@
 import React, { useRef } from "react";
+import { reduce } from "lodash";
 import {
   useTable,
   usePagination,
   useBlockLayout,
   useResizeColumns,
   useRowSelect,
+  Row,
 } from "react-table";
 import {
   TableWrapper,
@@ -12,7 +14,12 @@ import {
   TableHeaderInnerWrapper,
 } from "./TableStyledWrappers";
 import { ReactTableFilter } from "components/designSystems/appsmith/TableComponent/TableFilters";
-import { TableHeaderCell, renderEmptyRows } from "./TableUtilities";
+import {
+  TableHeaderCell,
+  renderEmptyRows,
+  renderCheckBoxCell,
+  renderCheckBoxHeaderCell,
+} from "./TableUtilities";
 import TableHeader from "./TableHeader";
 import { Classes } from "@blueprintjs/core";
 import {
@@ -47,6 +54,7 @@ interface TableProps {
   }) => void;
   pageNo: number;
   updatePageNo: (pageNo: number, event?: EventType) => void;
+  multiRowSelection?: boolean;
   nextPageClick: () => void;
   prevPageClick: () => void;
   serverSidePaginationEnabled: boolean;
@@ -54,12 +62,21 @@ interface TableProps {
   selectedRowIndices: number[];
   disableDrag: () => void;
   enableDrag: () => void;
+  toggleAllRowSelect: (
+    isSelect: boolean,
+    pageData: Row<Record<string, unknown>>[],
+  ) => void;
   triggerRowSelection: boolean;
   searchTableData: (searchKey: any) => void;
   filters?: ReactTableFilter[];
   applyFilter: (filters: ReactTableFilter[]) => void;
   compactMode?: CompactMode;
   updateCompactMode: (compactMode: CompactMode) => void;
+  isVisibleCompactMode?: boolean;
+  isVisibleDownload?: boolean;
+  isVisibleFilters?: boolean;
+  isVisiblePagination?: boolean;
+  isVisibleSearch?: boolean;
 }
 
 const defaultColumn = {
@@ -111,12 +128,12 @@ export function Table(props: TableProps) {
   const pageCount = Math.ceil(props.data.length / props.pageSize);
   const currentPageIndex = props.pageNo < pageCount ? props.pageNo : 0;
   const {
-    getTableProps,
     getTableBodyProps,
+    getTableProps,
     headerGroups,
-    prepareRow,
     page,
     pageOptions,
+    prepareRow,
     state,
   } = useTable(
     {
@@ -161,65 +178,106 @@ export function Table(props: TableProps) {
   const tableWrapperRef = useRef<HTMLDivElement | null>(null);
   const tableBodyRef = useRef<HTMLDivElement | null>(null);
   const tableHeaderWrapperRef = React.createRef<HTMLDivElement>();
+  const rowSelectionState = React.useMemo(() => {
+    // return : 0; no row selected | 1; all row selected | 2: some rows selected
+    if (!props.multiRowSelection) return null;
+    const selectedRowCount = reduce(
+      subPage,
+      (count, row) => {
+        return selectedRowIndices.includes(row.index) ? count + 1 : count;
+      },
+      0,
+    );
+    const result =
+      selectedRowCount === 0 ? 0 : selectedRowCount === subPage.length ? 1 : 2;
+    return result;
+  }, [selectedRowIndices, subPage]);
+  const handleAllRowSelectClick = (
+    e: React.MouseEvent<HTMLDivElement, MouseEvent>,
+  ) => {
+    // if all / some rows are selected we remove selection on click
+    // else select all rows
+    props.toggleAllRowSelect(!Boolean(rowSelectionState), subPage);
+    // loop over subPage rows and toggleRowSelected if required
+    e.stopPropagation();
+  };
+  const isHeaderVisible =
+    props.isVisibleSearch ||
+    props.isVisibleFilters ||
+    props.isVisibleDownload ||
+    props.isVisibleCompactMode ||
+    props.isVisiblePagination;
+
   return (
     <TableWrapper
       backgroundColor={Colors.ATHENS_GRAY_DARKER}
       height={props.height}
       id={`table${props.widgetId}`}
+      isHeaderVisible={isHeaderVisible}
       tableSizes={tableSizes}
       triggerRowSelection={props.triggerRowSelection}
       width={props.width}
     >
-      <TableHeaderWrapper
-        backgroundColor={Colors.WHITE}
-        ref={tableHeaderWrapperRef}
-        serverSidePaginationEnabled={props.serverSidePaginationEnabled}
-        tableSizes={tableSizes}
-        width={props.width}
-      >
-        <Scrollbars
-          renderThumbHorizontal={ScrollbarHorizontalThumb}
-          renderThumbVertical={ScrollbarVerticalThumb}
-          style={{ width: props.width, height: 38 }}
+      {isHeaderVisible && (
+        <TableHeaderWrapper
+          backgroundColor={Colors.WHITE}
+          ref={tableHeaderWrapperRef}
+          serverSidePaginationEnabled={props.serverSidePaginationEnabled}
+          tableSizes={tableSizes}
+          width={props.width}
         >
-          <TableHeaderInnerWrapper
-            backgroundColor={Colors.WHITE}
-            serverSidePaginationEnabled={props.serverSidePaginationEnabled}
-            tableSizes={tableSizes}
-            width={props.width}
+          <Scrollbars
+            renderThumbHorizontal={ScrollbarHorizontalThumb}
+            renderThumbVertical={ScrollbarVerticalThumb}
+            style={{ width: props.width, height: 38 }}
           >
-            <TableHeader
-              applyFilter={props.applyFilter}
-              columns={tableHeadercolumns}
-              compactMode={props.compactMode}
-              currentPageIndex={currentPageIndex}
-              editMode={props.editMode}
-              filters={props.filters}
-              nextPageClick={props.nextPageClick}
-              pageCount={pageCount}
-              pageNo={props.pageNo}
-              pageOptions={pageOptions}
-              prevPageClick={props.prevPageClick}
-              searchKey={props.searchKey}
-              searchTableData={props.searchTableData}
+            <TableHeaderInnerWrapper
+              backgroundColor={Colors.WHITE}
               serverSidePaginationEnabled={props.serverSidePaginationEnabled}
-              tableColumns={columns}
-              tableData={props.data}
               tableSizes={tableSizes}
-              updateCompactMode={props.updateCompactMode}
-              updatePageNo={props.updatePageNo}
-              widgetName={props.widgetName}
-            />
-          </TableHeaderInnerWrapper>
-        </Scrollbars>
-      </TableHeaderWrapper>
+              width={props.width}
+            >
+              <TableHeader
+                applyFilter={props.applyFilter}
+                columns={tableHeadercolumns}
+                compactMode={props.compactMode}
+                currentPageIndex={currentPageIndex}
+                editMode={props.editMode}
+                filters={props.filters}
+                isVisibleCompactMode={props.isVisibleCompactMode}
+                isVisibleDownload={props.isVisibleDownload}
+                isVisibleFilters={props.isVisibleFilters}
+                isVisiblePagination={props.isVisiblePagination}
+                isVisibleSearch={props.isVisibleSearch}
+                nextPageClick={props.nextPageClick}
+                pageCount={pageCount}
+                pageNo={props.pageNo}
+                pageOptions={pageOptions}
+                prevPageClick={props.prevPageClick}
+                searchKey={props.searchKey}
+                searchTableData={props.searchTableData}
+                serverSidePaginationEnabled={props.serverSidePaginationEnabled}
+                tableColumns={columns}
+                tableData={props.data}
+                tableSizes={tableSizes}
+                updateCompactMode={props.updateCompactMode}
+                updatePageNo={props.updatePageNo}
+                widgetName={props.widgetName}
+              />
+            </TableHeaderInnerWrapper>
+          </Scrollbars>
+        </TableHeaderWrapper>
+      )}
       <div
         className={props.isLoading ? Classes.SKELETON : "tableWrap"}
         ref={tableWrapperRef}
       >
         <Scrollbars
           renderThumbHorizontal={ScrollbarHorizontalThumb}
-          style={{ width: props.width, height: props.height - 48 }}
+          style={{
+            width: props.width,
+            height: isHeaderVisible ? props.height - 48 : props.height,
+          }}
         >
           <div {...getTableProps()} className="table">
             <div
@@ -227,30 +285,37 @@ export function Table(props: TableProps) {
               onMouseLeave={props.enableDrag}
               onMouseOver={props.disableDrag}
             >
-              {headerGroups.map((headerGroup: any, index: number) => (
-                <div
-                  {...headerGroup.getHeaderGroupProps()}
-                  className="tr"
-                  key={index}
-                >
-                  {headerGroup.headers.map(
-                    (column: any, columnIndex: number) => {
-                      return (
-                        <TableHeaderCell
-                          column={column}
-                          columnIndex={columnIndex}
-                          columnName={column.Header}
-                          isAscOrder={column.isAscOrder}
-                          isHidden={column.isHidden}
-                          isResizingColumn={isResizingColumn.current}
-                          key={columnIndex}
-                          sortTableColumn={props.sortTableColumn}
-                        />
-                      );
-                    },
-                  )}
-                </div>
-              ))}
+              {headerGroups.map((headerGroup: any, index: number) => {
+                const headerRowProps = {
+                  ...headerGroup.getHeaderGroupProps(),
+                  style: { display: "flex" },
+                };
+                return (
+                  <div {...headerRowProps} className="tr" key={index}>
+                    {props.multiRowSelection &&
+                      renderCheckBoxHeaderCell(
+                        handleAllRowSelectClick,
+                        rowSelectionState,
+                      )}
+                    {headerGroup.headers.map(
+                      (column: any, columnIndex: number) => {
+                        return (
+                          <TableHeaderCell
+                            column={column}
+                            columnIndex={columnIndex}
+                            columnName={column.Header}
+                            isAscOrder={column.isAscOrder}
+                            isHidden={column.isHidden}
+                            isResizingColumn={isResizingColumn.current}
+                            key={columnIndex}
+                            sortTableColumn={props.sortTableColumn}
+                          />
+                        );
+                      },
+                    )}
+                  </div>
+                );
+              })}
               {headerGroups.length === 0 &&
                 renderEmptyRows(
                   1,
@@ -258,6 +323,7 @@ export function Table(props: TableProps) {
                   props.width,
                   subPage,
                   prepareRow,
+                  props.multiRowSelection,
                 )}
             </div>
             <div
@@ -269,18 +335,17 @@ export function Table(props: TableProps) {
             >
               {subPage.map((row, rowIndex) => {
                 prepareRow(row);
+                const rowProps = {
+                  ...row.getRowProps(),
+                  style: { display: "flex" },
+                };
+                const isRowSelected =
+                  row.index === selectedRowIndex ||
+                  selectedRowIndices.includes(row.index);
                 return (
                   <div
-                    {...row.getRowProps()}
-                    className={
-                      "tr" +
-                      `${
-                        row.index === selectedRowIndex ||
-                        selectedRowIndices.includes(row.index)
-                          ? " selected-row"
-                          : ""
-                      }`
-                    }
+                    {...rowProps}
+                    className={"tr" + `${isRowSelected ? " selected-row" : ""}`}
                     key={rowIndex}
                     onClick={(e) => {
                       row.toggleRowSelected();
@@ -288,6 +353,8 @@ export function Table(props: TableProps) {
                       e.stopPropagation();
                     }}
                   >
+                    {props.multiRowSelection &&
+                      renderCheckBoxCell(isRowSelected)}
                     {row.cells.map((cell, cellIndex) => {
                       return (
                         <div
@@ -311,6 +378,7 @@ export function Table(props: TableProps) {
                   props.width,
                   subPage,
                   prepareRow,
+                  props.multiRowSelection,
                 )}
             </div>
           </div>
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/TableAction.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/TableAction.tsx
new file mode 100644
index 0000000000..54d4f4c443
--- /dev/null
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/TableAction.tsx
@@ -0,0 +1,68 @@
+import React, { useCallback } from "react";
+import { IconWrapper } from "constants/IconConstants";
+import { Colors } from "constants/Colors";
+import styled from "styled-components";
+
+interface TableActionProps {
+  selected: boolean;
+  selectMenu: (selected: boolean) => void;
+  className: string;
+  title: string;
+  children: React.ReactNode;
+  icon?: React.ReactNode;
+  titleColor?: string;
+}
+
+export const TableIconWrapper = styled.div<{
+  selected?: boolean;
+  disabled?: boolean;
+  titleColor?: string;
+}>`
+  height: 38px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  opacity: ${(props) => (props.disabled ? 0.6 : 1)};
+  cursor: ${(props) => !props.disabled && "pointer"};
+  color: ${(props) => (props.selected ? Colors.CODE_GRAY : Colors.GRAY)};
+  .action-title {
+    margin-left: 4px;
+    white-space: nowrap;
+    color: ${(props) => props.titleColor || Colors.GRAY};
+  }
+  position: relative;
+  margin-left: 5px;
+  padding: 0 5px;
+  &:hover {
+    background: ${Colors.ATHENS_GRAY};
+  }
+`;
+
+function TableAction(props: TableActionProps) {
+  const handleIconClick = useCallback(
+    (e: React.MouseEvent<HTMLElement>) => {
+      props.selectMenu(!props.selected);
+      e.stopPropagation();
+    },
+    [props.selected],
+  );
+  return (
+    <TableIconWrapper
+      className={props.className}
+      onClick={handleIconClick}
+      selected={props.selected}
+      titleColor={props.titleColor}
+    >
+      <IconWrapper
+        color={props.titleColor ? props.titleColor : Colors.GRAY}
+        height={20}
+        width={20}
+      >
+        {props.children}
+      </IconWrapper>
+      <span className="action-title">{props.title}</span>
+    </TableIconWrapper>
+  );
+}
+
+export default TableAction;
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/TableActionIcon.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/TableActionIcon.tsx
index d59cdacf23..37b1dac601 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/TableActionIcon.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/TableActionIcon.tsx
@@ -34,13 +34,12 @@ function TableActionIcon(props: TableActionIconProps) {
         selected={props.selected}
       >
         <IconWrapper
-          color={props.selected ? Colors.OXFORD_BLUE : Colors.CADET_BLUE}
+          color={props.selected ? Colors.CODE_GRAY : Colors.GRAY}
           height={20}
           width={20}
         >
           {props.children}
         </IconWrapper>
-        {props.icon ? props.icon : null}
       </TableIconWrapper>
     </Tooltip>
   );
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/TableDataDownload.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/TableDataDownload.tsx
index 1a41a1d277..bd195b1c2f 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/TableDataDownload.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/TableDataDownload.tsx
@@ -1,18 +1,84 @@
 import React from "react";
+import {
+  Popover,
+  Classes,
+  PopoverInteractionKind,
+  Position,
+} from "@blueprintjs/core";
 import { IconWrapper } from "constants/IconConstants";
 import { Colors } from "constants/Colors";
-import { ReactComponent as DownloadIcon } from "assets/icons/control/download-table.svg";
+import { ReactComponent as DownloadIcon } from "assets/icons/control/download-data-icon.svg";
 import { ReactTableColumnProps } from "components/designSystems/appsmith/TableComponent/Constants";
-import { TableIconWrapper } from "components/designSystems/appsmith/TableComponent/TableStyledWrappers";
-import TableActionIcon from "components/designSystems/appsmith/TableComponent/TableActionIcon";
+import TableAction, {
+  TableIconWrapper,
+} from "components/designSystems/appsmith/TableComponent/TableAction";
+import styled from "styled-components";
 import { transformTableDataIntoCsv } from "./CommonUtilities";
+import zipcelx from "zipcelx";
 
+const DropDownWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  background: white;
+  z-index: 1;
+  border-radius: 4px;
+  box-shadow: 0px 12px 28px -8px rgba(0, 0, 0, 0.1);
+  padding: 0;
+`;
+
+const OptionWrapper = styled.div`
+  display: flex;
+  width: 100%;
+  justify-content: space-between;
+  align-items: center;
+  height: 32px;
+  box-sizing: border-box;
+  padding: 6px 12px;
+  color: ${Colors.CHARCOAL};
+  min-width: 200px;
+  cursor: pointer;
+  background: ${Colors.WHITE};
+  border-left: none;
+  border-radius: none;
+  .option-title {
+    font-weight: 500;
+    font-size: 13px;
+    line-height: 20px;
+  }
+  &:hover {
+    background: ${Colors.SEA_SHELL};
+    color: ${Colors.CODE_GRAY};
+  }
+`;
 interface TableDataDownloadProps {
   data: Array<Record<string, unknown>>;
   columns: ReactTableColumnProps[];
   widgetName: string;
 }
 
+type FileDownloadType = "CSV" | "EXCEL";
+
+type DataCellProps = {
+  value: string | number;
+  type: "string" | "number";
+};
+
+interface DownloadOptionProps {
+  label: string;
+  value: FileDownloadType;
+}
+
+const dowloadOptions: DownloadOptionProps[] = [
+  {
+    label: "Download as CSV",
+    value: "CSV",
+  },
+  {
+    label: "Download as Excel",
+    value: "EXCEL",
+  },
+];
+
 const downloadDataAsCSV = (props: {
   csvData: Array<Array<any>>;
   fileName: string;
@@ -45,9 +111,57 @@ const downloadDataAsCSV = (props: {
 };
 
 function TableDataDownload(props: TableDataDownloadProps) {
-  const [selected, toggleButtonClick] = React.useState(false);
-  const downloadTableData = () => {
-    toggleButtonClick(true);
+  const [selected, selectMenu] = React.useState(false);
+  const downloadFile = (type: string) => {
+    if (type === "CSV") {
+      downloadTableDataAsCsv();
+    } else if (type === "EXCEL") {
+      downloadTableDataAsExcel();
+    }
+  };
+  const downloadTableDataAsExcel = () => {
+    const tableData: Array<Array<DataCellProps>> = [];
+    const tableHeaders: Array<DataCellProps> = props.columns
+      .filter((column: ReactTableColumnProps) => {
+        return column.metaProperties && !column.metaProperties.isHidden;
+      })
+      .map((column: ReactTableColumnProps) => {
+        return {
+          value: column.Header,
+          type:
+            column.columnProperties?.columnType === "number"
+              ? "number"
+              : "string",
+        };
+      });
+    tableData.push(tableHeaders);
+    for (let row = 0; row < props.data.length; row++) {
+      const data: { [key: string]: any } = props.data[row];
+      const tableRow: Array<DataCellProps> = [];
+      for (let colIndex = 0; colIndex < props.columns.length; colIndex++) {
+        const column = props.columns[colIndex];
+        const type =
+          column.columnProperties?.columnType === "number"
+            ? "number"
+            : "string";
+        if (column.metaProperties && !column.metaProperties.isHidden) {
+          tableRow.push({
+            value: data[column.accessor],
+            type: type,
+          });
+        }
+      }
+      tableData.push(tableRow);
+    }
+    zipcelx({
+      filename: props.widgetName,
+      sheet: {
+        data: tableData,
+      },
+    });
+  };
+  const downloadTableDataAsCsv = () => {
+    selectMenu(true);
     const csvData = transformTableDataIntoCsv({
       columns: props.columns,
       data: props.data,
@@ -56,7 +170,11 @@ function TableDataDownload(props: TableDataDownloadProps) {
       csvData: csvData,
       fileName: `${props.widgetName}.csv`,
     });
-    toggleButtonClick(false);
+    selectMenu(false);
+  };
+
+  const handleCloseMenu = () => {
+    selectMenu(false);
   };
 
   if (props.columns.length === 0) {
@@ -65,20 +183,43 @@ function TableDataDownload(props: TableDataDownloadProps) {
         <IconWrapper color={Colors.CADET_BLUE} height={20} width={20}>
           <DownloadIcon />
         </IconWrapper>
+        <span className="action-title">Download</span>
       </TableIconWrapper>
     );
   }
   return (
-    <TableActionIcon
-      className="t--table-download-btn"
-      selectMenu={() => {
-        downloadTableData();
-      }}
-      selected={selected}
-      tooltip="Download"
+    <Popover
+      enforceFocus={false}
+      interactionKind={PopoverInteractionKind.CLICK}
+      isOpen={selected}
+      minimal
+      onClose={handleCloseMenu}
+      position={Position.BOTTOM}
     >
-      <DownloadIcon />
-    </TableActionIcon>
+      <TableAction
+        className="t--table-download-btn"
+        selectMenu={selectMenu}
+        selected={selected}
+        title="Download"
+      >
+        <DownloadIcon />
+      </TableAction>
+      <DropDownWrapper>
+        {dowloadOptions.map((item: DownloadOptionProps, index: number) => {
+          return (
+            <OptionWrapper
+              className={`${Classes.POPOVER_DISMISS} t--table-download-data-option`}
+              key={index}
+              onClick={() => {
+                downloadFile(item.value);
+              }}
+            >
+              {item.label}
+            </OptionWrapper>
+          );
+        })}
+      </DropDownWrapper>
+    </Popover>
   );
 }
 
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/TableFilters.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/TableFilters.tsx
index 145ace9fe5..d05dfbb753 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/TableFilters.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/TableFilters.tsx
@@ -12,7 +12,7 @@ import { ReactComponent as FilterIcon } from "assets/icons/control/filter-icon.s
 import { TableIconWrapper } from "components/designSystems/appsmith/TableComponent/TableStyledWrappers";
 import Button from "components/editorComponents/Button";
 import CascadeFields from "components/designSystems/appsmith/TableComponent/CascadeFields";
-import TableActionIcon from "components/designSystems/appsmith/TableComponent/TableActionIcon";
+import TableAction from "components/designSystems/appsmith/TableComponent/TableAction";
 import {
   ReactTableColumnProps,
   Condition,
@@ -173,7 +173,7 @@ function TableFilters(props: TableFilterProps) {
       position={Position.BOTTOM}
       usePortal
     >
-      <TableActionIcon
+      <TableAction
         className="t--table-filter-toggle-btn"
         icon={
           hasAnyFilters ? (
@@ -184,10 +184,11 @@ function TableFilters(props: TableFilterProps) {
           selectMenu(selected);
         }}
         selected={selected}
-        tooltip="Filters"
+        title={`Filters${hasAnyFilters ? ` (${filters.length})` : ""}`}
+        titleColor={hasAnyFilters ? Colors.CODE_GRAY : Colors.GRAY}
       >
         <FilterIcon />
-      </TableActionIcon>
+      </TableAction>
       <TableFilterOuterWrapper>
         <TableFilerWrapper onClick={(e) => e.stopPropagation()}>
           {filters.map((filter: ReactTableFilter, index: number) => {
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/TableHeader.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/TableHeader.tsx
index 8c5ae271c1..01fb8b0188 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/TableHeader.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/TableHeader.tsx
@@ -25,11 +25,11 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 const PageNumberInputWrapper = styled(NumericInput)`
   &&& input {
     box-shadow: none;
+    border: 1px solid ${Colors.DANUBE};
     background: linear-gradient(0deg, ${Colors.WHITE}, ${Colors.WHITE}),
       ${Colors.POLAR};
-    border: 1px solid ${Colors.GREEN};
+    border-radius: none;
     box-sizing: border-box;
-    border-radius: 4px;
     width: 24px;
     height: 24px;
     line-height: 24px;
@@ -37,6 +37,9 @@ const PageNumberInputWrapper = styled(NumericInput)`
     text-align: center;
     font-size: 12px;
   }
+  &&&.bp3-control-group > :only-child {
+    border-radius: 0;
+  }
   margin: 0 8px;
 `;
 
@@ -107,34 +110,54 @@ interface TableHeaderProps {
   compactMode?: CompactMode;
   updateCompactMode: (compactMode: CompactMode) => void;
   tableSizes: TableSizes;
+  isVisibleCompactMode?: boolean;
+  isVisibleDownload?: boolean;
+  isVisibleFilters?: boolean;
+  isVisiblePagination?: boolean;
+  isVisibleSearch?: boolean;
 }
 
 function TableHeader(props: TableHeaderProps) {
   return (
     <>
-      <SearchComponent
-        onSearch={props.searchTableData}
-        placeholder="Search..."
-        value={props.searchKey}
-      />
-      <CommonFunctionsMenuWrapper tableSizes={props.tableSizes}>
-        <TableFilters
-          applyFilter={props.applyFilter}
-          columns={props.columns}
-          editMode={props.editMode}
-          filters={props.filters}
+      {props.isVisibleSearch && (
+        <SearchComponent
+          onSearch={props.searchTableData}
+          placeholder="Search..."
+          value={props.searchKey}
         />
-        <TableDataDownload
-          columns={props.tableColumns}
-          data={props.tableData}
-          widgetName={props.widgetName}
-        />
-        <TableCompactMode
-          compactMode={props.compactMode}
-          updateCompactMode={props.updateCompactMode}
-        />
-      </CommonFunctionsMenuWrapper>
-      {props.serverSidePaginationEnabled && (
+      )}
+      {(props.isVisibleFilters ||
+        props.isVisibleDownload ||
+        props.isVisibleCompactMode) && (
+        <CommonFunctionsMenuWrapper tableSizes={props.tableSizes}>
+          {props.isVisibleFilters && (
+            <TableFilters
+              applyFilter={props.applyFilter}
+              columns={props.columns}
+              editMode={props.editMode}
+              filters={props.filters}
+            />
+          )}
+
+          {props.isVisibleDownload && (
+            <TableDataDownload
+              columns={props.tableColumns}
+              data={props.tableData}
+              widgetName={props.widgetName}
+            />
+          )}
+
+          {props.isVisibleCompactMode && (
+            <TableCompactMode
+              compactMode={props.compactMode}
+              updateCompactMode={props.updateCompactMode}
+            />
+          )}
+        </CommonFunctionsMenuWrapper>
+      )}
+
+      {props.isVisiblePagination && props.serverSidePaginationEnabled && (
         <PaginationWrapper>
           <PaginationItemWrapper
             className="t--table-widget-prev-page"
@@ -159,7 +182,7 @@ function TableHeader(props: TableHeaderProps) {
           </PaginationItemWrapper>
         </PaginationWrapper>
       )}
-      {!props.serverSidePaginationEnabled && (
+      {props.isVisiblePagination && !props.serverSidePaginationEnabled && (
         <PaginationWrapper>
           <RowWrapper className="show-page-items">
             {props.tableData?.length} Records
@@ -173,7 +196,7 @@ function TableHeader(props: TableHeaderProps) {
               props.updatePageNo(pageNo + 1, EventType.ON_PREV_PAGE);
             }}
           >
-            <Icon color={Colors.HIT_GRAY} icon="chevron-left" iconSize={16} />
+            <Icon color={Colors.GRAY} icon="chevron-left" iconSize={16} />
           </PaginationItemWrapper>
           <RowWrapper>
             Page{" "}
@@ -196,7 +219,7 @@ function TableHeader(props: TableHeaderProps) {
               props.updatePageNo(pageNo + 1, EventType.ON_NEXT_PAGE);
             }}
           >
-            <Icon color={Colors.HIT_GRAY} icon="chevron-right" iconSize={16} />
+            <Icon color={Colors.GRAY} icon="chevron-right" iconSize={16} />
           </PaginationItemWrapper>
         </PaginationWrapper>
       )}
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/TableStyledWrappers.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/TableStyledWrappers.tsx
index e516d2d432..a25ca36fd3 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/TableStyledWrappers.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/TableStyledWrappers.tsx
@@ -14,6 +14,7 @@ export const TableWrapper = styled.div<{
   tableSizes: TableSizes;
   backgroundColor?: Color;
   triggerRowSelection: boolean;
+  isHeaderVisible?: boolean;
 }>`
   width: 100%;
   height: 100%;
@@ -48,34 +49,25 @@ export const TableWrapper = styled.div<{
     display: table;
     width: 100%;
     ${hideScrollbar};
-    .tr {
-      width: 100%;
-    }
     .thead,
     .tbody {
       overflow: hidden;
     }
     .tbody {
-      height: ${(props) => props.height - 80}px;
+      height: ${(props) =>
+        props.isHeaderVisible ? props.height - 80 : props.height - 40}px;
       width: 100%;
       overflow-y: auto;
       ${hideScrollbar};
-      .tr {
-        width: 100%;
-      }
     }
     .tr {
-      width: calc(100% - 8px);
       overflow: hidden;
       cursor: ${(props) => props.triggerRowSelection && "pointer"};
       background: ${Colors.WHITE};
       &.selected-row {
-        & > .td > div {
-          background: ${Colors.POLAR}!important;
-        }
-        background: ${Colors.POLAR}!important;
+        background: ${Colors.OPAQ_BLUE}!important;
         &:hover {
-          background: ${Colors.POLAR};
+          background: ${Colors.OPAQ_BLUE};
         }
       }
       &:hover {
@@ -111,8 +103,10 @@ export const TableWrapper = styled.div<{
     }
     .th {
       padding: 0 10px 0 0;
-      height: ${(props) => props.tableSizes.COLUMN_HEADER_HEIGHT}px;
-      line-height: ${(props) => props.tableSizes.COLUMN_HEADER_HEIGHT}px;
+      height: ${(props) =>
+        props.isHeaderVisible ? props.tableSizes.COLUMN_HEADER_HEIGHT : 40}px;
+      line-height: ${(props) =>
+        props.isHeaderVisible ? props.tableSizes.COLUMN_HEADER_HEIGHT : 40}px;
       background: ${Colors.ATHENS_GRAY_DARKER};
     }
     .td {
@@ -232,18 +226,16 @@ export const PaginationWrapper = styled.div`
   justify-content: flex-end;
   align-items: center;
   padding: 8px 20px;
+  color: ${Colors.GRAY};
 `;
 
 export const PaginationItemWrapper = styled.div<{
   disabled?: boolean;
   selected?: boolean;
 }>`
-  background: ${(props) =>
-    props.disabled ? Colors.ATHENS_GRAY : Colors.WHITE};
-  border: 1px solid
-    ${(props) => (props.selected ? Colors.GREEN : Colors.GEYSER_LIGHT)};
+  background: ${(props) => (props.disabled ? Colors.MERCURY : Colors.WHITE)};
+  border: 1px solid ${Colors.ALTO2};
   box-sizing: border-box;
-  border-radius: 4px;
   width: 24px;
   height: 24px;
   display: flex;
@@ -413,6 +405,9 @@ export const CellWrapper = styled.div<{
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    text-align: ${(props) =>
+      props?.cellProperties?.horizontalAlignment &&
+      TEXT_ALIGN[props?.cellProperties?.horizontalAlignment]};
   }
   .hidden-icon {
     display: none;
@@ -424,6 +419,46 @@ export const CellWrapper = styled.div<{
   }
 `;
 
+export const CellCheckboxWrapper = styled(CellWrapper)<{ isChecked?: boolean }>`
+  justify-content: center;
+  width: 40px;
+  background: ${Colors.WHITE};
+  & > div {
+    background: ${(props) => (props.isChecked ? Colors.DANUBE : "")};
+  }
+
+  ${(props) =>
+    props.isChecked
+      ? `
+    background: #FAFAFA;
+    &:hover {
+      background: ${Colors.OPAQ_BLUE};
+    }
+    `
+      : `
+    &:hover {
+      & > div {
+        background: ${Colors.Gallery};
+      }
+    }
+  `}
+`;
+
+export const CellCheckbox = styled.div`
+  height: 15px;
+  width: 15px;
+  border: 0.5px solid ${Colors.GEYSER_LIGHT};
+  position: relative;
+  .th-svg {
+    display: block;
+    position: absolute;
+    left: -1px;
+    top: -1px;
+    height: 15px;
+    width: 15px;
+  }
+`;
+
 export const TableHeaderWrapper = styled.div<{
   serverSidePaginationEnabled: boolean;
   width: number;
@@ -477,7 +512,7 @@ export const RowWrapper = styled.div`
   justify-content: center;
   font-size: 12px;
   line-height: 20px;
-  color: ${Colors.THUNDER};
+  color: ${Colors.GRAY};
   margin: 0 4px;
   white-space: nowrap;
 `;
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/TableUtilities.test.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/TableUtilities.test.tsx
new file mode 100644
index 0000000000..6939bcc694
--- /dev/null
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/TableUtilities.test.tsx
@@ -0,0 +1,113 @@
+import { renderCell } from "./TableUtilities";
+import { ColumnTypes } from "components/designSystems/appsmith/TableComponent/Constants";
+
+describe("Test table columnType Image render", () => {
+  it("columnType Image accepts single image url and renders image correctly", () => {
+    const value =
+      "http://codeskulptor-demos.commondatastorage.googleapis.com/GalaxyInvaders/back02.jpg";
+
+    const expected = [
+      "http://codeskulptor-demos.commondatastorage.googleapis.com/GalaxyInvaders/back02.jpg",
+    ];
+    const ImageCellComponent = renderCell(
+      value,
+      ColumnTypes.IMAGE,
+      false,
+      {},
+      930,
+    );
+    const result = ImageCellComponent.props.children.map((imageDiv: any) => {
+      return imageDiv.props.href;
+    });
+
+    expect(expected).toEqual(result);
+  });
+
+  it("columnType Image accepts single base64 url and renders image correctly", () => {
+    const value =
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==";
+
+    const expected = [
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",
+    ];
+    const ImageCellComponent = renderCell(
+      value,
+      ColumnTypes.IMAGE,
+      false,
+      {},
+      930,
+    );
+    const result = ImageCellComponent.props.children.map((imageDiv: any) => {
+      return imageDiv.props.href;
+    });
+
+    expect(expected).toEqual(result);
+  });
+
+  it("columnType Image accepts comma separeted image urls and renders all images correctly", () => {
+    const value =
+      "http://codeskulptor-demos.commondatastorage.googleapis.com/GalaxyInvaders/back02.jpg,http://commondatastorage.googleapis.com/codeskulptor-assets/gutenberg.jpg,http://commondatastorage.googleapis.com/codeskulptor-assets/gutenberg.jpg";
+
+    const expected = [
+      "http://codeskulptor-demos.commondatastorage.googleapis.com/GalaxyInvaders/back02.jpg",
+      "http://commondatastorage.googleapis.com/codeskulptor-assets/gutenberg.jpg",
+      "http://commondatastorage.googleapis.com/codeskulptor-assets/gutenberg.jpg",
+    ];
+    const ImageCellComponent = renderCell(
+      value,
+      ColumnTypes.IMAGE,
+      false,
+      {},
+      930,
+    );
+    const result = ImageCellComponent.props.children.map((imageDiv: any) => {
+      return imageDiv.props.href;
+    });
+
+    expect(expected).toEqual(result);
+  });
+
+  it("columnType Image accepts comma separeted image urls that has base64 image and renders images correctly", () => {
+    const value =
+      "http://codeskulptor-demos.commondatastorage.googleapis.com/GalaxyInvaders/back02.jpg,data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==";
+
+    const expected = [
+      "http://codeskulptor-demos.commondatastorage.googleapis.com/GalaxyInvaders/back02.jpg",
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",
+    ];
+    const ImageCellComponent = renderCell(
+      value,
+      ColumnTypes.IMAGE,
+      false,
+      {},
+      930,
+    );
+    const result = ImageCellComponent.props.children.map((imageDiv: any) => {
+      return imageDiv.props.href;
+    });
+
+    expect(expected).toEqual(result);
+  });
+
+  it("columnType Image accepts image url that may have incorrect use of comma and renders image correctly", () => {
+    const value =
+      "http://codeskulptor-demos.commondatastorage.googleapis.com/GalaxyInvaders/back02.jpg, ";
+
+    const expected = [
+      "http://codeskulptor-demos.commondatastorage.googleapis.com/GalaxyInvaders/back02.jpg",
+      undefined,
+    ];
+    const ImageCellComponent = renderCell(
+      value,
+      ColumnTypes.IMAGE,
+      false,
+      {},
+      930,
+    );
+    const result = ImageCellComponent.props.children.map((imageDiv: any) => {
+      return imageDiv.props.href;
+    });
+
+    expect(expected).toEqual(result);
+  });
+});
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/TableUtilities.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/TableUtilities.tsx
index e639867e84..ce2129653e 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/TableUtilities.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/TableUtilities.tsx
@@ -2,6 +2,8 @@ import React, { useState } from "react";
 import { MenuItem, Classes, Button as BButton } from "@blueprintjs/core";
 import {
   CellWrapper,
+  CellCheckboxWrapper,
+  CellCheckbox,
   ActionWrapper,
   SortIconWrapper,
   DraggableHeaderWrapper,
@@ -49,13 +51,18 @@ export const renderCell = (
           </CellWrapper>
         );
       }
-      const imageSplitRegex = /[^(base64)],/;
+      // better regex: /(?<!base64),/g ; can't use due to safari incompatibility
+      const imageSplitRegex = /[^(base64)],/g;
       const imageUrlRegex = /(http(s?):)([/|.|\w|\s|-])*\.(?:jpeg|jpg|gif|png)??(?:&?[^=&]*=[^=&]*)*/;
       const base64ImageRegex = /^data:image\/.*;base64/;
       return (
         <CellWrapper cellProperties={cellProperties} isHidden={isHidden}>
           {value
             .toString()
+            // imageSplitRegex matched "," and char before it, so add space before ","
+            .replace(imageSplitRegex, (match) =>
+              match.length > 1 ? `${match.charAt(0)} ,` : " ,",
+            )
             .split(imageSplitRegex)
             .map((item: string, index: number) => {
               if (imageUrlRegex.test(item) || base64ImageRegex.test(item)) {
@@ -75,7 +82,7 @@ export const renderCell = (
                   </a>
                 );
               } else {
-                return <div>Invalid Image</div>;
+                return <div key={index}>Invalid Image</div>;
               }
             })}
         </CellWrapper>
@@ -112,7 +119,9 @@ export const renderCell = (
           tableWidth={tableWidth}
           title={value.toString()}
         >
-          {value.toString()}
+          {value && columnType === ColumnTypes.URL && cellProperties.displayText
+            ? cellProperties.displayText
+            : value.toString()}
         </AutoToolTipComponent>
       );
   }
@@ -189,20 +198,86 @@ function TableAction(props: {
   );
 }
 
+function CheckBoxLineIcon() {
+  return (
+    <svg
+      className="th-svg t--table-multiselect-header-half-check-svg"
+      fill="none"
+      height="15"
+      width="15"
+    >
+      <path
+        d="M11.183673404886235,7.5 H3.81632661819458 "
+        stroke="white"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeOpacity="0.9"
+      />
+    </svg>
+  );
+}
+
+function CheckBoxCheckIcon() {
+  return (
+    <svg className="th-svg" fill="none" height="15" width="15">
+      <path
+        d="M3.523326302644791,8.068102895600848 L5.7957131234862,10.340476082148596 L11.476673358442884,4.659524027768102 "
+        stroke="white"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeOpacity="0.9"
+      />
+    </svg>
+  );
+}
+
+export const renderCheckBoxCell = (isChecked: boolean) => (
+  <CellCheckboxWrapper
+    className="td t--table-multiselect"
+    isChecked={isChecked}
+  >
+    <CellCheckbox>{isChecked && <CheckBoxCheckIcon />}</CellCheckbox>
+  </CellCheckboxWrapper>
+);
+
+export const renderCheckBoxHeaderCell = (
+  onClick: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void,
+  checkState: number | null,
+) => (
+  <CellCheckboxWrapper
+    className="th header-reorder t--table-multiselect-header"
+    isChecked={!!checkState}
+    onClick={onClick}
+    role="columnheader"
+    style={{ padding: "0px", justifyContent: "center" }}
+  >
+    <CellCheckbox>
+      {checkState === 1 && <CheckBoxCheckIcon />}
+      {checkState === 2 && <CheckBoxLineIcon />}
+    </CellCheckbox>
+  </CellCheckboxWrapper>
+);
+
 export const renderEmptyRows = (
   rowCount: number,
   columns: any,
   tableWidth: number,
   page: any,
   prepareRow: any,
+  multiRowSelection = false,
 ) => {
   const rows: string[] = new Array(rowCount).fill("");
   if (page.length) {
     const row = page[0];
     return rows.map((item: string, index: number) => {
       prepareRow(row);
+      const rowProps = {
+        ...row.getRowProps(),
+        style: { display: "flex" },
+      };
       return (
-        <div {...row.getRowProps()} className="tr" key={index}>
+        <div {...rowProps} className="tr" key={index}>
+          {multiRowSelection && renderCheckBoxCell(false)}
           {row.cells.map((cell: any, cellIndex: number) => {
             return (
               <div {...cell.getCellProps()} className="td" key={cellIndex} />
diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/index.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/index.tsx
index 0e6c769657..73de795c33 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/index.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/index.tsx
@@ -1,12 +1,14 @@
-import React, { useEffect, useMemo } from "react";
-import Table from "components/designSystems/appsmith/TableComponent/Table";
 import {
   ColumnTypes,
   CompactMode,
   ReactTableColumnProps,
   ReactTableFilter,
 } from "components/designSystems/appsmith/TableComponent/Constants";
+import { Row } from "react-table";
+import Table from "components/designSystems/appsmith/TableComponent/Table";
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
+import { isEqual } from "lodash";
+import React, { useEffect, useMemo } from "react";
 
 export interface ColumnMenuOptionProps {
   content: string | JSX.Element;
@@ -45,6 +47,8 @@ interface ReactTableComponentProps {
   disableDrag: (disable: boolean) => void;
   onRowClick: (rowData: Record<string, unknown>, rowIndex: number) => void;
   onCommandClick: (dynamicTrigger: string, onComplete: () => void) => void;
+  selectAllRow: (pageData: Row<Record<string, unknown>>[]) => void;
+  unSelectAllRow: (pageData: Row<Record<string, unknown>>[]) => void;
   updatePageNo: (pageNo: number, event?: EventType) => void;
   sortTableColumn: (column: string, asc: boolean) => void;
   nextPageClick: () => void;
@@ -65,13 +69,58 @@ interface ReactTableComponentProps {
   columns: ReactTableColumnProps[];
   compactMode?: CompactMode;
   updateCompactMode: (compactMode: CompactMode) => void;
+  isVisibleSearch?: boolean;
+  isVisibleFilters?: boolean;
+  isVisibleDownload?: boolean;
+  isVisibleCompactMode?: boolean;
+  isVisiblePagination?: boolean;
 }
 
 function ReactTableComponent(props: ReactTableComponentProps) {
+  const {
+    applyFilter,
+    columns,
+    columnSizeMap,
+    compactMode,
+    disableDrag,
+    editMode,
+    filters,
+    handleReorderColumn,
+    handleResizeColumn,
+    height,
+    isLoading,
+    isVisibleCompactMode,
+    isVisibleDownload,
+    isVisibleFilters,
+    isVisiblePagination,
+    isVisibleSearch,
+    multiRowSelection,
+    nextPageClick,
+    onRowClick,
+    pageNo,
+    pageSize,
+    prevPageClick,
+    searchKey,
+    searchTableData,
+    selectAllRow,
+    selectedRowIndex,
+    selectedRowIndices,
+    serverSidePaginationEnabled,
+    sortTableColumn: _sortTableColumn,
+    tableData,
+    triggerRowSelection,
+    unSelectAllRow,
+    updateCompactMode,
+    updatePageNo,
+    widgetId,
+    widgetName,
+    width,
+  } = props;
+
   const { columnOrder, hiddenColumns } = useMemo(() => {
     const order: string[] = [];
     const hidden: string[] = [];
-    props.columns.forEach((item) => {
+    columns.forEach((item) => {
       if (item.isHidden) {
         hidden.push(item.accessor);
       } else {
@@ -79,12 +128,12 @@ function ReactTableComponent(props: ReactTableComponentProps) {
       }
     });
     return { columnOrder: order, hiddenColumns: hidden };
-  }, [props.columns]);
+  }, [columns]);
 
   useEffect(() => {
     let dragged = -1;
     const headers = Array.prototype.slice.call(
-      document.querySelectorAll(`#table${props.widgetId} .draggable-header`),
+      document.querySelectorAll(`#table${widgetId} .draggable-header`),
     );
     headers.forEach((header, i) => {
       header.setAttribute("draggable", true);
@@ -149,7 +198,7 @@ function ReactTableComponent(props: ReactTableComponentProps) {
           if (movedColumnName && movedColumnName.length === 1) {
             newColumnOrder.splice(i, 0, movedColumnName[0]);
           }
-          props.handleReorderColumn([...newColumnOrder, ...hiddenColumns]);
+          handleReorderColumn([...newColumnOrder, ...hiddenColumns]);
         } else {
           dragged = -1;
         }
@@ -159,15 +208,15 @@ function ReactTableComponent(props: ReactTableComponentProps) {
 
   const sortTableColumn = (columnIndex: number, asc: boolean) => {
     if (columnIndex === -1) {
-      props.sortTableColumn("", asc);
+      _sortTableColumn("", asc);
     } else {
-      const column = props.columns[columnIndex];
+      const column = columns[columnIndex];
       const columnType = column.metaProperties?.type || ColumnTypes.TEXT;
       if (
         columnType !== ColumnTypes.IMAGE &&
         columnType !== ColumnTypes.VIDEO
       ) {
-        props.sortTableColumn(column.accessor, asc);
+        _sortTableColumn(column.accessor, asc);
       }
     }
   };
@@ -176,50 +225,103 @@ function ReactTableComponent(props: ReactTableComponentProps) {
     original: Record<string, unknown>;
     index: number;
   }) => {
-    props.onRowClick(row.original, row.index);
+    onRowClick(row.original, row.index);
+  };
+
+  const toggleAllRowSelect = (
+    isSelect: boolean,
+    pageData: Row<Record<string, unknown>>[],
+  ) => {
+    if (isSelect) {
+      selectAllRow(pageData);
+    } else {
+      unSelectAllRow(pageData);
+    }
   };
 
   return (
     <Table
-      applyFilter={props.applyFilter}
-      columnSizeMap={props.columnSizeMap}
-      columns={props.columns}
-      compactMode={props.compactMode}
-      data={props.tableData}
+      applyFilter={applyFilter}
+      columnSizeMap={columnSizeMap}
+      columns={columns}
+      compactMode={compactMode}
+      data={tableData}
       disableDrag={() => {
-        props.disableDrag(true);
+        disableDrag(true);
       }}
-      editMode={props.editMode}
+      editMode={editMode}
       enableDrag={() => {
-        props.disableDrag(false);
+        disableDrag(false);
       }}
-      filters={props.filters}
-      handleResizeColumn={props.handleResizeColumn}
-      height={props.height}
-      isLoading={props.isLoading}
-      nextPageClick={() => {
-        props.nextPageClick();
-      }}
-      pageNo={props.pageNo - 1}
-      pageSize={props.pageSize || 1}
-      prevPageClick={() => {
-        props.prevPageClick();
-      }}
-      searchKey={props.searchKey}
-      searchTableData={props.searchTableData}
+      filters={filters}
+      handleResizeColumn={handleResizeColumn}
+      height={height}
+      isLoading={isLoading}
+      isVisibleCompactMode={isVisibleCompactMode}
+      isVisibleDownload={isVisibleDownload}
+      isVisibleFilters={isVisibleFilters}
+      isVisiblePagination={isVisiblePagination}
+      isVisibleSearch={isVisibleSearch}
+      multiRowSelection={multiRowSelection}
+      nextPageClick={nextPageClick}
+      pageNo={pageNo - 1}
+      pageSize={pageSize || 1}
+      prevPageClick={prevPageClick}
+      searchKey={searchKey}
+      searchTableData={searchTableData}
       selectTableRow={selectTableRow}
-      selectedRowIndex={props.selectedRowIndex}
-      selectedRowIndices={props.selectedRowIndices}
-      serverSidePaginationEnabled={props.serverSidePaginationEnabled}
+      selectedRowIndex={selectedRowIndex}
+      selectedRowIndices={selectedRowIndices}
+      serverSidePaginationEnabled={serverSidePaginationEnabled}
       sortTableColumn={sortTableColumn}
-      triggerRowSelection={props.triggerRowSelection}
-      updateCompactMode={props.updateCompactMode}
-      updatePageNo={props.updatePageNo}
-      widgetId={props.widgetId}
-      widgetName={props.widgetName}
-      width={props.width}
+      toggleAllRowSelect={toggleAllRowSelect}
+      triggerRowSelection={triggerRowSelection}
+      updateCompactMode={updateCompactMode}
+      updatePageNo={updatePageNo}
+      widgetId={widgetId}
+      widgetName={widgetName}
+      width={width}
     />
   );
 }
 
-export default ReactTableComponent;
+export default React.memo(ReactTableComponent, (prev, next) => {
+  return (
+    prev.applyFilter === next.applyFilter &&
+    prev.compactMode === next.compactMode &&
+    prev.disableDrag === next.disableDrag &&
+    prev.editMode === next.editMode &&
+    prev.filters === next.filters &&
+    prev.handleReorderColumn === next.handleReorderColumn &&
+    prev.handleResizeColumn === next.handleResizeColumn &&
+    prev.height === next.height &&
+    prev.isLoading === next.isLoading &&
+    prev.isVisibleCompactMode === next.isVisibleCompactMode &&
+    prev.isVisibleDownload === next.isVisibleDownload &&
+    prev.isVisibleFilters === next.isVisibleFilters &&
+    prev.isVisiblePagination === next.isVisiblePagination &&
+    prev.isVisibleSearch === next.isVisibleSearch &&
+    prev.nextPageClick === next.nextPageClick &&
+    prev.onRowClick === next.onRowClick &&
+    prev.pageNo === next.pageNo &&
+    prev.pageSize === next.pageSize &&
+    prev.prevPageClick === next.prevPageClick &&
+    prev.searchKey === next.searchKey &&
+    prev.searchTableData === next.searchTableData &&
+    prev.selectedRowIndex === next.selectedRowIndex &&
+    prev.selectedRowIndices === next.selectedRowIndices &&
+    prev.serverSidePaginationEnabled === next.serverSidePaginationEnabled &&
+    prev.sortTableColumn === next.sortTableColumn &&
+    prev.triggerRowSelection === next.triggerRowSelection &&
+    prev.updateCompactMode === next.updateCompactMode &&
+    prev.updatePageNo === next.updatePageNo &&
+    prev.widgetId === next.widgetId &&
+    prev.widgetName === next.widgetName &&
+    prev.width === next.width &&
+    isEqual(prev.columnSizeMap, next.columnSizeMap) &&
+    isEqual(prev.tableData, next.tableData) &&
+    // Using JSON stringify becuase isEqual doesnt work with functions,
+    // and we are not changing the columns manually.
+    JSON.stringify(prev.columns) === JSON.stringify(next.columns)
+  );
+});
diff --git a/app/client/src/components/designSystems/appsmith/TabsComponent.tsx b/app/client/src/components/designSystems/appsmith/TabsComponent.tsx
index 75a541f905..06c79f905b 100644
--- a/app/client/src/components/designSystems/appsmith/TabsComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/TabsComponent.tsx
@@ -6,7 +6,6 @@ import {
   TabContainerWidgetProps,
 } from "widgets/Tabs/TabsWidget";
 import { generateClassName, getCanvasClassName } from "utils/generators";
-import { getBorderCSSShorthand } from "constants/DefaultTheme";
 import ScrollIndicator from "components/ads/ScrollIndicator";
 
 interface TabsComponentProps extends ComponentProps {
@@ -37,14 +36,13 @@ const TabsContainerWrapper = styled.div<{
   width: 100%;
   justify-content: center;
   align-items: center;
-  border: ${(props) => getBorderCSSShorthand(props.theme.borders[2])};
+  box-shadow: 0px 0px 0px 1px #e7e7e7;
   border-radius: 0;
-  box-shadow: none;
   overflow: hidden;
 `;
 
 const ChildrenWrapper = styled.div`
-  height: 100%;
+  height: calc(100% - 40px);
   width: 100%;
   position: relative;
   background: ${(props) => props.theme.colors.builderBodyBG};
diff --git a/app/client/src/components/designSystems/appsmith/TextInputComponent.tsx b/app/client/src/components/designSystems/appsmith/TextInputComponent.tsx
index b6464432aa..4703969f05 100644
--- a/app/client/src/components/designSystems/appsmith/TextInputComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/TextInputComponent.tsx
@@ -109,11 +109,11 @@ export class BaseTextInput extends Component<TextInputProps, TextInputState> {
   };
   render() {
     const {
+      className,
       input,
       meta,
-      showError,
-      className,
       refHandler,
+      showError,
       ...rest
     } = this.props;
     const hasError = !!(
diff --git a/app/client/src/components/designSystems/appsmith/VideoComponent.tsx b/app/client/src/components/designSystems/appsmith/VideoComponent.tsx
index b24fda9851..ab6faffd7c 100644
--- a/app/client/src/components/designSystems/appsmith/VideoComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/VideoComponent.tsx
@@ -29,18 +29,18 @@ const Error = styled.span``;
 
 export default function VideoComponent(props: VideoComponentProps) {
   const {
-    url,
     autoplay,
     controls,
-    onStart,
-    onPlay,
-    onPause,
     onEnded,
-    onReady,
-    onProgress,
-    onSeek,
     onError,
+    onPause,
+    onPlay,
+    onProgress,
+    onReady,
+    onSeek,
+    onStart,
     player,
+    url,
   } = props;
   return url ? (
     <ReactPlayer
diff --git a/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx b/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx
index 44b5338312..a85b4c5a8b 100644
--- a/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useRef, useState } from "react";
 import {
   IButtonProps,
   MaybeElement,
@@ -18,6 +18,7 @@ import {
 } from "constants/messages";
 import { Variant } from "components/ads/common";
 import { Toaster } from "components/ads/Toast";
+import ReCAPTCHA from "react-google-recaptcha";
 
 const getButtonColorStyles = (props: { theme: Theme } & ButtonStyleProps) => {
   if (props.filled) return props.theme.colors.textOnDarkBG;
@@ -35,6 +36,14 @@ const ButtonColorStyles = css<ButtonStyleProps>`
     fill: ${getButtonColorStyles};
   }
 `;
+
+const RecaptchaWrapper = styled.div`
+  position: relative;
+  .grecaptcha-badge {
+    visibility: hidden;
+  }
+`;
+
 const AccentColorMap: Record<ButtonStyleName, string> = {
   primary: "primaryOld",
   secondary: "secondaryOld",
@@ -42,7 +51,7 @@ const AccentColorMap: Record<ButtonStyleName, string> = {
 };
 
 const ButtonWrapper = styled((props: ButtonStyleProps & IButtonProps) => (
-  <Button {..._.omit(props, ["accent", "filled"])} />
+  <Button {..._.omit(props, ["accent", "filled", "disabled"])} />
 ))<ButtonStyleProps>`
   &&&& {
     ${ButtonColorStyles};
@@ -122,7 +131,10 @@ type ButtonStyleProps = {
 
 // To be used in any other part of the app
 export function BaseButton(props: IButtonProps & ButtonStyleProps) {
-  return <ButtonWrapper {...props} />;
+  const className = props.disabled
+    ? `${props.className} bp3-disabled`
+    : props.className;
+  return <ButtonWrapper {...props} className={className} />;
 }
 
 BaseButton.defaultProps = {
@@ -141,6 +153,7 @@ export enum ButtonType {
 interface RecaptchaProps {
   googleRecaptchaKey?: string;
   clickWithRecaptcha: (token: string) => void;
+  recaptchaV2?: boolean;
 }
 
 interface ButtonContainerProps extends ComponentProps {
@@ -167,50 +180,107 @@ const mapButtonStyleToStyleName = (buttonStyle?: ButtonStyle) => {
   }
 };
 
-function RecaptchaComponent(
+function RecaptchaV2Component(
   props: {
     children: any;
     onClick?: (event: React.MouseEvent<HTMLElement>) => void;
+    recaptchaV2?: boolean;
+    handleError: (event: React.MouseEvent<HTMLElement>, error: string) => void;
   } & RecaptchaProps,
 ) {
-  function handleError(event: React.MouseEvent<HTMLElement>, error: string) {
-    Toaster.show({
-      text: error,
-      variant: Variant.danger,
-    });
-    props.onClick && props.onClick(event);
-  }
-  const status = useScript(
-    `https://www.google.com/recaptcha/api.js?render=${props.googleRecaptchaKey}`,
-  );
-  return (
-    <div
-      onClick={(event: React.MouseEvent<HTMLElement>) => {
-        if (status === ScriptStatus.READY) {
-          (window as any).grecaptcha.ready(() => {
-            try {
-              (window as any).grecaptcha
-                .execute(props.googleRecaptchaKey, { action: "submit" })
-                .then((token: any) => {
-                  props.clickWithRecaptcha(token);
-                })
-                .catch(() => {
-                  // Handle corrent key with wrong
-                  handleError(event, createMessage(GOOGLE_RECAPTCHA_KEY_ERROR));
-                });
-            } catch (ex) {
-              // Handle wrong key
-              handleError(event, createMessage(GOOGLE_RECAPTCHA_DOMAIN_ERROR));
-            }
-          });
+  const recaptchaRef = useRef<ReCAPTCHA>(null);
+  const [isInvalidKey, setInvalidKey] = useState(false);
+  const handleBtnClick = async (event: React.MouseEvent<HTMLElement>) => {
+    if (isInvalidKey) {
+      // Handle incorrent google recaptcha site key
+      props.handleError(event, createMessage(GOOGLE_RECAPTCHA_KEY_ERROR));
+    } else {
+      try {
+        const token = await recaptchaRef?.current?.executeAsync();
+        if (token) {
+          props.clickWithRecaptcha(token);
+        } else {
+          // Handle incorrent google recaptcha site key
+          props.handleError(event, createMessage(GOOGLE_RECAPTCHA_KEY_ERROR));
         }
-      }}
-    >
+      } catch (err) {
+        // Handle error due to google recaptcha key of different domain
+        props.handleError(event, createMessage(GOOGLE_RECAPTCHA_DOMAIN_ERROR));
+      }
+    }
+  };
+  return (
+    <RecaptchaWrapper onClick={handleBtnClick}>
       {props.children}
-    </div>
+      <ReCAPTCHA
+        onErrored={() => setInvalidKey(true)}
+        ref={recaptchaRef}
+        sitekey={props.googleRecaptchaKey || ""}
+        size="invisible"
+      />
+    </RecaptchaWrapper>
   );
 }
 
+function RecaptchaV3Component(
+  props: {
+    children: any;
+    onClick?: (event: React.MouseEvent<HTMLElement>) => void;
+    recaptchaV2?: boolean;
+    handleError: (event: React.MouseEvent<HTMLElement>, error: string) => void;
+  } & RecaptchaProps,
+) {
+  // Check if a string is a valid JSON string
+  const checkValidJson = (inputString: string): boolean => {
+    try {
+      JSON.parse(inputString);
+      return true;
+    } catch (err) {
+      return false;
+    }
+  };
+
+  const handleBtnClick = (event: React.MouseEvent<HTMLElement>) => {
+    if (status === ScriptStatus.READY) {
+      (window as any).grecaptcha.ready(() => {
+        try {
+          (window as any).grecaptcha
+            .execute(props.googleRecaptchaKey, {
+              action: "submit",
+            })
+            .then((token: any) => {
+              props.clickWithRecaptcha(token);
+            })
+            .catch(() => {
+              // Handle incorrent google recaptcha site key
+              props.handleError(
+                event,
+                createMessage(GOOGLE_RECAPTCHA_KEY_ERROR),
+              );
+            });
+        } catch (err) {
+          // Handle error due to google recaptcha key of different domain
+          props.handleError(
+            event,
+            createMessage(GOOGLE_RECAPTCHA_DOMAIN_ERROR),
+          );
+        }
+      });
+    }
+  };
+
+  let validGoogleRecaptchaKey = props.googleRecaptchaKey;
+
+  if (validGoogleRecaptchaKey && checkValidJson(validGoogleRecaptchaKey)) {
+    validGoogleRecaptchaKey = undefined;
+  }
+
+  const status = useScript(
+    `https://www.google.com/recaptcha/api.js?render=${validGoogleRecaptchaKey}`,
+  );
+  return <div onClick={handleBtnClick}>{props.children}</div>;
+}
+
 function BtnWrapper(
   props: {
     children: any;
@@ -219,7 +289,23 @@ function BtnWrapper(
 ) {
   if (!props.googleRecaptchaKey)
     return <div onClick={props.onClick}>{props.children}</div>;
-  return <RecaptchaComponent {...props} />;
+  else {
+    const handleError = (
+      event: React.MouseEvent<HTMLElement>,
+      error: string,
+    ) => {
+      Toaster.show({
+        text: error,
+        variant: Variant.danger,
+      });
+      props.onClick && props.onClick(event);
+    };
+    if (props.recaptchaV2) {
+      return <RecaptchaV2Component {...props} handleError={handleError} />;
+    } else {
+      return <RecaptchaV3Component {...props} handleError={handleError} />;
+    }
+  }
 }
 
 // To be used with the canvas
@@ -231,6 +317,7 @@ function ButtonContainer(
       clickWithRecaptcha={props.clickWithRecaptcha}
       googleRecaptchaKey={props.googleRecaptchaKey}
       onClick={props.onClick}
+      recaptchaV2={props.recaptchaV2}
     >
       <BaseButton
         accent={mapButtonStyleToStyleName(props.buttonStyle)}
diff --git a/app/client/src/components/designSystems/blueprint/DatePickerComponent2.tsx b/app/client/src/components/designSystems/blueprint/DatePickerComponent2.tsx
index 13f2aaf2e5..a2d410b84f 100644
--- a/app/client/src/components/designSystems/blueprint/DatePickerComponent2.tsx
+++ b/app/client/src/components/designSystems/blueprint/DatePickerComponent2.tsx
@@ -107,7 +107,7 @@ class DatePickerComponent extends React.Component<
       ? new Date(this.props.maxDate)
       : now
           .clone()
-          .set({ month: 11, date: 31, year: year + 20 })
+          .set({ month: 11, date: 31, year: year + 100 })
           .toDate();
     const isValid = this.state.selectedDate
       ? this.isValidDate(new Date(this.state.selectedDate))
@@ -168,6 +168,7 @@ class DatePickerComponent extends React.Component<
       if (
         this.props.minDate &&
         parsedMinDate.isValid() &&
+        !parsedCurrentDate.isSame(parsedMinDate, "day") &&
         parsedCurrentDate.isBefore(parsedMinDate)
       ) {
         isValid = false;
@@ -179,6 +180,7 @@ class DatePickerComponent extends React.Component<
         isValid &&
         this.props.maxDate &&
         parsedMaxDate.isValid() &&
+        !parsedCurrentDate.isSame(parsedMaxDate, "day") &&
         parsedCurrentDate.isAfter(parsedMaxDate)
       ) {
         isValid = false;
@@ -194,8 +196,8 @@ class DatePickerComponent extends React.Component<
 
   parseDate = (dateStr: string): Date => {
     const date = moment(dateStr);
-
-    if (date.isValid()) return moment(dateStr).toDate();
+    const dateFormat = this.props.dateFormat || ISO_DATE_FORMAT;
+    if (date.isValid()) return moment(dateStr, dateFormat).toDate();
     else return moment().toDate();
   };
 
diff --git a/app/client/src/components/designSystems/blueprint/DividerComponent.tsx b/app/client/src/components/designSystems/blueprint/DividerComponent.tsx
new file mode 100644
index 0000000000..e3c8330a66
--- /dev/null
+++ b/app/client/src/components/designSystems/blueprint/DividerComponent.tsx
@@ -0,0 +1,191 @@
+import React from "react";
+import { ComponentProps } from "components/designSystems/appsmith/BaseComponent";
+import styled from "styled-components";
+import { isUndefined } from "lodash";
+
+const DividerWrapper = styled.div<{
+  isHorizontal: boolean;
+  thickness: number;
+  showStartCap: boolean;
+  showEndCap: boolean;
+}>`
+  height: 100%;
+  width: 100%;
+  position: relative;
+  display: flex;
+  overflow: hidden;
+  justify-content: center;
+  align-items: center;
+  ${(props) => {
+    const paddingVal = props.thickness / 2;
+    let padStyle: string;
+    if (props.isHorizontal) {
+      padStyle = `padding: 0px ${
+        props.showEndCap ? paddingVal + "px" : "0px"
+      } 0px ${props.showStartCap ? paddingVal + "px" : "0px"};`;
+    } else {
+      padStyle = `padding: ${
+        props.showStartCap ? paddingVal + "px" : "0px"
+      } 0px ${props.showEndCap ? paddingVal + "px" : "0px"} 0px;`;
+    }
+    return padStyle;
+  }}
+`;
+const HorizontalDivider = styled.div<Partial<DividerComponentProps>>`
+  height: 0px;
+  width: 100%;
+  border-top: ${(props) =>
+    `${props.thickness || 1}px ${props.strokeStyle ||
+      "solid"} ${props.dividerColor || "black"};`};
+`;
+const VerticalDivider = styled.div<Partial<DividerComponentProps>>`
+  width: 0px;
+  height: 100%;
+  border-right: ${(props) =>
+    `${props.thickness || 1}px ${props.strokeStyle ||
+      "solid"} ${props.dividerColor || "black"};`};
+`;
+
+const CapWrapper = styled.div<{
+  isHorizontal: boolean;
+  isStartCap: boolean;
+  size: number;
+}>`
+  position: absolute;
+  height: ${(props) => props.size}px;
+  width: ${(props) => props.size}px;
+  ${(props) =>
+    props.isStartCap
+      ? props.isHorizontal
+        ? "left: 0px;"
+        : "top: 0px;"
+      : props.isHorizontal
+      ? "right: 0px;"
+      : "bottom: 0px;"}
+  ${(props) => (props.isHorizontal ? "top" : "left")}: 50%;
+  ${(props) =>
+    props.isHorizontal
+      ? "transform: translateY(-50%);"
+      : "transform: translateX(-50%);"};
+
+  svg {
+    display: block;
+    height: 100%;
+    width: 100%;
+
+    &.arrow {
+      ${(
+        props, // rotate icon according to its pos
+      ) =>
+        props.isStartCap
+          ? props.isHorizontal
+            ? "transform: rotate(0deg);"
+            : "transform: rotate(90deg);"
+          : props.isHorizontal
+          ? "transform: rotate(180deg);"
+          : "transform: rotate(270deg);"}
+
+      path {
+        transform: translateX(-3px);
+      }
+    }
+  }
+`;
+
+class DividerComponent extends React.Component<DividerComponentProps> {
+  render() {
+    const {
+      capSide,
+      capType,
+      dividerColor,
+      orientation,
+      strokeStyle,
+      thickness,
+    } = this.props;
+    const showStartCap =
+      capType !== "nc" && (isUndefined(capSide) ? false : capSide <= 0);
+    const showEndCap =
+      capType !== "nc" && (isUndefined(capSide) ? false : capSide >= 0);
+
+    return (
+      <DividerWrapper
+        className="t--divider-widget"
+        isHorizontal={orientation === "horizontal"}
+        showEndCap={showEndCap}
+        showStartCap={showStartCap}
+        thickness={thickness || 1}
+      >
+        {orientation === "horizontal" ? (
+          <HorizontalDivider
+            data-testid="dividerHorizontal"
+            dividerColor={dividerColor}
+            strokeStyle={strokeStyle}
+            thickness={thickness}
+          />
+        ) : (
+          <VerticalDivider
+            data-testid="dividerVertical"
+            dividerColor={dividerColor}
+            strokeStyle={strokeStyle}
+            thickness={thickness}
+          />
+        )}
+
+        {showStartCap && this.renderCap(true)}
+        {showEndCap && this.renderCap(false)}
+      </DividerWrapper>
+    );
+  }
+
+  renderCap = (isStartCap: boolean) => {
+    const { capType, dividerColor, orientation, thickness } = this.props;
+    const isHorizontal = orientation === "horizontal";
+    // size calculations
+    const strokeSize = thickness || 1;
+    const sizeMultiplier = capType === "dot" ? 3.5 : 5;
+    const capSize = strokeSize * sizeMultiplier;
+    const halfCapSize = capSize / 2;
+
+    return (
+      <CapWrapper
+        isHorizontal={isHorizontal}
+        isStartCap={isStartCap}
+        size={capSize}
+      >
+        {capType === "dot" ? (
+          <svg>
+            <circle
+              cx={halfCapSize}
+              cy={halfCapSize}
+              fill={dividerColor}
+              r={halfCapSize}
+            />
+          </svg>
+        ) : (
+          <svg className="arrow" height="14" viewBox="0 0 8 14" width="8">
+            <path
+              d="M7 13L1 7L7 1"
+              fill="none"
+              stroke={dividerColor}
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="2"
+            />
+          </svg>
+        )}
+      </CapWrapper>
+    );
+  };
+}
+
+export interface DividerComponentProps extends ComponentProps {
+  capType: string;
+  capSide?: number;
+  orientation: string;
+  strokeStyle?: "solid" | "dashed" | "dotted";
+  dividerColor?: string;
+  thickness?: number;
+  className?: string;
+}
+
+export default DividerComponent;
diff --git a/app/client/src/components/designSystems/blueprint/DropdownComponent.tsx b/app/client/src/components/designSystems/blueprint/DropdownComponent.tsx
index 3487aab4b8..67405695a5 100644
--- a/app/client/src/components/designSystems/blueprint/DropdownComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/DropdownComponent.tsx
@@ -188,6 +188,7 @@ const StyledMultiDropDown = styled(MultiDropDown)<{
         overflow: hidden;
         display: flex;
         height: ${(props) => props.height - WIDGET_PADDING * 2 - 2}px;
+        align-content: flex-start;
       }
 
       .${Classes.TAG} {
@@ -228,17 +229,35 @@ const StyledMultiDropDown = styled(MultiDropDown)<{
     }
   }
 `;
+interface DropDownComponentState {
+  portalContainer: HTMLElement;
+}
+
+class DropDownComponent extends React.Component<
+  DropDownComponentProps,
+  DropDownComponentState
+> {
+  private _menu = React.createRef<HTMLDivElement>();
+  constructor(props: DropDownComponentProps) {
+    super(props);
+    this.state = { portalContainer: this._menu.current as HTMLElement };
+  }
+  componentDidMount() {
+    this.setState({
+      portalContainer: this.props.getDropdownPosition(this._menu.current),
+    });
+  }
 
-class DropDownComponent extends React.Component<DropDownComponentProps> {
   render() {
-    const { selectedIndexArr, options } = this.props;
+    const { options, selectedIndexArr } = this.props;
+    const { portalContainer } = this.state;
     const selectedItems = selectedIndexArr
       ? _.map(selectedIndexArr, (index) => options[index])
       : [];
     const hideCloseButtonIndex = -1;
 
     return (
-      <DropdownContainer>
+      <DropdownContainer ref={this._menu as React.RefObject<HTMLDivElement>}>
         <DropdownStyles />
         <StyledControlGroup
           fill
@@ -259,7 +278,7 @@ class DropDownComponent extends React.Component<DropDownComponentProps> {
             <StyledSingleDropDown
               className={this.props.isLoading ? Classes.SKELETON : ""}
               disabled={this.props.disabled}
-              filterable
+              filterable={this.props.isFilterable}
               itemListPredicate={this.itemListPredicate}
               itemRenderer={this.renderSingleSelectItem}
               items={this.props.options}
@@ -267,6 +286,11 @@ class DropDownComponent extends React.Component<DropDownComponentProps> {
               popoverProps={{
                 minimal: true,
                 usePortal: true,
+                modifiers: {
+                  preventOverflow: {
+                    enabled: false,
+                  },
+                },
                 popoverClassName: "select-popover-wrapper",
               }}
             >
@@ -294,6 +318,12 @@ class DropDownComponent extends React.Component<DropDownComponentProps> {
               popoverProps={{
                 minimal: true,
                 usePortal: true,
+                portalContainer,
+                modifiers: {
+                  preventOverflow: {
+                    enabled: false,
+                  },
+                },
                 popoverClassName: "select-popover-wrapper",
               }}
               resetOnSelect
@@ -332,7 +362,7 @@ class DropDownComponent extends React.Component<DropDownComponentProps> {
     this.props.onOptionSelected(item);
   };
 
-  onItemRemoved = (_tag: string, index: number) => {
+  onItemRemoved = (_tag: ReactNode, index: number) => {
     this.props.onOptionRemoved(this.props.selectedIndexArr[index]);
   };
 
@@ -412,8 +442,10 @@ export interface DropDownComponentProps extends ComponentProps {
   selectedIndexArr: number[];
   options: DropdownOption[];
   isLoading: boolean;
+  isFilterable: boolean;
   width: number;
   height: number;
+  getDropdownPosition: (node: HTMLDivElement | null) => HTMLElement;
 }
 
 export default DropDownComponent;
diff --git a/app/client/src/components/designSystems/blueprint/IframeComponent.tsx b/app/client/src/components/designSystems/blueprint/IframeComponent.tsx
new file mode 100644
index 0000000000..9ad03cc783
--- /dev/null
+++ b/app/client/src/components/designSystems/blueprint/IframeComponent.tsx
@@ -0,0 +1,75 @@
+import React, { useEffect } from "react";
+import styled from "styled-components";
+
+import { ComponentProps } from "components/designSystems/appsmith/BaseComponent";
+import { hexToRgba } from "components/ads/common";
+
+interface IframeContainerProps {
+  borderColor?: string;
+  borderOpacity?: number;
+  borderWidth?: number;
+}
+
+export const IframeContainer = styled.div<IframeContainerProps>`
+  height: 100%;
+  iframe {
+    width: 100%;
+    height: 100%;
+    border-style: solid;
+    border-color: ${(props) =>
+      hexToRgba(
+        props.borderColor || props.theme.colors.border,
+        (props.borderOpacity && !isNaN(props.borderOpacity)
+          ? props.borderOpacity
+          : 100) / 100,
+      )};
+    border-width: ${(props) =>
+      props.borderWidth ? Number(props.borderWidth) : 0}px;
+  }
+`;
+
+export interface IframeComponentProps extends ComponentProps {
+  source: string;
+  title?: string;
+  onURLChanged: (url: string) => void;
+  onMessageReceived: (message: MessageEvent) => void;
+  borderColor?: string;
+  borderOpacity?: number;
+  borderWidth?: number;
+}
+
+function IframeComponent(props: IframeComponentProps) {
+  const {
+    borderColor,
+    borderOpacity,
+    borderWidth,
+    onMessageReceived,
+    onURLChanged,
+    source,
+    title,
+  } = props;
+
+  useEffect(() => {
+    // add a listener
+    window.addEventListener("message", onMessageReceived, false);
+    // clean up
+    return () =>
+      window.removeEventListener("message", onMessageReceived, false);
+  }, []);
+
+  useEffect(() => {
+    onURLChanged(source);
+  }, [source]);
+
+  return (
+    <IframeContainer
+      borderColor={borderColor}
+      borderOpacity={borderOpacity}
+      borderWidth={borderWidth}
+    >
+      <iframe src={source} title={title} />
+    </IframeContainer>
+  );
+}
+
+export default IframeComponent;
diff --git a/app/client/src/components/designSystems/blueprint/InputComponent.test.tsx b/app/client/src/components/designSystems/blueprint/InputComponent.test.tsx
new file mode 100644
index 0000000000..ad89728f32
--- /dev/null
+++ b/app/client/src/components/designSystems/blueprint/InputComponent.test.tsx
@@ -0,0 +1,52 @@
+import store from "store";
+import React from "react";
+import { ThemeProvider, theme } from "constants/DefaultTheme";
+import InputComponent from "components/designSystems/blueprint/InputComponent";
+import { Provider } from "react-redux";
+import ReactDOM from "react-dom";
+import { act } from "react-dom/test-utils";
+
+let container: HTMLDivElement | null;
+
+beforeEach(() => {
+  container = document.createElement("div");
+  document.body.appendChild(container);
+});
+
+afterEach(() => {
+  document.body.removeChild(container);
+  container = null;
+});
+
+describe("<InputComponent />", () => {
+  it("contains textarea with resize disabled", () => {
+    act(() => {
+      ReactDOM.render(
+        <Provider store={store}>
+          <ThemeProvider theme={theme}>
+            <InputComponent
+              inputType="TEXT"
+              isInvalid={false}
+              isLoading={false}
+              label="label"
+              multiline
+              onFocusChange={(state: boolean) => {
+                console.log(state);
+              }}
+              onValueChange={(valueAsString: string) => {
+                console.log(valueAsString);
+              }}
+              showError={false}
+              value="something"
+              widgetId="24234r35"
+            />
+          </ThemeProvider>
+        </Provider>,
+        container,
+      );
+    });
+    const textarea = container?.querySelector("textarea");
+    const styles = textarea ? getComputedStyle(textarea) : { resize: "" };
+    expect(styles.resize).toEqual("none");
+  });
+});
diff --git a/app/client/src/components/designSystems/blueprint/InputComponent.tsx b/app/client/src/components/designSystems/blueprint/InputComponent.tsx
index 24d684b7fc..6595466ebe 100644
--- a/app/client/src/components/designSystems/blueprint/InputComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/InputComponent.tsx
@@ -201,6 +201,7 @@ class InputComponent extends React.Component<
       onFocus={() => this.setFocusState(true)}
       onKeyDown={this.onKeyDownTextArea}
       placeholder={this.props.placeholder}
+      style={{ resize: "none" }}
       value={this.props.value}
     />
   );
diff --git a/app/client/src/components/designSystems/blueprint/ModalComponent.tsx b/app/client/src/components/designSystems/blueprint/ModalComponent.tsx
index e287d0662e..77b62fca83 100644
--- a/app/client/src/components/designSystems/blueprint/ModalComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/ModalComponent.tsx
@@ -2,12 +2,15 @@ import React, { ReactNode, RefObject, useRef, useEffect } from "react";
 import { Overlay, Classes } from "@blueprintjs/core";
 import styled from "styled-components";
 import { getCanvasClassName } from "utils/generators";
+import { Layers } from "constants/Layers";
 
 const Container = styled.div<{
-  width: number;
-  height: number;
+  width?: number;
+  height?: number;
   top?: number;
   left?: number;
+  bottom?: number;
+  right?: number;
   zIndex?: number;
 }>`
   &&& {
@@ -27,41 +30,48 @@ const Container = styled.div<{
       align-items: center;
       & .${Classes.OVERLAY_CONTENT} {
         max-width: 95%;
-        width: ${(props) => props.width}px;
-        min-height: ${(props) => props.height}px;
+        width: ${(props) => (props.width ? `${props.width}px` : "auto")};
+        min-height: ${(props) => (props.height ? `${props.height}px` : "auto")};
         background: white;
         border-radius: ${(props) => props.theme.radii[0]}px;
         top: ${(props) => props.top}px;
         left: ${(props) => props.left}px;
+        bottom: ${(props) => props.bottom}px;
+        right: ${(props) => props.right}px;
       }
     }
   }
 `;
 const Content = styled.div<{
-  height: number;
+  height?: number;
   scroll: boolean;
   ref: RefObject<HTMLDivElement>;
 }>`
   overflow-y: ${(props) => (props.scroll ? "visible" : "hidden")};
   overflow-x: hidden;
   width: 100%;
-  height: ${(props) => props.height}px;
+  height: ${(props) => (props.height ? `${props.height}px` : "auto")};
 `;
 
 export type ModalComponentProps = {
   isOpen: boolean;
   onClose: (e: any) => void;
+  onModalClose?: () => void;
   children: ReactNode;
-  width: number;
+  width?: number;
   className?: string;
   canOutsideClickClose: boolean;
   canEscapeKeyClose: boolean;
+  overlayClassName?: string;
   scrollContents: boolean;
-  height: number;
+  height?: number;
   top?: number;
   left?: number;
+  bottom?: number;
+  right?: number;
   hasBackDrop?: boolean;
   zIndex?: number;
+  portalClassName?: string;
 };
 
 /* eslint-disable react/display-name */
@@ -69,42 +79,64 @@ export function ModalComponent(props: ModalComponentProps) {
   const modalContentRef: RefObject<HTMLDivElement> = useRef<HTMLDivElement>(
     null,
   );
+  useEffect(() => {
+    return () => {
+      // handle modal close events when this component unmounts
+      // will be called in all cases :-
+      //  escape key press, click out side, close click from other btn widget
+      if (props.onModalClose) props.onModalClose();
+    };
+  }, []);
   useEffect(() => {
     if (!props.scrollContents) {
       modalContentRef.current?.scrollTo({ top: 0, behavior: "smooth" });
     }
   }, [props.scrollContents]);
   return (
-    <Container
-      height={props.height}
-      left={props.left}
-      top={props.top}
-      width={props.width}
-      zIndex={props.zIndex !== undefined ? props.zIndex : 2}
+    <Overlay
+      canEscapeKeyClose={false}
+      canOutsideClickClose={false}
+      enforceFocus={false}
+      hasBackdrop={false}
+      isOpen={props.isOpen}
+      onClose={props.onClose}
+      portalClassName={`bp3-modal-widget ${props.portalClassName}`}
+      usePortal
     >
-      <Overlay
-        canEscapeKeyClose={props.canEscapeKeyClose}
-        canOutsideClickClose={props.canOutsideClickClose}
-        enforceFocus={false}
-        hasBackdrop={
-          props.hasBackDrop !== undefined ? !!props.hasBackDrop : true
-        }
-        isOpen={props.isOpen}
-        onClose={props.onClose}
-        usePortal={false}
+      <Container
+        bottom={props.bottom}
+        height={props.height}
+        left={props.left}
+        right={props.bottom}
+        top={props.top}
+        width={props.width}
+        zIndex={props.zIndex !== undefined ? props.zIndex : Layers.modalWidget}
       >
-        <div>
-          <Content
-            className={`${getCanvasClassName()} ${props.className}`}
-            height={props.height}
-            ref={modalContentRef}
-            scroll={props.scrollContents}
-          >
-            {props.children}
-          </Content>
-        </div>
-      </Overlay>
-    </Container>
+        <Overlay
+          canEscapeKeyClose={props.canEscapeKeyClose}
+          canOutsideClickClose={props.canOutsideClickClose}
+          className={props.overlayClassName}
+          enforceFocus={false}
+          hasBackdrop={
+            props.hasBackDrop !== undefined ? !!props.hasBackDrop : true
+          }
+          isOpen={props.isOpen}
+          onClose={props.onClose}
+          usePortal={false}
+        >
+          <div>
+            <Content
+              className={`${getCanvasClassName()} ${props.className}`}
+              height={props.height}
+              ref={modalContentRef}
+              scroll={props.scrollContents}
+            >
+              {props.children}
+            </Content>
+          </div>
+        </Overlay>
+      </Container>
+    </Overlay>
   );
 }
 
diff --git a/app/client/src/components/designSystems/blueprint/RateComponent.tsx b/app/client/src/components/designSystems/blueprint/RateComponent.tsx
new file mode 100644
index 0000000000..207829a063
--- /dev/null
+++ b/app/client/src/components/designSystems/blueprint/RateComponent.tsx
@@ -0,0 +1,145 @@
+import React, { useState, useEffect } from "react";
+import { Icon, Position } from "@blueprintjs/core";
+import { IconNames } from "@blueprintjs/icons";
+import styled from "styled-components";
+import Rating from "react-rating";
+import _ from "lodash";
+
+import { ComponentProps } from "components/designSystems/appsmith/BaseComponent";
+import { RateSize, RATE_SIZES } from "constants/WidgetConstants";
+import TooltipComponent from "components/ads/Tooltip";
+
+/*
+  Note:
+  -webkit-line-clamp may seem like a wierd way to doing this
+  however, it is getting more and more useful with more browser support.
+  It suffices for our target browsers
+  More info: https://css-tricks.com/line-clampin/
+*/
+
+interface RateContainerProps {
+  scrollable: boolean;
+}
+
+export const RateContainer = styled.div<RateContainerProps>`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  align-content: flex-start;
+  overflow: auto;
+
+  > span {
+    align-self: ${(props) => (props.scrollable ? "flex-start" : "center")};
+  }
+`;
+
+export const Star = styled(Icon)`
+  padding: ${(props) =>
+    props.iconSize === 12 ? 2.92 : props.iconSize === 16 ? 4.37 : 4.93}px;
+`;
+
+export interface RateComponentProps extends ComponentProps {
+  value: number;
+  isLoading: boolean;
+  maxCount: number;
+  size: RateSize;
+  onValueChanged: (value: number) => void;
+  tooltips?: Array<string>;
+  activeColor?: string;
+  inactiveColor?: string;
+  isAllowHalf?: boolean;
+  readonly?: boolean;
+  leftColumn?: number;
+  rightColumn?: number;
+  topRow?: number;
+  bottomRow?: number;
+}
+
+function renderStarsWithTooltip(props: RateComponentProps) {
+  const rateTooltips = props.tooltips || [];
+  const rateTooltipsCount = rateTooltips.length;
+  const deltaCount = props.maxCount - rateTooltipsCount;
+  if (rateTooltipsCount === 0) {
+    return (
+      <Star
+        color={props.activeColor}
+        icon={IconNames.STAR}
+        iconSize={RATE_SIZES[props.size]}
+      />
+    );
+  }
+  const starWithTooltip = rateTooltips.map((tooltip) => (
+    <TooltipComponent content={tooltip} key={tooltip} position={Position.TOP}>
+      <Star
+        color={props.activeColor}
+        icon={IconNames.STAR}
+        iconSize={RATE_SIZES[props.size]}
+      />
+    </TooltipComponent>
+  ));
+  const starWithoutTooltip = _.times(deltaCount, (num: number) => (
+    <Star
+      color={props.activeColor}
+      icon={IconNames.STAR}
+      iconSize={RATE_SIZES[props.size]}
+      key={num}
+    />
+  ));
+
+  return _.concat(starWithTooltip, starWithoutTooltip);
+}
+
+function RateComponent(props: RateComponentProps) {
+  const rateContainerRef = React.createRef<HTMLDivElement>();
+
+  const {
+    bottomRow,
+    inactiveColor,
+    isAllowHalf,
+    leftColumn,
+    maxCount,
+    onValueChanged,
+    readonly,
+    rightColumn,
+    size,
+    topRow,
+    value,
+  } = props;
+
+  const [scrollable, setScrollable] = useState(false);
+
+  useEffect(() => {
+    const rateContainerElement = rateContainerRef.current;
+    if (
+      rateContainerElement &&
+      rateContainerElement.scrollHeight > rateContainerElement.clientHeight
+    ) {
+      setScrollable(true);
+    } else {
+      setScrollable(false);
+    }
+  }, [leftColumn, rightColumn, topRow, bottomRow, maxCount, size]);
+
+  return (
+    <RateContainer ref={rateContainerRef} scrollable={scrollable}>
+      <Rating
+        emptySymbol={
+          <Star
+            color={inactiveColor}
+            icon={IconNames.STAR}
+            iconSize={RATE_SIZES[size]}
+          />
+        }
+        fractions={isAllowHalf ? 2 : 1}
+        fullSymbol={renderStarsWithTooltip(props)}
+        initialRating={value}
+        onChange={onValueChanged}
+        readonly={readonly}
+        stop={maxCount}
+      />
+    </RateContainer>
+  );
+}
+
+export default RateComponent;
diff --git a/app/client/src/components/designSystems/blueprint/SwitchComponent.tsx b/app/client/src/components/designSystems/blueprint/SwitchComponent.tsx
index b0b2475a58..d086e7f62e 100644
--- a/app/client/src/components/designSystems/blueprint/SwitchComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/SwitchComponent.tsx
@@ -27,12 +27,12 @@ const SwitchComponentContainer = styled.div`
 `;
 
 export function SwitchComponent({
-  label,
-  isSwitchedOn,
   alignWidget,
-  onChange,
   isDisabled,
   isLoading,
+  isSwitchedOn,
+  label,
+  onChange,
 }: SwitchComponentProps) {
   const switchAlignClass =
     alignWidget === "RIGHT" ? Alignment.RIGHT : Alignment.LEFT;
diff --git a/app/client/src/components/designSystems/blueprint/TextComponent.tsx b/app/client/src/components/designSystems/blueprint/TextComponent.tsx
index 2efd60d384..f6aef1368d 100644
--- a/app/client/src/components/designSystems/blueprint/TextComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/TextComponent.tsx
@@ -16,20 +16,13 @@ type TextStyleProps = {
 
 export const BaseText = styled(Text)<TextStyleProps>``;
 
-/*
-  Note:
-  -webkit-line-clamp may seem like a wierd way to doing this
-  however, it is getting more and more useful with more browser support.
-  It suffices for our target browsers
-  More info: https://css-tricks.com/line-clampin/
-*/
-
 export const TextContainer = styled.div`
   && {
     height: 100%;
     width: 100%;
   }
 `;
+
 export const StyledText = styled(Text)<{
   scroll: boolean;
   textAlign: string;
@@ -76,13 +69,13 @@ export interface TextComponentProps extends ComponentProps {
 class TextComponent extends React.Component<TextComponentProps> {
   render() {
     const {
-      text,
-      ellipsize,
-      textAlign,
-      fontStyle,
-      fontSize,
-      textColor,
       backgroundColor,
+      ellipsize,
+      fontSize,
+      fontStyle,
+      text,
+      textAlign,
+      textColor,
     } = this.props;
     return (
       <TextContainer>
@@ -98,7 +91,7 @@ class TextComponent extends React.Component<TextComponentProps> {
         >
           <Interweave
             content={text}
-            matchers={[new UrlMatcher("url"), new EmailMatcher("email")]}
+            matchers={[new EmailMatcher("email"), new UrlMatcher("url")]}
           />
         </StyledText>
       </TextContainer>
diff --git a/app/client/src/components/editorComponents/ActionCreator.tsx b/app/client/src/components/editorComponents/ActionCreator/Fields.tsx
similarity index 66%
rename from app/client/src/components/editorComponents/ActionCreator.tsx
rename to app/client/src/components/editorComponents/ActionCreator/Fields.tsx
index 9b15a4ff96..29884f65fb 100644
--- a/app/client/src/components/editorComponents/ActionCreator.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/Fields.tsx
@@ -1,14 +1,5 @@
 import React from "react";
-import { AppState } from "reducers";
-import { getActionsForCurrentPage } from "selectors/entitiesSelector";
-import {
-  getModalDropdownList,
-  getNextModalName,
-} from "selectors/widgetSelectors";
-import { getCurrentPageId } from "selectors/editorSelectors";
-import { ActionDataState } from "reducers/entityReducers/actionsReducer";
 import { DropdownOption } from "widgets/DropdownWidget";
-import { useDispatch, useSelector } from "react-redux";
 import TreeDropdown, { TreeDropdownOption } from "components/ads/TreeDropdown";
 import {
   ControlWrapper,
@@ -16,20 +7,9 @@ import {
 } from "components/propertyControls/StyledControls";
 import { KeyValueComponent } from "components/propertyControls/KeyValueComponent";
 import { InputText } from "components/propertyControls/InputTextControl";
-import { createModalAction } from "actions/widgetActions";
-import { createNewApiName, createNewQueryName } from "utils/AppsmithUtils";
 import { getDynamicBindings, isDynamicValue } from "utils/DynamicBindingUtils";
 import HightlightedCode from "components/editorComponents/HighlightedCode";
-import TreeStructure from "components/utils/TreeStructure";
-import {
-  createNewApiAction,
-  createNewQueryAction,
-} from "actions/apiPaneActions";
 import { NavigationTargetType } from "sagas/ActionExecutionSagas";
-import { checkCurrentStep } from "sagas/OnboardingSagas";
-import { OnboardingStep } from "constants/OnboardingConstants";
-import { getWidgets } from "sagas/selectors";
-import { PluginType } from "entities/Action";
 import { Skin } from "constants/DefaultTheme";
 
 /* eslint-disable @typescript-eslint/ban-types */
@@ -71,11 +51,11 @@ const NAVIGATION_TARGET_FIELD_OPTIONS = [
   },
 ];
 
-const FUNC_ARGS_REGEX = /((["][^"]*["])|([\[].*[\]])|([\{].*[\}])|(['][^']*['])|([\(].*[\)[=][>][{].*[}])|([^'",][^,"+]*[^'",]*))*/gi;
-const ACTION_TRIGGER_REGEX = /^{{([\s\S]*?)\(([\s\S]*?)\)}}$/g;
+export const FUNC_ARGS_REGEX = /((["][^"]*["])|([\[].*[\]])|([\{].*[\}])|(['][^']*['])|([\(].*[\)[=][>][{].*[}])|([^'",][^,"+]*[^'",]*))*/gi;
+export const ACTION_TRIGGER_REGEX = /^{{([\s\S]*?)\(([\s\S]*?)\)}}$/g;
 //Old Regex:: /\(\) => ([\s\S]*?)(\([\s\S]*?\))/g;
-const ACTION_ANONYMOUS_FUNC_REGEX = /\(\) => (({[\s\S]*?})|([\s\S]*?)(\([\s\S]*?\)))/g;
-const IS_URL_OR_MODAL = /^'.*'$/;
+export const ACTION_ANONYMOUS_FUNC_REGEX = /\(\) => (({[\s\S]*?})|([\s\S]*?)(\([\s\S]*?\)))/g;
+export const IS_URL_OR_MODAL = /^'.*'$/;
 const modalSetter = (changeValue: any, currentValue: string) => {
   const matches = [...currentValue.matchAll(ACTION_TRIGGER_REGEX)];
   let args: string[] = [];
@@ -108,7 +88,7 @@ export const modalGetter = (value: string) => {
 };
 
 export const stringToJS = (string: string): string => {
-  const { stringSegments, jsSnippets } = getDynamicBindings(string);
+  const { jsSnippets, stringSegments } = getDynamicBindings(string);
   const js = stringSegments
     .map((segment, index) => {
       if (jsSnippets[index] && jsSnippets[index].length > 0) {
@@ -213,16 +193,9 @@ const enumTypeGetter = (
   return defaultValue;
 };
 
-type ActionCreatorProps = {
-  value: string;
-  isValid: boolean;
-  validationMessage?: string;
-  onValueChange: (newValue: string) => void;
-  additionalAutoComplete?: Record<string, Record<string, unknown>>;
-};
-
-const ActionType = {
+export const ActionType = {
   none: "none",
+  integration: "integration",
   api: "api",
   query: "query",
   showModal: "showModal",
@@ -263,8 +236,6 @@ type SelectorViewProps = ViewProps & {
 
 type KeyValueViewProps = ViewProps;
 type TextViewProps = ViewProps & {
-  isValid: boolean;
-  validationMessage?: string;
   additionalAutoComplete?: Record<string, Record<string, unknown>>;
 };
 
@@ -307,10 +278,8 @@ const views = {
           {props.label && <label>{props.label}</label>}
           <InputText
             additionalAutocomplete={props.additionalAutoComplete}
-            errorMessage={props.validationMessage}
             evaluatedValue={props.get(props.value, false) as string}
             expected={"string"}
-            isValid={props.isValid}
             label={props.label}
             onChange={(event: any) => {
               if (event.target) {
@@ -327,7 +296,7 @@ const views = {
   },
 };
 
-const FieldType = {
+export const FieldType = {
   ACTION_SELECTOR_FIELD: "ACTION_SELECTOR_FIELD",
   ON_SUCCESS_FIELD: "ON_SUCCESS_FIELD",
   ON_ERROR_FIELD: "ON_ERROR_FIELD",
@@ -382,8 +351,7 @@ const fieldConfigs: FieldConfigs = {
       const type: ActionType = option.type || option.value;
       let value = option.value;
       switch (type) {
-        case ActionType.api:
-        case ActionType.query:
+        case ActionType.integration:
           value = `${value}.run`;
           break;
         default:
@@ -547,235 +515,15 @@ const fieldConfigs: FieldConfigs = {
   },
 };
 
-const baseOptions: any = [
-  {
-    label: "No Action",
-    value: ActionType.none,
-  },
-  {
-    label: "Call An API",
-    value: ActionType.api,
-  },
-  {
-    label: "Execute a DB Query",
-    value: ActionType.query,
-  },
-  {
-    label: "Navigate To",
-    value: ActionType.navigateTo,
-  },
-  {
-    label: "Show Message",
-    value: ActionType.showAlert,
-  },
-  {
-    label: "Open Modal",
-    value: ActionType.showModal,
-  },
-  {
-    label: "Close Modal",
-    value: ActionType.closeModal,
-  },
-  {
-    label: "Store Value",
-    value: ActionType.storeValue,
-  },
-  {
-    label: "Download",
-    value: ActionType.download,
-  },
-  {
-    label: "Copy to Clipboard",
-    value: ActionType.copyToClipboard,
-  },
-  {
-    label: "Reset Widget",
-    value: ActionType.resetWidget,
-  },
-];
-function getOptionsWithChildren(
-  options: TreeDropdownOption[],
-  actions: ActionDataState,
-  createActionOption: TreeDropdownOption,
-) {
-  const option = options.find((option) => option.value === ActionType.api);
-  if (option) {
-    option.children = [createActionOption];
-    actions.forEach((action) => {
-      (option.children as TreeDropdownOption[]).push({
-        label: action.config.name,
-        id: action.config.id,
-        value: action.config.name,
-        type: option.value,
-      } as TreeDropdownOption);
-    });
-  }
-  return options;
-}
-
-function getFieldFromValue(
-  value: string | undefined,
-  getParentValue?: Function,
-): any[] {
-  const fields: any[] = [
-    {
-      field: FieldType.ACTION_SELECTOR_FIELD,
-      getParentValue,
-      value,
-    },
-  ];
-  if (!value) {
-    return fields;
-  }
-  if (value.indexOf("run") !== -1) {
-    const matches = [...value.matchAll(ACTION_TRIGGER_REGEX)];
-    if (matches.length) {
-      const funcArgs = matches[0][2];
-      const args = [...funcArgs.matchAll(ACTION_ANONYMOUS_FUNC_REGEX)];
-      const successArg = args[0];
-      const errorArg = args[1];
-      let sucesssValue;
-      if (successArg && successArg.length > 0) {
-        sucesssValue = successArg[1] !== "{}" ? `{{${successArg[1]}}}` : ""; //successArg[1] + successArg[2];
-      }
-      const successFields = getFieldFromValue(
-        sucesssValue,
-        (changeValue: string) => {
-          const matches = [...value.matchAll(ACTION_TRIGGER_REGEX)];
-          const args = [...matches[0][2].matchAll(ACTION_ANONYMOUS_FUNC_REGEX)];
-          let successArg = args[0] ? args[0][0] : "() => {}";
-          const errorArg = args[1] ? args[1][0] : "() => {}";
-          successArg = changeValue.endsWith(")")
-            ? `() => ${changeValue}`
-            : `() => ${changeValue}()`;
-
-          return value.replace(
-            ACTION_TRIGGER_REGEX,
-            `{{$1(${successArg}, ${errorArg})}}`,
-          );
-        },
-      );
-      successFields[0].label = "onSuccess";
-      fields.push(successFields);
-
-      let errorValue;
-      if (errorArg && errorArg.length > 0) {
-        errorValue = errorArg[1] !== "{}" ? `{{${errorArg[1]}}}` : ""; //errorArg[1] + errorArg[2];
-      }
-      const errorFields = getFieldFromValue(
-        errorValue,
-        (changeValue: string) => {
-          const matches = [...value.matchAll(ACTION_TRIGGER_REGEX)];
-          const args = [...matches[0][2].matchAll(ACTION_ANONYMOUS_FUNC_REGEX)];
-          const successArg = args[0] ? args[0][0] : "() => {}";
-          let errorArg = args[1] ? args[1][0] : "() => {}";
-          errorArg = changeValue.endsWith(")")
-            ? `() => ${changeValue}`
-            : `() => ${changeValue}()`;
-          return value.replace(
-            ACTION_TRIGGER_REGEX,
-            `{{$1(${successArg}, ${errorArg})}}`,
-          );
-        },
-      );
-      errorFields[0].label = "onError";
-      fields.push(errorFields);
-    }
-    return fields;
-  }
-  if (value.indexOf("navigateTo") !== -1) {
-    fields.push({
-      field: FieldType.URL_FIELD,
-    });
-    fields.push({
-      field: FieldType.QUERY_PARAMS_FIELD,
-    });
-    fields.push({
-      field: FieldType.NAVIGATION_TARGET_FIELD,
-    });
-  }
-
-  if (value.indexOf("showModal") !== -1) {
-    fields.push({
-      field: FieldType.SHOW_MODAL_FIELD,
-    });
-  }
-  if (value.indexOf("closeModal") !== -1) {
-    fields.push({
-      field: FieldType.CLOSE_MODAL_FIELD,
-    });
-  }
-  if (value.indexOf("showAlert") !== -1) {
-    fields.push(
-      {
-        field: FieldType.ALERT_TEXT_FIELD,
-      },
-      {
-        field: FieldType.ALERT_TYPE_SELECTOR_FIELD,
-      },
-    );
-  }
-  if (value.indexOf("storeValue") !== -1) {
-    fields.push(
-      {
-        field: FieldType.KEY_TEXT_FIELD,
-      },
-      {
-        field: FieldType.VALUE_TEXT_FIELD,
-      },
-    );
-  }
-  if (value.indexOf("resetWidget") !== -1) {
-    fields.push(
-      {
-        field: FieldType.WIDGET_NAME_FIELD,
-      },
-      {
-        field: FieldType.RESET_CHILDREN_FIELD,
-      },
-    );
-  }
-  if (value.indexOf("download") !== -1) {
-    fields.push(
-      {
-        field: FieldType.DOWNLOAD_DATA_FIELD,
-      },
-      {
-        field: FieldType.DOWNLOAD_FILE_NAME_FIELD,
-      },
-      {
-        field: FieldType.DOWNLOAD_FILE_TYPE_FIELD,
-      },
-    );
-  }
-  if (value.indexOf("copyToClipboard") !== -1) {
-    fields.push({
-      field: FieldType.COPY_TEXT_FIELD,
-    });
-  }
-  return fields;
-}
-
-function getPageDropdownOptions(state: AppState) {
-  return state.entities.pageList.pages.map((page) => ({
-    label: page.pageName,
-    id: page.pageId,
-    value: `'${page.pageName}'`,
-  }));
-}
-
 function renderField(props: {
   onValueChange: Function;
   value: string;
   field: any;
   label?: string;
-  isValid: boolean;
-  validationMessage?: string;
-  apiOptionTree: TreeDropdownOption[];
   widgetOptionTree: TreeDropdownOption[];
-  queryOptionTree: TreeDropdownOption[];
   modalDropdownList: TreeDropdownOption[];
   pageDropdownOptions: TreeDropdownOption[];
+  integrationOptionTree: TreeDropdownOption[];
   depth: number;
   maxDepth: number;
   additionalAutoComplete?: Record<string, Record<string, unknown>>;
@@ -800,7 +548,7 @@ function renderField(props: {
     case FieldType.WIDGET_NAME_FIELD:
       let label = "";
       let defaultText = "Select Action";
-      let options = props.apiOptionTree;
+      let options = props.integrationOptionTree;
       let selectedLabelModifier = undefined;
       let displayValue = undefined;
       let getDefaults = undefined;
@@ -817,10 +565,7 @@ function renderField(props: {
           option: TreeDropdownOption,
           displayValue?: string,
         ) {
-          if (
-            option.type === ActionType.api ||
-            option.type === ActionType.query
-          ) {
+          if (option.type === ActionType.integration) {
             return (
               <HightlightedCode
                 codeText={`{{${option.label}.run()}}`}
@@ -899,7 +644,7 @@ function renderField(props: {
       break;
     case FieldType.KEY_VALUE_FIELD:
       viewElement = (view as (props: SelectorViewProps) => JSX.Element)({
-        options: props.apiOptionTree,
+        options: props.integrationOptionTree,
         label: "",
         get: fieldConfig.getter,
         set: (value: string | DropdownOption) => {
@@ -944,8 +689,6 @@ function renderField(props: {
           props.onValueChange(finalValueToSet);
         },
         value: props.value,
-        isValid: props.isValid,
-        validationMessage: props.validationMessage,
         additionalAutoComplete: props.additionalAutoComplete,
       });
       break;
@@ -961,11 +704,10 @@ function Fields(props: {
   value: string;
   fields: any;
   label?: string;
-  isValid: boolean;
-  validationMessage?: string;
-  apiOptionTree: TreeDropdownOption[];
+  // apiOptionTree: TreeDropdownOption[];
+  integrationOptionTree: TreeDropdownOption[];
   widgetOptionTree: TreeDropdownOption[];
-  queryOptionTree: TreeDropdownOption[];
+  // queryOptionTree: TreeDropdownOption[];
   modalDropdownList: TreeDropdownOption[];
   pageDropdownOptions: TreeDropdownOption[];
   depth: number;
@@ -992,10 +734,9 @@ function Fields(props: {
                 <li key={index}>
                   <Fields
                     additionalAutoComplete={props.additionalAutoComplete}
-                    apiOptionTree={props.apiOptionTree}
                     depth={props.depth + 1}
                     fields={field}
-                    isValid={props.isValid}
+                    integrationOptionTree={props.integrationOptionTree}
                     label={selectorField.label}
                     maxDepth={props.maxDepth}
                     modalDropdownList={props.modalDropdownList}
@@ -1006,8 +747,6 @@ function Fields(props: {
                       props.onValueChange(parentValue);
                     }}
                     pageDropdownOptions={props.pageDropdownOptions}
-                    queryOptionTree={props.queryOptionTree}
-                    validationMessage={props.validationMessage}
                     value={selectorField.value}
                     widgetOptionTree={props.widgetOptionTree}
                   />
@@ -1036,10 +775,9 @@ function Fields(props: {
         const selectorField = field[0];
         return (
           <Fields
-            apiOptionTree={props.apiOptionTree}
             depth={props.depth + 1}
             fields={field}
-            isValid={props.isValid}
+            integrationOptionTree={props.integrationOptionTree}
             key={index}
             label={selectorField.label}
             maxDepth={props.maxDepth}
@@ -1051,8 +789,6 @@ function Fields(props: {
               props.onValueChange(parentValue);
             }}
             pageDropdownOptions={props.pageDropdownOptions}
-            queryOptionTree={props.queryOptionTree}
-            validationMessage={props.validationMessage}
             value={selectorField.value}
             widgetOptionTree={props.widgetOptionTree}
           />
@@ -1068,160 +804,4 @@ function Fields(props: {
   }
 }
 
-function useModalDropdownList() {
-  const dispatch = useDispatch();
-  const nextModalName = useSelector(getNextModalName);
-
-  let finalList: TreeDropdownOption[] = [
-    {
-      label: "New Modal",
-      value: "Modal",
-      id: "create",
-      icon: "plus",
-      className: "t--create-modal-btn",
-      onSelect: (option: TreeDropdownOption, setter?: Function) => {
-        const modalName = nextModalName;
-        if (setter) {
-          setter({
-            value: `${modalName}`,
-          });
-          dispatch(createModalAction(nextModalName));
-        }
-      },
-    },
-  ];
-
-  finalList = finalList.concat(
-    (useSelector(getModalDropdownList) || []) as TreeDropdownOption[],
-  );
-
-  return finalList;
-}
-
-function useApiOptionTree() {
-  const dispatch = useDispatch();
-  const pageId = useSelector(getCurrentPageId) || "";
-
-  const actions = useSelector(getActionsForCurrentPage).filter(
-    (action) =>
-      action.config.pluginType === PluginType.API ||
-      action.config.pluginType === PluginType.SAAS,
-  );
-  let filteredBaseOptions = baseOptions;
-
-  // For onboarding
-  const filterOptions = useSelector((state: AppState) =>
-    checkCurrentStep(state, OnboardingStep.ADD_INPUT_WIDGET),
-  );
-  if (filterOptions) {
-    filteredBaseOptions = baseOptions.filter(
-      (item: any) => item.value === ActionType.query,
-    );
-  }
-
-  const apiOptionTree = getOptionsWithChildren(filteredBaseOptions, actions, {
-    label: "Create API",
-    value: "api",
-    id: "create",
-    className: "t--create-api-btn",
-    icon: "plus",
-    onSelect: (option: TreeDropdownOption, setter?: Function) => {
-      const apiName = createNewApiName(actions, pageId);
-      if (setter) {
-        setter({
-          value: `${apiName}`,
-          type: ActionType.api,
-        });
-        dispatch(createNewApiAction(pageId, "API_PANE"));
-      }
-    },
-  });
-  return apiOptionTree;
-}
-
-function useWidgetOptionTree() {
-  const widgets = useSelector(getWidgets) || {};
-  return Object.values(widgets)
-    .filter((w) => w.type !== "CANVAS_WIDGET" && w.type !== "BUTTON_WIDGET")
-    .map((w) => {
-      return {
-        label: w.widgetName,
-        id: w.widgetName,
-        value: `"${w.widgetName}"`,
-      };
-    });
-}
-function getQueryOptionsWithChildren(
-  options: TreeDropdownOption[],
-  queries: ActionDataState,
-  createQueryOption: TreeDropdownOption,
-) {
-  const option = options.find((option) => option.value === ActionType.query);
-  if (option) {
-    option.children = [createQueryOption];
-    queries.forEach((query) => {
-      (option.children as TreeDropdownOption[]).push({
-        label: query.config.name,
-        id: query.config.id,
-        value: query.config.name,
-        type: option.value,
-      } as TreeDropdownOption);
-    });
-  }
-  return options;
-}
-
-function useQueryOptionTree() {
-  const dispatch = useDispatch();
-  const pageId = useSelector(getCurrentPageId) || "";
-
-  const queries = useSelector(getActionsForCurrentPage).filter(
-    (action) => action.config.pluginType === PluginType.DB,
-  );
-  const queryOptionTree = getQueryOptionsWithChildren(baseOptions, queries, {
-    label: "Create Query",
-    value: "query",
-    id: "create",
-    icon: "plus",
-    className: "t--create-query-btn",
-    onSelect: (option: TreeDropdownOption, setter?: Function) => {
-      const queryName = createNewQueryName(queries, pageId);
-      if (setter) {
-        setter({
-          value: `${queryName}`,
-          type: ActionType.query,
-        });
-        dispatch(createNewQueryAction(pageId, "QUERY_PANE"));
-      }
-    },
-  });
-  return queryOptionTree;
-}
-
-export function ActionCreator(props: ActionCreatorProps) {
-  const apiOptionTree = useApiOptionTree();
-  const widgetOptionTree = useWidgetOptionTree();
-  const queryOptionTree = useQueryOptionTree();
-  const modalDropdownList = useModalDropdownList();
-  const pageDropdownOptions = useSelector(getPageDropdownOptions);
-  const fields = getFieldFromValue(props.value);
-  return (
-    <TreeStructure>
-      <Fields
-        additionalAutoComplete={props.additionalAutoComplete}
-        apiOptionTree={apiOptionTree}
-        depth={1}
-        fields={fields}
-        isValid={props.isValid}
-        maxDepth={1}
-        modalDropdownList={modalDropdownList}
-        onValueChange={props.onValueChange}
-        pageDropdownOptions={pageDropdownOptions}
-        queryOptionTree={queryOptionTree}
-        validationMessage={props.validationMessage}
-        value={props.value}
-        widgetOptionTree={widgetOptionTree}
-      />
-    </TreeStructure>
-  );
-}
+export default Fields;
diff --git a/app/client/src/components/editorComponents/ActionCreator/index.tsx b/app/client/src/components/editorComponents/ActionCreator/index.tsx
new file mode 100644
index 0000000000..3e8303b47e
--- /dev/null
+++ b/app/client/src/components/editorComponents/ActionCreator/index.tsx
@@ -0,0 +1,420 @@
+import React, { useMemo } from "react";
+import { AppState } from "reducers";
+import {
+  getActionsForCurrentPage,
+  getDBDatasources,
+} from "selectors/entitiesSelector";
+import { createActionRequest } from "actions/actionActions";
+import {
+  getModalDropdownList,
+  getNextModalName,
+} from "selectors/widgetSelectors";
+import {
+  getCurrentApplicationId,
+  getCurrentPageId,
+} from "selectors/editorSelectors";
+import { Datasource } from "entities/Datasource";
+import Fields, {
+  ACTION_TRIGGER_REGEX,
+  ACTION_ANONYMOUS_FUNC_REGEX,
+  ActionType,
+  FieldType,
+} from "./Fields";
+import { TreeDropdownOption } from "components/ads/TreeDropdown";
+import { useDispatch, useSelector } from "react-redux";
+import { createModalAction } from "actions/widgetActions";
+import { createNewQueryName } from "utils/AppsmithUtils";
+import TreeStructure from "components/utils/TreeStructure";
+import { getWidgets } from "sagas/selectors";
+import { PluginType } from "entities/Action";
+import { INTEGRATION_EDITOR_URL, INTEGRATION_TABS } from "constants/routes";
+import history from "utils/history";
+import { keyBy } from "lodash";
+import { getPluginIcon, apiIcon } from "pages/Editor/Explorer/ExplorerIcons";
+import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
+
+/* eslint-disable @typescript-eslint/ban-types */
+/* TODO: Function and object types need to be updated to enable the lint rule */
+
+const baseOptions: any = [
+  {
+    label: "No Action",
+    value: ActionType.none,
+  },
+  {
+    label: "Execute a Query",
+    value: ActionType.integration,
+  },
+
+  {
+    label: "Navigate To",
+    value: ActionType.navigateTo,
+  },
+  {
+    label: "Show Message",
+    value: ActionType.showAlert,
+  },
+  {
+    label: "Open Modal",
+    value: ActionType.showModal,
+  },
+  {
+    label: "Close Modal",
+    value: ActionType.closeModal,
+  },
+  {
+    label: "Store Value",
+    value: ActionType.storeValue,
+  },
+  {
+    label: "Download",
+    value: ActionType.download,
+  },
+  {
+    label: "Copy to Clipboard",
+    value: ActionType.copyToClipboard,
+  },
+  {
+    label: "Reset Widget",
+    value: ActionType.resetWidget,
+  },
+];
+
+function getFieldFromValue(
+  value: string | undefined,
+  getParentValue?: Function,
+): any[] {
+  const fields: any[] = [
+    {
+      field: FieldType.ACTION_SELECTOR_FIELD,
+      getParentValue,
+      value,
+    },
+  ];
+  if (!value) {
+    return fields;
+  }
+  if (value.indexOf("run") !== -1) {
+    const matches = [...value.matchAll(ACTION_TRIGGER_REGEX)];
+    if (matches.length) {
+      const funcArgs = matches[0][2];
+      const args = [...funcArgs.matchAll(ACTION_ANONYMOUS_FUNC_REGEX)];
+      const successArg = args[0];
+      const errorArg = args[1];
+      let sucesssValue;
+      if (successArg && successArg.length > 0) {
+        sucesssValue = successArg[1] !== "{}" ? `{{${successArg[1]}}}` : ""; //successArg[1] + successArg[2];
+      }
+      const successFields = getFieldFromValue(
+        sucesssValue,
+        (changeValue: string) => {
+          const matches = [...value.matchAll(ACTION_TRIGGER_REGEX)];
+          const args = [...matches[0][2].matchAll(ACTION_ANONYMOUS_FUNC_REGEX)];
+          let successArg = args[0] ? args[0][0] : "() => {}";
+          const errorArg = args[1] ? args[1][0] : "() => {}";
+          successArg = changeValue.endsWith(")")
+            ? `() => ${changeValue}`
+            : `() => ${changeValue}()`;
+
+          return value.replace(
+            ACTION_TRIGGER_REGEX,
+            `{{$1(${successArg}, ${errorArg})}}`,
+          );
+        },
+      );
+      successFields[0].label = "onSuccess";
+      fields.push(successFields);
+
+      let errorValue;
+      if (errorArg && errorArg.length > 0) {
+        errorValue = errorArg[1] !== "{}" ? `{{${errorArg[1]}}}` : ""; //errorArg[1] + errorArg[2];
+      }
+      const errorFields = getFieldFromValue(
+        errorValue,
+        (changeValue: string) => {
+          const matches = [...value.matchAll(ACTION_TRIGGER_REGEX)];
+          const args = [...matches[0][2].matchAll(ACTION_ANONYMOUS_FUNC_REGEX)];
+          const successArg = args[0] ? args[0][0] : "() => {}";
+          let errorArg = args[1] ? args[1][0] : "() => {}";
+          errorArg = changeValue.endsWith(")")
+            ? `() => ${changeValue}`
+            : `() => ${changeValue}()`;
+          return value.replace(
+            ACTION_TRIGGER_REGEX,
+            `{{$1(${successArg}, ${errorArg})}}`,
+          );
+        },
+      );
+      errorFields[0].label = "onError";
+      fields.push(errorFields);
+    }
+    return fields;
+  }
+  if (value.indexOf("navigateTo") !== -1) {
+    fields.push({
+      field: FieldType.URL_FIELD,
+    });
+    fields.push({
+      field: FieldType.QUERY_PARAMS_FIELD,
+    });
+    fields.push({
+      field: FieldType.NAVIGATION_TARGET_FIELD,
+    });
+  }
+
+  if (value.indexOf("showModal") !== -1) {
+    fields.push({
+      field: FieldType.SHOW_MODAL_FIELD,
+    });
+  }
+  if (value.indexOf("closeModal") !== -1) {
+    fields.push({
+      field: FieldType.CLOSE_MODAL_FIELD,
+    });
+  }
+  if (value.indexOf("showAlert") !== -1) {
+    fields.push(
+      {
+        field: FieldType.ALERT_TEXT_FIELD,
+      },
+      {
+        field: FieldType.ALERT_TYPE_SELECTOR_FIELD,
+      },
+    );
+  }
+  if (value.indexOf("storeValue") !== -1) {
+    fields.push(
+      {
+        field: FieldType.KEY_TEXT_FIELD,
+      },
+      {
+        field: FieldType.VALUE_TEXT_FIELD,
+      },
+    );
+  }
+  if (value.indexOf("resetWidget") !== -1) {
+    fields.push(
+      {
+        field: FieldType.WIDGET_NAME_FIELD,
+      },
+      {
+        field: FieldType.RESET_CHILDREN_FIELD,
+      },
+    );
+  }
+  if (value.indexOf("download") !== -1) {
+    fields.push(
+      {
+        field: FieldType.DOWNLOAD_DATA_FIELD,
+      },
+      {
+        field: FieldType.DOWNLOAD_FILE_NAME_FIELD,
+      },
+      {
+        field: FieldType.DOWNLOAD_FILE_TYPE_FIELD,
+      },
+    );
+  }
+  if (value.indexOf("copyToClipboard") !== -1) {
+    fields.push({
+      field: FieldType.COPY_TEXT_FIELD,
+    });
+  }
+  return fields;
+}
+
+function getPageDropdownOptions(state: AppState) {
+  return state.entities.pageList.pages.map((page) => ({
+    label: page.pageName,
+    id: page.pageId,
+    value: `'${page.pageName}'`,
+  }));
+}
+
+function useModalDropdownList() {
+  const dispatch = useDispatch();
+  const nextModalName = useSelector(getNextModalName);
+
+  let finalList: TreeDropdownOption[] = [
+    {
+      label: "New Modal",
+      value: "Modal",
+      id: "create",
+      icon: "plus",
+      className: "t--create-modal-btn",
+      onSelect: (option: TreeDropdownOption, setter?: Function) => {
+        const modalName = nextModalName;
+        if (setter) {
+          setter({
+            value: `${modalName}`,
+          });
+          dispatch(createModalAction(nextModalName));
+        }
+      },
+    },
+  ];
+
+  finalList = finalList.concat(
+    (useSelector(getModalDropdownList) || []) as TreeDropdownOption[],
+  );
+
+  return finalList;
+}
+
+function useWidgetOptionTree() {
+  const widgets = useSelector(getWidgets) || {};
+  return Object.values(widgets)
+    .filter((w) => w.type !== "CANVAS_WIDGET" && w.type !== "BUTTON_WIDGET")
+    .map((w) => {
+      return {
+        label: w.widgetName,
+        id: w.widgetName,
+        value: `"${w.widgetName}"`,
+      };
+    });
+}
+
+function getIntegrationOptionsWithChildren(
+  pageId: string,
+  plugins: any,
+  options: TreeDropdownOption[],
+  actions: any[],
+  datasources: Datasource[],
+  createIntegrationOption: TreeDropdownOption,
+  dispatch: any,
+) {
+  const queries = actions.filter(
+    (action) => action.config.pluginType === PluginType.DB,
+  );
+  const apis = actions.filter(
+    (action) =>
+      action.config.pluginType === PluginType.API ||
+      action.config.pluginType === PluginType.SAAS,
+  );
+  const option = options.find(
+    (option) => option.value === ActionType.integration,
+  );
+  if (option) {
+    option.children = [createIntegrationOption];
+    apis.forEach((api) => {
+      (option.children as TreeDropdownOption[]).push({
+        label: api.config.name,
+        id: api.config.id,
+        value: api.config.name,
+        type: option.value,
+        icon:
+          api.config.pluginType === PluginType.API
+            ? apiIcon
+            : getActionConfig(api.config.pluginType)?.getIcon(
+                api.config,
+                plugins[(api as any).config.datasource.pluginId],
+              ),
+      } as TreeDropdownOption);
+    });
+    queries.forEach((query) => {
+      (option.children as TreeDropdownOption[]).push({
+        label: query.config.name,
+        id: query.config.id,
+        value: query.config.name,
+        type: option.value,
+        icon: getActionConfig(query.config.pluginType)?.getIcon(
+          query.config,
+          plugins[(query as any).config.datasource.pluginId],
+        ),
+      } as TreeDropdownOption);
+    });
+    datasources.forEach((dataSource: Datasource) => {
+      (option.children as TreeDropdownOption[]).push({
+        label: dataSource.name,
+        id: dataSource.id,
+        value: dataSource.name,
+        type: option.value,
+        icon: getPluginIcon(plugins[dataSource.pluginId]) as React.ReactNode,
+        onSelect: () => {
+          const newQueryName = createNewQueryName(actions, pageId);
+          dispatch(
+            createActionRequest({
+              name: newQueryName,
+              pageId,
+              datasource: {
+                id: dataSource.id,
+              },
+              eventData: {
+                actionType: "Query",
+                from: "home-screen",
+                dataSource: dataSource.name,
+              },
+              pluginId: dataSource.pluginId,
+              actionConfiguration: {},
+            }),
+          );
+        },
+      } as TreeDropdownOption);
+    });
+  }
+  return options;
+}
+
+function useIntegrationsOptionTree() {
+  const pageId = useSelector(getCurrentPageId) || "";
+  const applicationId = useSelector(getCurrentApplicationId);
+  const datasources: Datasource[] = useSelector(getDBDatasources);
+  const dispatch = useDispatch();
+  const plugins = useSelector((state: AppState) => {
+    return state.entities.plugins.list;
+  });
+  const pluginGroups: any = useMemo(() => keyBy(plugins, "id"), [plugins]);
+  const actions = useSelector(getActionsForCurrentPage);
+
+  const integrationOptionTree = getIntegrationOptionsWithChildren(
+    pageId,
+    pluginGroups,
+    baseOptions,
+    actions,
+    datasources,
+    {
+      label: "Create New Query",
+      value: "datasources",
+      id: "create",
+      icon: "plus",
+      className: "t--create-datasources-query-btn",
+      onSelect: () => {
+        history.push(
+          INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.NEW),
+        );
+      },
+    },
+    dispatch,
+  );
+  return integrationOptionTree;
+}
+
+type ActionCreatorProps = {
+  value: string;
+  onValueChange: (newValue: string) => void;
+  additionalAutoComplete?: Record<string, Record<string, unknown>>;
+};
+
+export function ActionCreator(props: ActionCreatorProps) {
+  const integrationOptionTree = useIntegrationsOptionTree();
+  const widgetOptionTree = useWidgetOptionTree();
+  const modalDropdownList = useModalDropdownList();
+  const pageDropdownOptions = useSelector(getPageDropdownOptions);
+  const fields = getFieldFromValue(props.value);
+  return (
+    <TreeStructure>
+      <Fields
+        additionalAutoComplete={props.additionalAutoComplete}
+        depth={1}
+        fields={fields}
+        integrationOptionTree={integrationOptionTree}
+        maxDepth={1}
+        modalDropdownList={modalDropdownList}
+        onValueChange={props.onValueChange}
+        pageDropdownOptions={pageDropdownOptions}
+        value={props.value}
+        widgetOptionTree={widgetOptionTree}
+      />
+    </TreeStructure>
+  );
+}
diff --git a/app/client/src/components/editorComponents/ApiResponseView.tsx b/app/client/src/components/editorComponents/ApiResponseView.tsx
index 09dc38510e..5354403571 100644
--- a/app/client/src/components/editorComponents/ApiResponseView.tsx
+++ b/app/client/src/components/editorComponents/ApiResponseView.tsx
@@ -12,8 +12,15 @@ import ReadOnlyEditor from "components/editorComponents/ReadOnlyEditor";
 import { getActionResponses } from "selectors/entitiesSelector";
 import { Colors } from "constants/Colors";
 import _ from "lodash";
-import { useLocalStorage } from "utils/hooks/localstorage";
-import { CHECK_REQUEST_BODY, createMessage } from "constants/messages";
+import {
+  CHECK_REQUEST_BODY,
+  createMessage,
+  DEBUGGER_ERRORS,
+  DEBUGGER_LOGS,
+  EMPTY_RESPONSE_FIRST_HALF,
+  EMPTY_RESPONSE_LAST_HALF,
+  INSPECT_ENTITY,
+} from "constants/messages";
 import { TabComponent } from "components/ads/Tabs";
 import Text, { TextType } from "components/ads/Text";
 import Icon from "components/ads/Icon";
@@ -25,11 +32,14 @@ import ErrorLogs from "./Debugger/Errors";
 import Resizer, { ResizerCSS } from "./Debugger/Resizer";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { DebugButton } from "./Debugger/DebugCTA";
+import EntityDeps from "./Debugger/EntityDependecies";
+import Button, { Size } from "components/ads/Button";
 
 const ResponseContainer = styled.div`
   ${ResizerCSS}
   // Initial height of bottom tabs
   height: 60%;
+  width: 100%;
   // Minimum height of bottom tabs as it can be resized
   min-height: 36px;
   background-color: ${(props) => props.theme.colors.apiPane.responseBody.bg};
@@ -124,6 +134,21 @@ const FailedMessage = styled.div`
   display: flex;
   align-items: center;
   margin-left: 5px;
+
+  .api-debugcta {
+    margin-top: 0px;
+  }
+`;
+
+const StyledCallout = styled(Callout)`
+  .${Classes.TEXT} {
+    line-height: normal;
+  }
+`;
+
+const InlineButton = styled(Button)`
+  display: inline-flex;
+  margin: 0 4px;
 `;
 
 interface ReduxStateProps {
@@ -135,6 +160,7 @@ type Props = ReduxStateProps &
   RouteComponentProps<APIEditorRouteParams> & {
     theme?: EditorTheme;
     apiName: string;
+    onRunClick: () => void;
   };
 
 export const EMPTY_RESPONSE: ActionResponse = {
@@ -173,11 +199,6 @@ function ApiResponseView(props: Props) {
   }
   const panelRef: RefObject<HTMLDivElement> = useRef(null);
 
-  const [requestDebugVisible, setRequestDebugVisible] = useLocalStorage(
-    "requestDebugVisible",
-    "true",
-  );
-
   const onDebugClick = useCallback(() => {
     AnalyticsUtil.logEvent("OPEN_DEBUGGER", {
       source: "API",
@@ -192,16 +213,17 @@ function ApiResponseView(props: Props) {
       title: "Response Body",
       panelComponent: (
         <ResponseTabWrapper>
-          {hasFailed && !isRunning && requestDebugVisible && (
-            <Callout
-              closeButton
+          {hasFailed && !isRunning && (
+            <StyledCallout
               fill
               label={
                 <FailedMessage>
-                  <DebugButton onClick={onDebugClick} />
+                  <DebugButton
+                    className="api-debugcta"
+                    onClick={onDebugClick}
+                  />
                 </FailedMessage>
               }
-              onClose={() => setRequestDebugVisible(false)}
               text={createMessage(CHECK_REQUEST_BODY)}
               variant={Variant.danger}
             />
@@ -209,7 +231,18 @@ function ApiResponseView(props: Props) {
           {_.isEmpty(response.statusCode) ? (
             <NoResponseContainer>
               <Icon name="no-response" />
-              <Text type={TextType.P1}>Hit Run to get a Response</Text>
+              <Text type={TextType.P1}>
+                {EMPTY_RESPONSE_FIRST_HALF()}
+                <InlineButton
+                  isLoading={isRunning}
+                  onClick={props.onRunClick}
+                  size={Size.medium}
+                  tag="button"
+                  text="Run"
+                  type="button"
+                />
+                {EMPTY_RESPONSE_LAST_HALF()}
+              </Text>
             </NoResponseContainer>
           ) : (
             <ReadOnlyEditor
@@ -227,14 +260,19 @@ function ApiResponseView(props: Props) {
     },
     {
       key: "ERROR",
-      title: "Errors",
+      title: createMessage(DEBUGGER_ERRORS),
       panelComponent: <ErrorLogs />,
     },
     {
       key: "LOGS",
-      title: "Logs",
+      title: createMessage(DEBUGGER_LOGS),
       panelComponent: <DebuggerLogs searchQuery={props.apiName} />,
     },
+    {
+      key: "ENTITY_DEPENDENCIES",
+      title: createMessage(INSPECT_ENTITY),
+      panelComponent: <EntityDeps />,
+    },
   ];
 
   const onTabSelect = (index: number) => {
diff --git a/app/client/src/components/editorComponents/CloseEditor.tsx b/app/client/src/components/editorComponents/CloseEditor.tsx
index 7b71b40e8e..c5cc2eeb51 100644
--- a/app/client/src/components/editorComponents/CloseEditor.tsx
+++ b/app/client/src/components/editorComponents/CloseEditor.tsx
@@ -1,73 +1,58 @@
-import TooltipComponent from "components/ads/Tooltip";
-import { BUILDER_PAGE_URL } from "constants/routes";
 import React from "react";
-import { useSelector } from "react-redux";
 import { useHistory } from "react-router-dom";
 import styled from "styled-components";
-import { Position } from "@blueprintjs/core";
 import Text, { TextType } from "components/ads/Text";
-import {
-  getCurrentApplicationId,
-  getCurrentPageId,
-} from "selectors/editorSelectors";
-import Icon, { IconSize } from "components/ads/Icon";
+import { Icon } from "@blueprintjs/core";
 import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
+import {
+  BUILDER_PAGE_URL,
+  INTEGRATION_EDITOR_URL,
+  INTEGRATION_TABS,
+} from "../../constants/routes";
+import { useSelector } from "react-redux";
+import {
+  getCurrentApplicationId,
+  getCurrentPageId,
+} from "../../selectors/editorSelectors";
 
 const IconContainer = styled.div`
-  width: 22px;
-  height: 22px;
+  //width: 100%;
+  height: 30px;
   display: flex;
-  margin-right: 16px;
-  justify-content: center;
   align-items: center;
   cursor: pointer;
-  svg {
-    width: 12px;
-    height: 12px;
-    path {
-      fill: ${(props) => props.theme.colors.apiPane.closeIcon};
-    }
-  }
-  &:hover {
-    background-color: ${(props) => props.theme.colors.apiPane.iconHoverBg};
-  }
+  padding-left: 16px;
+  /* background-color: ${(props) => props.theme.colors.apiPane.iconHoverBg}; */
 `;
 
 function CloseEditor() {
+  const history = useHistory();
   const applicationId = useSelector(getCurrentApplicationId);
   const pageId = useSelector(getCurrentPageId);
-
-  const history = useHistory();
+  const params: string = location.search;
+  const redirectTo = new URLSearchParams(params).get("from");
   const handleClose = (e: React.MouseEvent) => {
     PerformanceTracker.startTracking(
       PerformanceTransactionName.CLOSE_SIDE_PANE,
       { path: location.pathname },
     );
     e.stopPropagation();
-    history.push(BUILDER_PAGE_URL(applicationId, pageId));
+    history.push(
+      redirectTo === "datasources"
+        ? INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.ACTIVE)
+        : BUILDER_PAGE_URL(applicationId, pageId),
+    );
   };
 
   return (
-    <TooltipComponent
-      content={
-        <Text style={{ color: "#ffffff" }} type={TextType.P3}>
-          Close
-        </Text>
-      }
-      minWidth="auto !important"
-      minimal
-      position={Position.BOTTOM_LEFT}
-    >
-      <IconContainer onClick={handleClose}>
-        <Icon
-          className="close-modal-icon"
-          name="close-modal"
-          size={IconSize.LARGE}
-        />
-      </IconContainer>
-    </TooltipComponent>
+    <IconContainer onClick={handleClose}>
+      <Icon icon="chevron-left" iconSize={16} />
+      <Text style={{ color: "#0c0000", lineHeight: "14px" }} type={TextType.P1}>
+        Back
+      </Text>
+    </IconContainer>
   );
 }
 
diff --git a/app/client/src/components/editorComponents/CodeEditor/BindingPrompt.tsx b/app/client/src/components/editorComponents/CodeEditor/BindingPrompt.tsx
index 22471c3910..e4906dfc80 100644
--- a/app/client/src/components/editorComponents/CodeEditor/BindingPrompt.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/BindingPrompt.tsx
@@ -16,11 +16,12 @@ const Wrapper = styled.span<{
   background-color: ${(props) =>
     props.theme.colors.codeMirror.background.hoverState};
   position: absolute;
-  bottom: ${(props) => -props.bottomOffset}px;
+  bottom: ${(props) => props.bottomOffset}px;
+  transform: translateY(100%);
   width: 100%;
   line-height: 13px;
   visibility: ${(props) => (props.visible ? "visible" : "hidden")};
-  z-index: 1;
+  z-index: 3;
 `;
 
 const CurlyBraces = styled.span`
@@ -35,17 +36,12 @@ function BindingPrompt(props: {
   promptMessage?: React.ReactNode | string;
   isOpen: boolean;
   editorTheme?: EditorTheme;
+  showLightningMenu?: boolean;
 }): JSX.Element {
   const promptRef = useRef<HTMLDivElement>(null);
-  let bottomOffset = 30;
   const customMessage = !!props.promptMessage;
-  if (promptRef.current) {
-    const boundingRect = promptRef.current.getBoundingClientRect();
-    bottomOffset = boundingRect.height;
-  }
-  if (customMessage) {
-    bottomOffset = 36;
-  }
+  const bottomOffset = customMessage ? 6 : 0;
+
   return (
     <Wrapper
       bottomOffset={bottomOffset}
@@ -59,7 +55,13 @@ function BindingPrompt(props: {
         props.promptMessage
       ) : (
         <>
-          Type <CurlyBraces>{"{{"}</CurlyBraces> to see a list of variables
+          Type{" "}
+          <CurlyBraces>
+            {props.showLightningMenu === false ? "{{" : "/"}
+          </CurlyBraces>{" "}
+          {props.showLightningMenu === false
+            ? "to see a list of variables"
+            : "to access quick commands"}
         </>
       )}
     </Wrapper>
diff --git a/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts b/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts
index dbf3cf2707..df7a3f5594 100644
--- a/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts
@@ -46,7 +46,12 @@ export type HintHelper = (
   additionalData?: Record<string, Record<string, unknown>>,
 ) => Hinter;
 export type Hinter = {
-  showHint: (editor: CodeMirror.Editor) => void;
+  showHint: (
+    editor: CodeMirror.Editor,
+    expected: string,
+    entityName: string,
+    additionalData?: any,
+  ) => any;
   update?: (data: DataTree) => void;
   trigger?: (editor: CodeMirror.Editor) => void;
 };
diff --git a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
index 4285ca25ee..68edfbae49 100644
--- a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from "react";
+import React, { memo, useMemo, useRef, useState } from "react";
 import styled from "styled-components";
 import _ from "lodash";
 import Popper from "pages/Editor/Popper";
@@ -11,6 +11,12 @@ import DebugButton from "components/editorComponents/Debugger/DebugCTA";
 import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 import Tooltip from "components/ads/Tooltip";
 import { Classes } from "@blueprintjs/core";
+import {
+  EvaluationError,
+  PropertyEvaluationErrorType,
+} from "utils/DynamicBindingUtils";
+import * as Sentry from "@sentry/react";
+import { Severity } from "@sentry/react";
 
 const Wrapper = styled.div`
   position: relative;
@@ -112,7 +118,7 @@ interface Props {
   expected?: string;
   evaluatedValue?: any;
   children: JSX.Element;
-  error?: string;
+  errors: EvaluationError[];
   useValidationMessage?: boolean;
   hideEvaluatedValue?: boolean;
   evaluationSubstitutionType?: EvaluationSubstitutionType;
@@ -121,7 +127,7 @@ interface Props {
 interface PopoverContentProps {
   hasError: boolean;
   expected?: string;
-  error?: string;
+  errors: EvaluationError[];
   useValidationMessage?: boolean;
   evaluatedValue: any;
   theme: EditorTheme;
@@ -150,7 +156,14 @@ type PreparedStatementValue = {
 export function PreparedStatementViewer(props: {
   evaluatedValue: PreparedStatementValue;
 }) {
-  const { value, parameters } = props.evaluatedValue;
+  const { parameters, value } = props.evaluatedValue;
+  if (!value) {
+    Sentry.captureException("Prepared Statement got no value", {
+      level: Severity.Debug,
+      extra: { props },
+    });
+    return <div />;
+  }
   const stringSegments = value.split(/\$\d/);
   const $params = [...value.matchAll(/\$\d/g)].map((matches) => matches[0]);
   const paramsWithTooltips = $params.map((param) => (
@@ -173,95 +186,126 @@ export function PreparedStatementViewer(props: {
   );
 }
 
-export function CurrentValueViewer(props: {
-  theme: EditorTheme;
-  evaluatedValue: any;
-  hideLabel?: boolean;
-  preparedStatementViewer?: boolean;
-}) {
-  const currentValueWrapperRef = React.createRef<HTMLDivElement>();
-  const codeWrapperRef = React.createRef<HTMLPreElement>();
+export const CurrentValueViewer = memo(
+  function CurrentValueViewer(props: {
+    theme: EditorTheme;
+    evaluatedValue: any;
+    hideLabel?: boolean;
+    preparedStatementViewer?: boolean;
+  }) {
+    const currentValueWrapperRef = React.createRef<HTMLDivElement>();
+    const codeWrapperRef = React.createRef<HTMLPreElement>();
 
-  let content = (
-    <CodeWrapper colorTheme={props.theme} ref={codeWrapperRef}>
-      {"undefined"}
-      <ScrollIndicator containerRef={codeWrapperRef} />
-    </CodeWrapper>
-  );
-  if (props.evaluatedValue !== undefined) {
-    if (
-      _.isObject(props.evaluatedValue) ||
-      Array.isArray(props.evaluatedValue)
-    ) {
-      if (props.preparedStatementViewer) {
+    let content = (
+      <CodeWrapper colorTheme={props.theme} ref={codeWrapperRef}>
+        {"undefined"}
+        <ScrollIndicator containerRef={codeWrapperRef} />
+      </CodeWrapper>
+    );
+    if (props.evaluatedValue !== undefined) {
+      if (
+        _.isObject(props.evaluatedValue) ||
+        Array.isArray(props.evaluatedValue)
+      ) {
+        if (props.preparedStatementViewer) {
+          content = (
+            <CodeWrapper colorTheme={props.theme} ref={codeWrapperRef}>
+              <PreparedStatementViewer
+                evaluatedValue={props.evaluatedValue as PreparedStatementValue}
+              />
+              <ScrollIndicator containerRef={codeWrapperRef} />
+            </CodeWrapper>
+          );
+        } else {
+          const reactJsonProps = {
+            theme:
+              props.theme === EditorTheme.DARK ? "summerfruit" : "rjv-default",
+            name: null,
+            enableClipboard: false,
+            displayObjectSize: false,
+            displayDataTypes: false,
+            style: {
+              fontSize: "12px",
+            },
+            collapsed: 2,
+            collapseStringsAfterLength: 20,
+            shouldCollapse: (field: any) => {
+              const index = field.name * 1;
+              return index >= 2;
+            },
+          };
+          content = (
+            <ReactJson src={props.evaluatedValue} {...reactJsonProps} />
+          );
+        }
+      } else {
         content = (
           <CodeWrapper colorTheme={props.theme} ref={codeWrapperRef}>
-            <PreparedStatementViewer
-              evaluatedValue={props.evaluatedValue as PreparedStatementValue}
-            />
+            {props.evaluatedValue === null
+              ? "null"
+              : props.evaluatedValue.toString()}
             <ScrollIndicator containerRef={codeWrapperRef} />
           </CodeWrapper>
         );
-      } else {
-        const reactJsonProps = {
-          theme:
-            props.theme === EditorTheme.DARK ? "summerfruit" : "rjv-default",
-          name: null,
-          enableClipboard: false,
-          displayObjectSize: false,
-          displayDataTypes: false,
-          style: {
-            fontSize: "12px",
-          },
-          collapsed: 2,
-          collapseStringsAfterLength: 20,
-        };
-        content = <ReactJson src={props.evaluatedValue} {...reactJsonProps} />;
       }
-    } else {
-      content = (
-        <CodeWrapper colorTheme={props.theme} ref={codeWrapperRef}>
-          {props.evaluatedValue === null
-            ? "null"
-            : props.evaluatedValue.toString()}
-          <ScrollIndicator containerRef={codeWrapperRef} />
-        </CodeWrapper>
-      );
     }
-  }
-  return (
-    <>
-      {!props.hideLabel && (
-        <StyledTitle data-testid="evaluated-value-popup-title">
-          Evaluated Value
-        </StyledTitle>
-      )}
-      <CurrentValueWrapper colorTheme={props.theme}>
-        <>
-          {content}
-          <ScrollIndicator containerRef={currentValueWrapperRef} />
-        </>
-      </CurrentValueWrapper>
-    </>
-  );
-}
+    return (
+      <>
+        {!props.hideLabel && (
+          <StyledTitle data-testid="evaluated-value-popup-title">
+            Evaluated Value
+          </StyledTitle>
+        )}
+        <CurrentValueWrapper colorTheme={props.theme}>
+          <>
+            {content}
+            <ScrollIndicator containerRef={currentValueWrapperRef} />
+          </>
+        </CurrentValueWrapper>
+      </>
+    );
+  },
+  (prevProps, nextProps) => {
+    return (
+      prevProps.theme === nextProps.theme &&
+      prevProps.hideLabel === nextProps.hideLabel &&
+      // Deep-compare evaluated values to ensure we only rerender
+      // when the array actually changes
+      _.isEqual(prevProps.evaluatedValue, nextProps.evaluatedValue)
+    );
+  },
+);
 
 function PopoverContent(props: PopoverContentProps) {
   const typeTextRef = React.createRef<HTMLPreElement>();
+  const {
+    errors,
+    expected,
+    hasError,
+    onMouseEnter,
+    onMouseLeave,
+    theme,
+    useValidationMessage,
+  } = props;
+  let error;
+  if (hasError) {
+    error = errors[0];
+  }
 
   return (
     <ContentWrapper
       className="t--CodeEditor-evaluatedValue"
-      colorTheme={props.theme}
-      onMouseEnter={props.onMouseEnter}
-      onMouseLeave={props.onMouseLeave}
+      colorTheme={theme}
+      onMouseEnter={onMouseEnter}
+      onMouseLeave={onMouseLeave}
     >
-      {props.hasError && (
+      {hasError && error && (
         <ErrorText>
           <span className="t--evaluatedPopup-error">
-            {props.useValidationMessage && props.error
-              ? props.error
-              : `This value does not evaluate to type "${props.expected}". Transform it using JS inside '{{ }}'`}
+            {error.errorType === PropertyEvaluationErrorType.VALIDATION &&
+            !useValidationMessage
+              ? `This value does not evaluate to type "${expected}".`
+              : error.errorMessage}
           </span>
           <StyledDebugButton
             className="evaluated-value"
@@ -269,7 +313,7 @@ function PopoverContent(props: PopoverContentProps) {
           />
         </ErrorText>
       )}
-      {!props.hasError && props.expected && (
+      {!hasError && props.expected && (
         <>
           <StyledTitle>Expected Data Type</StyledTitle>
           <TypeText colorTheme={props.theme} ref={typeTextRef}>
@@ -293,13 +337,15 @@ function EvaluatedValuePopup(props: Props) {
   const [contentHovered, setContentHovered] = useState(false);
 
   const wrapperRef = useRef<HTMLDivElement>(null);
-  let placement: Placement = "left-start";
-  if (wrapperRef.current) {
-    const boundingRect = wrapperRef.current.getBoundingClientRect();
-    if (boundingRect.left < theme.evaluatedValuePopup.width) {
-      placement = "right-start";
+  const placement: Placement = useMemo(() => {
+    if (wrapperRef.current) {
+      const boundingRect = wrapperRef.current.getBoundingClientRect();
+      if (boundingRect.left < theme.evaluatedValuePopup.width) {
+        return "right-start";
+      }
     }
-  }
+    return "left-start";
+  }, [wrapperRef.current]);
 
   return (
     <Wrapper ref={wrapperRef}>
@@ -317,7 +363,7 @@ function EvaluatedValuePopup(props: Props) {
           zIndex={5}
         >
           <PopoverContent
-            error={props.error}
+            errors={props.errors}
             evaluatedValue={props.evaluatedValue}
             expected={props.expected}
             hasError={props.hasError}
diff --git a/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts b/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
new file mode 100644
index 0000000000..180e5e579a
--- /dev/null
+++ b/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
@@ -0,0 +1,136 @@
+import CodeMirror from "codemirror";
+import { HintHelper } from "components/editorComponents/CodeEditor/EditorConfig";
+import { CommandsCompletion } from "utils/autocomplete/TernServer";
+import { checkIfCursorInsideBinding } from "./hintHelpers";
+import { generateQuickCommands } from "./generateQuickCommands";
+import { Datasource } from "entities/Datasource";
+import AnalyticsUtil from "utils/AnalyticsUtil";
+import log from "loglevel";
+import { ENTITY_TYPE } from "entities/AppsmithConsole";
+
+export const commandsHelper: HintHelper = (editor, data: any) => {
+  let entitiesForSuggestions = Object.values(data).filter(
+    (entity: any) => entity.ENTITY_TYPE && entity.ENTITY_TYPE !== "APPSMITH",
+  );
+  return {
+    showHint: (
+      editor: CodeMirror.Editor,
+      _: string,
+      entityName: string,
+      {
+        datasources,
+        executeCommand,
+        pluginIdToImageLocation,
+        recentEntities,
+        update,
+      }: {
+        datasources: Datasource[];
+        executeCommand: (payload: { actionType: string; args?: any }) => void;
+        pluginIdToImageLocation: Record<string, string>;
+        recentEntities: string[];
+        update: (value: string) => void;
+      },
+    ): boolean => {
+      const currentEntityType = data[entityName]?.ENTITY_TYPE || "ACTION";
+      entitiesForSuggestions = entitiesForSuggestions.filter((entity: any) => {
+        return currentEntityType === "WIDGET"
+          ? entity.ENTITY_TYPE !== "WIDGET"
+          : entity.ENTITY_TYPE !== "ACTION";
+      });
+      const cursorBetweenBinding = checkIfCursorInsideBinding(editor);
+      const value = editor.getValue();
+      const slashIndex = value.lastIndexOf("/");
+      const shouldShowBinding =
+        slashIndex > -1 || (!value && currentEntityType === ENTITY_TYPE.WIDGET);
+      if (!cursorBetweenBinding && shouldShowBinding) {
+        const searchText = value.substring(slashIndex + 1);
+        const list = generateQuickCommands(
+          entitiesForSuggestions,
+          currentEntityType,
+          searchText,
+          {
+            datasources,
+            executeCommand,
+            pluginIdToImageLocation,
+            recentEntities,
+          },
+        );
+        let currentSelection: CommandsCompletion = {
+          origin: "",
+          type: "UNKNOWN",
+          data: {
+            doc: "",
+          },
+          text: "",
+          shortcut: "",
+        };
+        const cursor = editor.getCursor();
+        editor.showHint({
+          hint: () => {
+            const hints = {
+              list,
+              from: {
+                ch: cursor.ch - searchText.length - 1,
+                line: cursor.line,
+              },
+              to: editor.getCursor(),
+              selectedHint: 1,
+            };
+            CodeMirror.on(hints, "pick", (selected: CommandsCompletion) => {
+              update(value.slice(0, slashIndex) + selected.text);
+              setTimeout(() => {
+                editor.focus();
+                editor.setCursor({
+                  line: editor.lineCount() - 1,
+                  ch: editor.getLine(editor.lineCount() - 1).length - 2,
+                });
+                if (selected.action && typeof selected.action === "function") {
+                  selected.action();
+                } else {
+                  CodeMirror.signal(editor, "postPick");
+                }
+              });
+              try {
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                const { data, render, ...rest } = selected;
+                const { ENTITY_TYPE, name, pluginType } = data as any;
+                AnalyticsUtil.logEvent("SLASH_COMMAND", {
+                  ...rest,
+                  ENTITY_TYPE,
+                  name,
+                  pluginType,
+                });
+              } catch (e) {
+                log.debug(e, "Error logging slash command");
+              }
+            });
+            CodeMirror.on(hints, "select", (selected: CommandsCompletion) => {
+              currentSelection = selected;
+            });
+            return hints;
+          },
+          extraKeys: {
+            Up: (cm: CodeMirror.Editor, handle: any) => {
+              handle.moveFocus(-1);
+              if (currentSelection.isHeader === true) {
+                handle.moveFocus(-1);
+              }
+            },
+            Down: (cm: CodeMirror.Editor, handle: any) => {
+              handle.moveFocus(1);
+              if (currentSelection.isHeader === true) {
+                handle.moveFocus(1);
+              }
+            },
+          },
+          completeSingle: false,
+        });
+        return true;
+      }
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore: No types available
+      editor.closeHint();
+      return false;
+    },
+  };
+};
diff --git a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
new file mode 100644
index 0000000000..e5c36a1deb
--- /dev/null
+++ b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
@@ -0,0 +1,213 @@
+import { Datasource } from "entities/Datasource";
+import React from "react";
+import { CommandsCompletion } from "utils/autocomplete/TernServer";
+import ReactDOM from "react-dom";
+import sortBy from "lodash/sortBy";
+import { PluginType } from "entities/Action";
+import { ReactComponent as ApisIcon } from "assets/icons/menu/api-colored.svg";
+import { ReactComponent as DataSourcesColoredIcon } from "assets/icons/menu/datasource-colored.svg";
+import { ReactComponent as NewPlus } from "assets/icons/menu/new-plus.svg";
+import { ReactComponent as Binding } from "assets/icons/menu/binding.svg";
+
+enum Shortcuts {
+  PLUS = "PLUS",
+  BINDING = "BINDING",
+}
+export const generateQuickCommands = (
+  entitiesForSuggestions: any[],
+  currentEntityType: string,
+  searchText: string,
+  {
+    datasources,
+    executeCommand,
+    pluginIdToImageLocation,
+    recentEntities,
+  }: {
+    datasources: Datasource[];
+    executeCommand: (payload: { actionType: string; args?: any }) => void;
+    pluginIdToImageLocation: Record<string, string>;
+    recentEntities: string[];
+  },
+) => {
+  const suggestionsHeader: CommandsCompletion = commandsHeader("Bind Data");
+  const createNewHeader: CommandsCompletion = commandsHeader("Create New");
+  recentEntities.reverse();
+  const newBinding: CommandsCompletion = generateCreateNewCommand({
+    text: "{{}}",
+    displayText: "New Binding",
+    shortcut: Shortcuts.BINDING,
+  });
+  const newIntegration: CommandsCompletion = generateCreateNewCommand({
+    text: "",
+    displayText: "New Datasource",
+    action: () =>
+      executeCommand({
+        actionType: "NEW_INTEGRATION",
+      }),
+    shortcut: Shortcuts.PLUS,
+  });
+  const suggestions = entitiesForSuggestions.map((suggestion: any) => {
+    const name = suggestion.name || suggestion.widgetName;
+    return {
+      text: currentEntityType === "WIDGET" ? `{{${name}.data}}` : `{{${name}}}`,
+      displayText: `${name}`,
+      className: "CodeMirror-commands",
+      data: suggestion,
+      render: (element: HTMLElement, self: any, data: any) => {
+        const pluginType = data.data.pluginType as PluginType;
+        ReactDOM.render(
+          <Command
+            name={data.displayText}
+            pluginType={pluginType}
+            shortcut={data.shortcut}
+          />,
+          element,
+        );
+      },
+    };
+  });
+  const datasourceCommands = datasources.map((action: any) => {
+    return {
+      text: "",
+      displayText: `${action.name}`,
+      className: "CodeMirror-commands",
+      data: action,
+      action: () =>
+        executeCommand({
+          actionType: "NEW_QUERY",
+          args: { datasource: action },
+        }),
+      render: (element: HTMLElement, self: any, data: any) => {
+        ReactDOM.render(
+          <Command
+            imgSrc={pluginIdToImageLocation[data.data.pluginId]}
+            name={data.displayText}
+            shortcut={data.shortcut}
+          />,
+          element,
+        );
+      },
+    };
+  });
+  const suggestionsMatchingSearchText = matchingCommands(
+    suggestions,
+    searchText,
+    recentEntities,
+    5,
+  );
+  suggestionsMatchingSearchText.push(
+    ...matchingCommands([newBinding], searchText, []),
+  );
+  let createNewCommands: any = [];
+  if (currentEntityType === "WIDGET") {
+    createNewCommands = [...datasourceCommands];
+  }
+  const createNewCommandsMatchingSearchText = matchingCommands(
+    createNewCommands,
+    searchText,
+    [],
+    3,
+  );
+  if (currentEntityType === "WIDGET") {
+    createNewCommandsMatchingSearchText.push(
+      ...matchingCommands([newIntegration], searchText, []),
+    );
+  }
+  let list: CommandsCompletion[] = [];
+  if (suggestionsMatchingSearchText.length) {
+    list = [suggestionsHeader, ...suggestionsMatchingSearchText];
+  }
+
+  if (createNewCommandsMatchingSearchText.length) {
+    list = [...list, createNewHeader, ...createNewCommandsMatchingSearchText];
+  }
+  return list;
+};
+
+const matchingCommands = (
+  list: any,
+  searchText: string,
+  recentEntities: string[] = [],
+  limit = 5,
+) => {
+  list = list.filter((action: any) => {
+    return action.displayText
+      .toLowerCase()
+      .startsWith(searchText.toLowerCase());
+  });
+  list = sortBy(list, (a: any) => {
+    return (
+      (a.data.ENTITY_TYPE === "WIDGET"
+        ? recentEntities.indexOf(a.data.widgetId)
+        : recentEntities.indexOf(a.data.actionId)) * -1
+    );
+  });
+  return list.slice(0, limit);
+};
+
+const commandsHeader = (
+  displayText: string,
+  text = "",
+): CommandsCompletion => ({
+  text: text,
+  displayText: displayText,
+  className: "CodeMirror-command-header",
+  data: { doc: "" },
+  origin: "",
+  type: "UNKNOWN",
+  isHeader: true,
+  shortcut: "",
+});
+
+const generateCreateNewCommand = ({
+  action,
+  displayText,
+  shortcut,
+  text,
+}: any): CommandsCompletion => ({
+  text: text,
+  displayText: displayText,
+  data: { doc: "" },
+  origin: "",
+  type: "UNKNOWN",
+  className: "CodeMirror-commands",
+  shortcut: shortcut,
+  action: action,
+  render: (element: HTMLElement, self: any, data: any) => {
+    ReactDOM.render(
+      <Command
+        customText={data.customText}
+        name={data.displayText}
+        shortcut={data.shortcut}
+      />,
+      element,
+    );
+  },
+});
+
+function Command(props: {
+  pluginType?: PluginType;
+  imgSrc?: string;
+  name: string;
+  shortcut: Shortcuts;
+  customText?: string;
+}) {
+  return (
+    <div className="command-container">
+      <div className="command">
+        {props.pluginType &&
+          {
+            DB: <DataSourcesColoredIcon />,
+            API: <ApisIcon />,
+            SAAS: <DataSourcesColoredIcon />,
+          }[props.pluginType]}
+        {props.imgSrc && <img src={props.imgSrc} />}
+        {props.shortcut &&
+          { [Shortcuts.BINDING]: <Binding />, [Shortcuts.PLUS]: <NewPlus /> }[
+            props.shortcut
+          ]}
+        <span>{props.name}</span>
+      </div>
+    </div>
+  );
+}
diff --git a/app/client/src/components/editorComponents/CodeEditor/hintHelpers.test.ts b/app/client/src/components/editorComponents/CodeEditor/hintHelpers.test.ts
index 296d1660d3..a0f3ccc3ff 100644
--- a/app/client/src/components/editorComponents/CodeEditor/hintHelpers.test.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/hintHelpers.test.ts
@@ -9,7 +9,6 @@ describe("hint helpers", () => {
       const helper = bindingHint(MockCodemirrorEditor, {});
       expect(MockCodemirrorEditor.setOption).toBeCalled();
       expect(helper).toHaveProperty("showHint");
-      expect(helper).toHaveProperty("update");
     });
 
     it("opens hint correctly", () => {
diff --git a/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts b/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts
index 0c6ae6ba9c..ef71d1c293 100644
--- a/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts
@@ -1,75 +1,91 @@
 import CodeMirror from "codemirror";
 import TernServer from "utils/autocomplete/TernServer";
 import KeyboardShortcuts from "constants/KeyboardShortcuts";
-import { dataTreeTypeDefCreator } from "utils/autocomplete/dataTreeTypeDefCreator";
-import { DataTree } from "entities/DataTree/dataTreeFactory";
 import { getDynamicStringSegments } from "utils/DynamicBindingUtils";
 import { HintHelper } from "components/editorComponents/CodeEditor/EditorConfig";
 import AnalyticsUtil from "utils/AnalyticsUtil";
-//TODO : add currentRow to data ?? currentRow: Object of columns ie first row
-export const bindingHint: HintHelper = (editor, data, additionalData) => {
-  const ternServer = new TernServer(data, additionalData);
+import { customTreeTypeDefCreator } from "../../../utils/autocomplete/customTreeTypeDefCreator";
+
+export const bindingHint: HintHelper = (editor, dataTree, additionalData) => {
+  if (additionalData) {
+    const customTreeDef = customTreeTypeDefCreator(additionalData);
+    TernServer.updateDef("customDataTree", customTreeDef);
+  }
+
   editor.setOption("extraKeys", {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore: No types available
     ...editor.options.extraKeys,
-    [KeyboardShortcuts.CodeEditor.OpenAutocomplete]: (cm: CodeMirror.Editor) =>
-      ternServer.complete(cm),
+    [KeyboardShortcuts.CodeEditor.OpenAutocomplete]: (
+      cm: CodeMirror.Editor,
+      expected: string,
+      entity: string,
+    ) => TernServer.complete(cm, expected, entity),
     [KeyboardShortcuts.CodeEditor.ShowTypeAndInfo]: (cm: CodeMirror.Editor) => {
-      ternServer.showType(cm);
+      TernServer.showType(cm);
     },
     [KeyboardShortcuts.CodeEditor.OpenDocsLink]: (cm: CodeMirror.Editor) => {
-      ternServer.showDocs(cm);
+      TernServer.showDocs(cm);
     },
   });
   return {
-    update: (data: DataTree) => {
-      const dataTreeDef = dataTreeTypeDefCreator(data);
-      ternServer.updateDef("dataTree", dataTreeDef);
-    },
-    showHint: (editor: CodeMirror.Editor) => {
-      let cursorBetweenBinding = false;
-      const cursor = editor.getCursor();
-      const value = editor.getValue();
-      let cursorIndex = cursor.ch;
-      if (cursor.line > 0) {
-        for (let lineIndex = 0; lineIndex < cursor.line; lineIndex++) {
-          const line = editor.getLine(lineIndex);
-          // Add line length + 1 for new line character
-          cursorIndex = cursorIndex + line.length + 1;
-        }
-      }
-      const stringSegments = getDynamicStringSegments(value);
-      // count of chars processed
-      let cumulativeCharCount = 0;
-      stringSegments.forEach((segment: string) => {
-        const start = cumulativeCharCount;
-        const dynamicStart = segment.indexOf("{{");
-        const dynamicDoesStart = dynamicStart > -1;
-        const dynamicEnd = segment.indexOf("}}");
-        const dynamicDoesEnd = dynamicEnd > -1;
-        const dynamicStartIndex = dynamicStart + start + 2;
-        const dynamicEndIndex = dynamicEnd + start;
-        if (
-          dynamicDoesStart &&
-          cursorIndex >= dynamicStartIndex &&
-          ((dynamicDoesEnd && cursorIndex <= dynamicEndIndex) ||
-            (!dynamicDoesEnd && cursorIndex >= dynamicStartIndex))
-        ) {
-          cursorBetweenBinding = true;
-        }
-        cumulativeCharCount = start + segment.length;
-      });
-
-      const shouldShow = cursorBetweenBinding;
+    showHint: (
+      editor: CodeMirror.Editor,
+      expected: string,
+      entityName: string,
+    ): boolean => {
+      const shouldShow = checkIfCursorInsideBinding(editor);
       if (shouldShow) {
-        AnalyticsUtil.logEvent("AUTO_COMPELTE_SHOW", {});
-        ternServer.complete(editor);
-      } else {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore: No types available
-        editor.closeHint();
+        AnalyticsUtil.logEvent("AUTO_COMPLETE_SHOW", {});
+        TernServer.complete(editor, expected, entityName);
+        return true;
       }
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore: No types available
+      editor.closeHint();
+      return false;
     },
   };
 };
+
+const computeCursorIndex = (editor: CodeMirror.Editor) => {
+  const cursor = editor.getCursor();
+  let cursorIndex = cursor.ch;
+  if (cursor.line > 0) {
+    for (let lineIndex = 0; lineIndex < cursor.line; lineIndex++) {
+      const line = editor.getLine(lineIndex);
+      cursorIndex = cursorIndex + line.length + 1;
+    }
+  }
+  return cursorIndex;
+};
+
+export const checkIfCursorInsideBinding = (
+  editor: CodeMirror.Editor,
+): boolean => {
+  let cursorBetweenBinding = false;
+  const value = editor.getValue();
+  const cursorIndex = computeCursorIndex(editor);
+  const stringSegments = getDynamicStringSegments(value);
+  // count of chars processed
+  let cumulativeCharCount = 0;
+  stringSegments.forEach((segment: string) => {
+    const start = cumulativeCharCount;
+    const dynamicStart = segment.indexOf("{{");
+    const dynamicDoesStart = dynamicStart > -1;
+    const dynamicEnd = segment.indexOf("}}");
+    const dynamicDoesEnd = dynamicEnd > -1;
+    const dynamicStartIndex = dynamicStart + start + 2;
+    const dynamicEndIndex = dynamicEnd + start;
+    if (
+      dynamicDoesStart &&
+      cursorIndex >= dynamicStartIndex &&
+      ((dynamicDoesEnd && cursorIndex <= dynamicEndIndex) ||
+        (!dynamicDoesEnd && cursorIndex >= dynamicStartIndex))
+    ) {
+      cursorBetweenBinding = true;
+    }
+    cumulativeCharCount = start + segment.length;
+  });
+  return cursorBetweenBinding;
+};
diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index 8f98ea1af4..f652e5dae0 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -1,4 +1,4 @@
-import React, { Component, lazy, Suspense } from "react";
+import React, { Component } from "react";
 import { connect } from "react-redux";
 import { AppState } from "reducers";
 import CodeMirror, { EditorConfiguration } from "codemirror";
@@ -14,7 +14,7 @@ import "codemirror/addon/mode/multiplex";
 import "codemirror/addon/tern/tern.css";
 import { getDataTreeForAutocomplete } from "selectors/dataTreeSelectors";
 import EvaluatedValuePopup from "components/editorComponents/CodeEditor/EvaluatedValuePopup";
-import { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
+import { WrappedFieldInputProps } from "redux-form";
 import _ from "lodash";
 import {
   DataTree,
@@ -31,17 +31,17 @@ import {
   EditorTheme,
   EditorThemes,
   Hinter,
+  HintHelper,
+  MarkHelper,
   TabBehaviour,
 } from "components/editorComponents/CodeEditor/EditorConfig";
 import {
   DynamicAutocompleteInputWrapper,
   EditorWrapper,
-  HintStyles,
   IconContainer,
 } from "components/editorComponents/CodeEditor/styledComponents";
 import { bindingMarker } from "components/editorComponents/CodeEditor/markHelpers";
 import { bindingHint } from "components/editorComponents/CodeEditor/hintHelpers";
-import { retryPromise } from "utils/AppsmithUtils";
 import BindingPrompt from "./BindingPrompt";
 import { showBindingPrompt } from "./BindingPromptHelper";
 import ScrollIndicator from "components/ads/ScrollIndicator";
@@ -49,22 +49,37 @@ import "codemirror/addon/fold/brace-fold";
 import "codemirror/addon/fold/foldgutter";
 import "codemirror/addon/fold/foldgutter.css";
 import * as Sentry from "@sentry/react";
+import {
+  EvaluationError,
+  getEvalErrorPath,
+  getEvalValuePath,
+  PropertyEvaluationErrorType,
+} from "utils/DynamicBindingUtils";
 import { removeNewLineChars, getInputValue } from "./codeEditorUtils";
-
-const LightningMenu = lazy(() =>
-  retryPromise(() => import("components/editorComponents/LightningMenu")),
-);
+import { commandsHelper } from "./commandsHelper";
+import { getEntityNameAndPropertyPath } from "workers/evaluationUtils";
+import Button from "components/ads/Button";
+import styled from "styled-components";
+import { Colors } from "constants/Colors";
+import { getPluginIdToImageLocation } from "sagas/selectors";
 
 const AUTOCOMPLETE_CLOSE_KEY_CODES = [
   "Enter",
   "Tab",
   "Escape",
-  "Backspace",
   "Comma",
+  "Backspace",
 ];
 
 interface ReduxStateProps {
   dynamicData: DataTree;
+  datasources: any;
+  pluginIdToImageLocation: Record<string, string>;
+  recentEntities: string[];
+}
+
+interface ReduxDispatchProps {
+  executeCommand: (payload: any) => void;
 }
 
 export type EditorStyleProps = {
@@ -72,7 +87,6 @@ export type EditorStyleProps = {
   leftIcon?: React.ReactNode;
   rightIcon?: React.ReactNode;
   height?: string | number;
-  meta?: Partial<WrappedFieldMetaProps>;
   showLineNumbers?: boolean;
   className?: string;
   leftImage?: string;
@@ -99,7 +113,9 @@ export type EditorProps = EditorStyleProps &
     hideEvaluatedValue?: boolean;
   };
 
-type Props = ReduxStateProps & EditorProps;
+type Props = ReduxStateProps &
+  EditorProps &
+  ReduxDispatchProps & { dispatch?: () => void };
 
 type State = {
   isFocused: boolean;
@@ -107,13 +123,26 @@ type State = {
   autoCompleteVisible: boolean;
 };
 
+const CommandBtnContainer = styled.div<{ isFocused: boolean }>`
+  position: absolute;
+  right: 1px;
+  height: 33px;
+  width: 33px;
+  top: 1px;
+  display: none;
+  transition: 0.3s all ease;
+  align-items: center;
+  justify-content: center;
+  background: ${(props) => (props.isFocused ? Colors.MERCURY : "#fafafa")};
+  z-index: 2;
+`;
 class CodeEditor extends Component<Props, State> {
   static defaultProps = {
     marking: [bindingMarker],
-    hinting: [bindingHint],
+    hinting: [bindingHint, commandsHelper],
   };
 
-  textArea = React.createRef<HTMLTextAreaElement>();
+  codeEditorTarget = React.createRef<HTMLDivElement>();
   editor!: CodeMirror.Editor;
   hinters: Hinter[] = [];
   private editorWrapperRef = React.createRef<HTMLDivElement>();
@@ -129,7 +158,7 @@ class CodeEditor extends Component<Props, State> {
   }
 
   componentDidMount(): void {
-    if (this.textArea.current) {
+    if (this.codeEditorTarget.current) {
       const options: EditorConfiguration = {
         mode: this.props.mode,
         theme: EditorThemes[this.props.theme],
@@ -143,6 +172,7 @@ class CodeEditor extends Component<Props, State> {
         matchBrackets: false,
         scrollbarStyle:
           this.props.size !== EditorSize.COMPACT ? "native" : "null",
+        placeholder: this.props.placeholder,
       };
 
       if (!this.props.input.onChange || this.props.disabled) {
@@ -165,71 +195,103 @@ class CodeEditor extends Component<Props, State> {
           },
         };
       }
-      this.editor = CodeMirror.fromTextArea(this.textArea.current, options);
-      this.editor.on("change", _.debounce(this.handleChange, 300));
-      this.editor.on("change", this.handleAutocompleteVisibility);
-      this.editor.on("change", this.onChangeTrigger);
-      this.editor.on("keyup", this.handleAutocompleteHide);
-      this.editor.on("focus", this.handleEditorFocus);
-      this.editor.on("cursorActivity", this.handleCursorMovement);
-      this.editor.on("focus", this.onFocusTrigger);
-      this.editor.on("blur", this.handleEditorBlur);
-      if (this.props.height) {
-        this.editor.setSize(0, this.props.height);
-      } else {
-        this.editor.setSize(0, "auto");
-      }
 
       // Set value of the editor
       const inputValue = getInputValue(this.props.input.value || "");
       if (this.props.size === EditorSize.COMPACT) {
-        this.editor.setValue(removeNewLineChars(inputValue));
+        options.value = removeNewLineChars(inputValue);
       } else {
-        this.editor.setValue(inputValue);
+        options.value = inputValue;
       }
 
-      this.updateMarkings();
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore This is an undocumented option of codemirror available
+      // with the Codemirror Constructor
+      options.finishInit = (editor: CodeMirror.Editor) => {
+        // If you need to do something with the editor right after it’s been created,
+        // put that code here.
+        //
+        // This helps with performance: finishInit() is called inside
+        // CodeMirror’s `operation()` (https://codemirror.net/doc/manual.html#operation
+        // which means CodeMirror recalculates itself only one time, once all CodeMirror
+        // changes here are completed
+        //
 
-      this.startAutocomplete();
+        editor.on("beforeChange", this.handleBeforeChange);
+        editor.on("change", _.debounce(this.handleChange, 300));
+        editor.on("change", this.handleAutocompleteVisibility);
+        editor.on("change", this.onChangeTrigger);
+        editor.on("keyup", this.handleAutocompleteHide);
+        editor.on("focus", this.handleEditorFocus);
+        editor.on("cursorActivity", this.handleCursorMovement);
+        editor.on("focus", this.onFocusTrigger);
+        editor.on("blur", this.handleEditorBlur);
+        editor.on("postPick", () => this.handleAutocompleteVisibility(editor));
+        if (this.props.height) {
+          editor.setSize("100%", this.props.height);
+        } else {
+          editor.setSize("100%", "100%");
+        }
+
+        CodeEditor.updateMarkings(editor, this.props.marking);
+
+        this.hinters = CodeEditor.startAutocomplete(
+          editor,
+          this.props.hinting,
+          this.props.dynamicData,
+          this.props.showLightningMenu,
+          this.props.additionalDynamicData,
+        );
+      };
+
+      // Finally create the Codemirror editor
+      this.editor = CodeMirror(this.codeEditorTarget.current, options);
+      // DO NOT ADD CODE BELOW. If you need to do something with the editor right after it’s created,
+      // put that code into `options.finishInit()`.
     }
   }
 
   componentDidUpdate(prevProps: Props): void {
-    this.editor.refresh();
-    if (!this.state.isFocused) {
-      // const currentMode = this.editor.getOption("mode");
-      const editorValue = this.editor.getValue();
-      // Safe update of value of the editor when value updated outside the editor
-      const inputValue = getInputValue(this.props.input.value);
-      if (!!inputValue || inputValue === "") {
-        if (this.props.size === EditorSize.COMPACT) {
-          this.editor.setValue(removeNewLineChars(inputValue));
-        } else if (inputValue !== editorValue) {
-          this.editor.setValue(inputValue);
+    this.editor.operation(() => {
+      if (!this.state.isFocused) {
+        // const currentMode = this.editor.getOption("mode");
+        const editorValue = this.editor.getValue();
+        // Safe update of value of the editor when value updated outside the editor
+        const inputValue = getInputValue(this.props.input.value);
+        if (!!inputValue || inputValue === "") {
+          if (this.props.size === EditorSize.COMPACT) {
+            this.editor.setValue(removeNewLineChars(inputValue));
+          } else if (inputValue !== editorValue) {
+            this.editor.setValue(inputValue);
+          }
+        }
+        CodeEditor.updateMarkings(this.editor, this.props.marking);
+      } else {
+        // Update the dynamic bindings for autocomplete
+        if (prevProps.dynamicData !== this.props.dynamicData) {
+          this.hinters.forEach(
+            (hinter) => hinter.update && hinter.update(this.props.dynamicData),
+          );
         }
       }
-      this.updateMarkings();
-
-      // if (currentMode !== this.props.mode) {
-      //   this.editor.setOption("mode", this.props?.mode);
-      // }
-    } else {
-      // Update the dynamic bindings for autocomplete
-      if (prevProps.dynamicData !== this.props.dynamicData) {
-        this.hinters.forEach(
-          (hinter) => hinter.update && hinter.update(this.props.dynamicData),
-        );
-      }
-    }
+    });
   }
 
-  startAutocomplete() {
-    this.hinters = this.props.hinting.map((helper) => {
-      return helper(
-        this.editor,
-        this.props.dynamicData,
-        this.props.additionalDynamicData,
-      );
+  componentWillUnmount() {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore: No types available
+    this.editor.closeHint();
+  }
+
+  static startAutocomplete(
+    editor: CodeMirror.Editor,
+    hinting: Array<HintHelper>,
+    dynamicData: DataTree,
+    showLightningMenu?: boolean,
+    additionalDynamicData?: Record<string, Record<string, unknown>>,
+  ) {
+    return hinting.map((helper) => {
+      return helper(editor, dynamicData, additionalDynamicData);
     });
   }
 
@@ -263,13 +325,16 @@ class CodeEditor extends Component<Props, State> {
 
   handleEditorFocus = () => {
     this.setState({ isFocused: true });
-    this.editor.refresh();
     if (this.props.size === EditorSize.COMPACT) {
-      const inputValue = this.props.input.value;
-      this.editor.setOption("lineWrapping", true);
-      this.editor.setValue(inputValue);
-      this.editor.setCursor(inputValue.length);
+      this.editor.operation(() => {
+        const inputValue = this.props.input.value;
+        this.editor.setOption("lineWrapping", true);
+        this.editor.setValue(inputValue);
+        this.editor.setCursor(inputValue.length);
+      });
     }
+    if (this.editor.getValue().length === 0)
+      this.handleAutocompleteVisibility(this.editor);
   };
 
   handleEditorBlur = () => {
@@ -278,30 +343,70 @@ class CodeEditor extends Component<Props, State> {
     if (this.props.size === EditorSize.COMPACT) {
       this.editor.setOption("lineWrapping", false);
     }
-
     this.editor.setOption("matchBrackets", false);
   };
 
+  handleBeforeChange(
+    cm: CodeMirror.Editor,
+    change: CodeMirror.EditorChangeCancellable,
+  ) {
+    if (change.origin === "paste") {
+      // Remove all non ASCII quotes since they are invalid in Javascript
+      const formattedText = change.text.map((line) => {
+        let formattedLine = line.replace(/[‘’]/g, "'");
+        formattedLine = formattedLine.replace(/[“”]/g, '"');
+        return formattedLine;
+      });
+      if (change.update) {
+        change.update(undefined, undefined, formattedText);
+      }
+    }
+  }
+
   handleChange = (instance?: any, changeObj?: any) => {
-    const value = this.editor.getValue();
+    const value = this.editor.getValue() || "";
     if (changeObj && changeObj.origin === "complete") {
       AnalyticsUtil.logEvent("AUTO_COMPLETE_SELECT", {
         searchString: changeObj.text[0],
       });
     }
-    const inputValue = this.props.input.value;
+    const inputValue = this.props.input.value || "";
     if (
       this.props.input.onChange &&
-      value !== inputValue &&
+      (value !== inputValue ||
+        _.get(this.editor, "state.completionActive.startLen") === 0) &&
       this.state.isFocused
     ) {
       this.props.input.onChange(value);
     }
-    this.updateMarkings();
+    CodeEditor.updateMarkings(this.editor, this.props.marking);
   };
 
   handleAutocompleteVisibility = (cm: CodeMirror.Editor) => {
-    this.hinters.forEach((hinter) => hinter.showHint(cm));
+    if (!this.state.isFocused) return;
+    const expected = this.props.expected ? this.props.expected : "";
+    const { entityName } = getEntityNameAndPropertyPath(
+      this.props.dataTreePath || "",
+    );
+    let hinterOpen = false;
+    for (let i = 0; i < this.hinters.length; i++) {
+      hinterOpen = this.hinters[i].showHint(cm, expected, entityName, {
+        datasources: this.props.datasources.list,
+        pluginIdToImageLocation: this.props.pluginIdToImageLocation,
+        recentEntities: this.props.recentEntities,
+        update: this.props.input.onChange?.bind(this),
+        executeCommand: (payload: any) => {
+          this.props.executeCommand({
+            ...payload,
+            callback: (binding: string) => {
+              const value = this.editor.getValue() + binding;
+              this.updatePropertyValue(value, value.length);
+            },
+          });
+        },
+      });
+      if (hinterOpen) break;
+    }
   };
 
   handleAutocompleteHide = (cm: any, event: KeyboardEvent) => {
@@ -310,59 +415,96 @@ class CodeEditor extends Component<Props, State> {
     }
   };
 
-  updateMarkings = () => {
-    this.props.marking.forEach((helper) => this.editor && helper(this.editor));
+  static updateMarkings = (
+    editor: CodeMirror.Editor,
+    marking: Array<MarkHelper>,
+  ) => {
+    marking.forEach((helper) => helper(editor));
   };
 
-  updatePropertyValue(value: string, cursor?: number) {
+  updatePropertyValue(
+    value: string,
+    cursor?: number,
+    preventAutoComplete = false,
+  ) {
     if (value) {
       this.editor.setValue(value);
     }
     this.editor.focus();
-    if (cursor === undefined) {
-      if (value) {
-        cursor = value.length - 2;
-      } else {
-        cursor = 1;
-      }
-    }
     this.editor.setCursor({
-      line: 0,
-      ch: cursor,
+      line: cursor || this.editor.lineCount() - 1,
+      ch: this.editor.getLine(this.editor.lineCount() - 1).length - 2,
     });
     this.setState({ isFocused: true }, () => {
+      if (preventAutoComplete) return;
       this.handleAutocompleteVisibility(this.editor);
     });
   }
 
+  getPropertyValidation = (
+    dataTree: DataTree,
+    dataTreePath?: string,
+  ): {
+    isInvalid: boolean;
+    errors: EvaluationError[];
+    pathEvaluatedValue: unknown;
+  } => {
+    if (!dataTreePath) {
+      return {
+        isInvalid: false,
+        errors: [],
+        pathEvaluatedValue: undefined,
+      };
+    }
+
+    const errors = _.get(
+      dataTree,
+      getEvalErrorPath(dataTreePath),
+      [],
+    ) as EvaluationError[];
+    const filteredLintErrors = errors.filter(
+      (error) => error.errorType !== PropertyEvaluationErrorType.LINT,
+    );
+    const pathEvaluatedValue = _.get(dataTree, getEvalValuePath(dataTreePath));
+
+    return {
+      isInvalid: filteredLintErrors.length > 0,
+      errors: filteredLintErrors,
+      pathEvaluatedValue,
+    };
+  };
+
   render() {
     const {
-      input,
-      meta,
-      theme,
-      disabled,
-      className,
-      placeholder,
-      showLightningMenu,
-      dataTreePath,
-      dynamicData,
-      expected,
-      size,
-      evaluatedValue,
-      height,
-      borderLess,
       border,
-      hoverInteraction,
-      fill,
-      useValidationMessage,
-      hideEvaluatedValue,
+      borderLess,
+      className,
+      dataTreePath,
+      disabled,
+      dynamicData,
+      evaluatedValue,
       evaluationSubstitutionType,
+      expected,
+      fill,
+      height,
+      hideEvaluatedValue,
+      hoverInteraction,
+      input,
+      showLightningMenu,
+      size,
+      theme,
+      useValidationMessage,
     } = this.props;
-    const hasError = !!(meta && meta.error);
+    const {
+      errors,
+      isInvalid,
+      pathEvaluatedValue,
+    } = this.getPropertyValidation(dynamicData, dataTreePath);
     let evaluated = evaluatedValue;
     if (dataTreePath) {
-      evaluated = _.get(dynamicData, dataTreePath);
+      evaluated = pathEvaluatedValue;
     }
+
     const showEvaluatedValue =
       this.state.isFocused &&
       ("evaluatedValue" in this.props ||
@@ -370,36 +512,37 @@ class CodeEditor extends Component<Props, State> {
 
     return (
       <DynamicAutocompleteInputWrapper
-        isActive={(this.state.isFocused && !hasError) || this.state.isOpened}
-        isError={hasError}
+        isActive={(this.state.isFocused && !isInvalid) || this.state.isOpened}
+        isError={isInvalid}
         isNotHover={this.state.isFocused || this.state.isOpened}
         skin={this.props.theme === EditorTheme.DARK ? Skin.DARK : Skin.LIGHT}
         theme={this.props.theme}
       >
         {showLightningMenu !== false && !this.state.isFocused && (
-          <Suspense fallback={<div />}>
-            <LightningMenu
-              isFocused={this.state.isFocused}
-              isOpened={this.state.isOpened}
-              onCloseLightningMenu={() => {
-                this.setState({ isOpened: false });
+          <CommandBtnContainer
+            className="slash-commands"
+            isFocused={this.state.isFocused}
+          >
+            <Button
+              className="commands-button"
+              onClick={() => {
+                const newValue =
+                  typeof this.props.input.value === "string"
+                    ? this.props.input.value + "/"
+                    : "/";
+                this.updatePropertyValue(newValue, newValue.length);
               }}
-              onOpenLightningMenu={() => {
-                this.setState({ isOpened: true });
-              }}
-              skin={
-                this.props.theme === EditorTheme.DARK ? Skin.DARK : Skin.LIGHT
-              }
-              updateDynamicInputValue={this.updatePropertyValue}
+              tag="button"
+              text="/"
             />
-          </Suspense>
+          </CommandBtnContainer>
         )}
         <EvaluatedValuePopup
-          error={meta?.error}
+          errors={errors}
           evaluatedValue={evaluated}
           evaluationSubstitutionType={evaluationSubstitutionType}
           expected={expected}
-          hasError={hasError}
+          hasError={isInvalid}
           hideEvaluatedValue={hideEvaluatedValue}
           isOpen={showEvaluatedValue}
           theme={theme || EditorTheme.LIGHT}
@@ -412,7 +555,7 @@ class CodeEditor extends Component<Props, State> {
             disabled={disabled}
             editorTheme={this.props.theme}
             fill={fill}
-            hasError={hasError}
+            hasError={isInvalid}
             height={height}
             hoverInteraction={hoverInteraction}
             isFocused={this.state.isFocused}
@@ -420,7 +563,6 @@ class CodeEditor extends Component<Props, State> {
             ref={this.editorWrapperRef}
             size={size}
           >
-            <HintStyles editorTheme={theme || EditorTheme.LIGHT} />
             {this.props.leftIcon && (
               <IconContainer>{this.props.leftIcon}</IconContainer>
             )}
@@ -432,12 +574,17 @@ class CodeEditor extends Component<Props, State> {
                 src={this.props.leftImage}
               />
             )}
-            <textarea
-              ref={this.textArea}
-              {..._.omit(this.props.input, ["onChange", "value"])}
-              defaultValue={input.value}
-              placeholder={placeholder}
-            />
+            <div className="CodeEditorTarget" ref={this.codeEditorTarget}>
+              <BindingPrompt
+                editorTheme={this.props.theme}
+                isOpen={
+                  showBindingPrompt(showEvaluatedValue, input.value) &&
+                  !_.get(this.editor, "state.completionActive")
+                }
+                promptMessage={this.props.promptMessage}
+                showLightningMenu={this.props.showLightningMenu}
+              />
+            </div>
             {this.props.link && (
               <a
                 className="linkStyles"
@@ -451,11 +598,6 @@ class CodeEditor extends Component<Props, State> {
             {this.props.rightIcon && (
               <IconContainer>{this.props.rightIcon}</IconContainer>
             )}
-            <BindingPrompt
-              editorTheme={this.props.theme}
-              isOpen={showBindingPrompt(showEvaluatedValue, input.value)}
-              promptMessage={this.props.promptMessage}
-            />
             <ScrollIndicator containerRef={this.editorWrapperRef} />
           </EditorWrapper>
         </EvaluatedValuePopup>
@@ -466,6 +608,15 @@ class CodeEditor extends Component<Props, State> {
 
 const mapStateToProps = (state: AppState): ReduxStateProps => ({
   dynamicData: getDataTreeForAutocomplete(state),
+  datasources: state.entities.datasources,
+  pluginIdToImageLocation: getPluginIdToImageLocation(state),
+  recentEntities: state.ui.globalSearch.recentEntities.map((r) => r.id),
 });
 
-export default Sentry.withProfiler(connect(mapStateToProps)(CodeEditor));
+const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({
+  executeCommand: (payload) => dispatch({ type: "EXECUTE_COMMAND", payload }),
+});
+
+export default Sentry.withProfiler(
+  connect(mapStateToProps, mapDispatchToProps)(CodeEditor),
+);
diff --git a/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts b/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts
index 3272c2f646..64d6947c5e 100644
--- a/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts
@@ -1,4 +1,4 @@
-import styled, { createGlobalStyle } from "styled-components";
+import styled from "styled-components";
 import {
   CodeEditorBorder,
   EditorSize,
@@ -7,167 +7,6 @@ import {
 import { Skin, Theme } from "constants/DefaultTheme";
 import { Colors } from "constants/Colors";
 
-export const HintStyles = createGlobalStyle<{
-  editorTheme: EditorTheme;
-  theme: Theme;
-}>`
-  .CodeMirror-hints {
-    position: absolute;
-    z-index: 20;
-    overflow: hidden;
-    list-style: none;
-    margin-top: ${(props) => props.theme.spaces[3]}px;
-    padding: 0px 0px;
-    font-size: 90%;
-    font-family: monospace;
-    max-height: 20em;
-    overflow-y: auto;
-    background: ${(props) =>
-      props.editorTheme === EditorTheme.LIGHT ? "#FAFAFA" : "#262626"};
-    box-shadow: 0px 12px 28px -6px rgba(0, 0, 0, 0.32);
-    border-radius: 0px;
-  }
-
-  .CodeMirror-hint {
-    height: 24px;
-    color: ${(props) =>
-      props.editorTheme === EditorTheme.LIGHT ? "#090707" : "#FFFFFF"};
-    cursor: pointer;
-    display: flex;
-    width: 220px;
-    align-items: center;
-    font-size: 12px;
-    line-height: 15px;
-    letter-spacing: -0.24px;
-    &:hover {
-      background: ${(props) =>
-        props.editorTheme === EditorTheme.LIGHT ? "#6A86CE" : "#157A96"};
-      border-radius: 0px;
-      color: #fff;
-      &:after {
-        color: #fff;
-      }
-    }
-  }
-
-  .datasource-hint {
-    padding: 10px;
-    display: block;
-    width: 500px;
-    height: 32px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    &.invalid {
-      color: ${(props) => props.theme.colors.errorMessage};
-    }
-  }
-  .CodeMirror-Tern-completion {
-    padding-left: ${(props) => props.theme.spaces[11]}px !important;
-    &:hover{
-      background: ${(props) =>
-        props.editorTheme === EditorTheme.LIGHT ? "#6A86CE" : "#157A96"};
-    }
-  }
-  .CodeMirror-Tern-completion:before {
-    left: 7px;
-    bottom: 6px;
-    height: 12px;
-    width: 12px;
-    border-radius: 0;
-    font-size: 10px;
-    line-height: 12px;
-    font-weight: normal;
-    text-align: center;
-    color: ${(props) => props.theme.colors.codeMirror.dataType.shortForm};
-    margin-right: ${(props) => props.theme.spaces[13]}px;
-  }
-  .CodeMirror-Tern-completion-fn:before {
-    background: ${(props) => props.theme.colors.dataTypeBg.function};
-  }
-  .CodeMirror-Tern-completion-object:before {
-    background: ${(props) => props.theme.colors.dataTypeBg.object};
-  }
-  .CodeMirror-Tern-completion-unknown:before {
-    background: ${(props) => props.theme.colors.dataTypeBg.unknown};
-  }
-  .CodeMirror-Tern-completion-array:before {
-    background: ${(props) => props.theme.colors.dataTypeBg.array};
-  }
-  .CodeMirror-Tern-completion-number:before, .CodeMirror-Tern-completion-string:before, .CodeMirror-Tern-completion-bool:before {
-    background: ${(props) => props.theme.colors.dataTypeBg.number};
-  }
-  .CodeMirror-Tern-completion:after {
-    position: absolute;
-    right: 8px;
-    bottom: 6px;
-    font-style: italic;
-    font-weight: normal;
-    font-size: 10px;
-    line-height: 13px;
-    letter-spacing: -0.24px;
-    color: ${(props) => props.theme.colors.codeMirror.dataType.fullForm};
-  }
-  .CodeMirror-Tern-completion-fn:after {
-    content: "Function";
-  }
-  .CodeMirror-Tern-completion-object:after {
-    content: "Object";
-  }
-  .CodeMirror-Tern-completion-unknown:after {
-    content: "Unknown";
-  }
-  .CodeMirror-Tern-completion-array:after {
-    content: "Array";
-  }
-  .CodeMirror-Tern-completion-number:after {
-    content: "Number";
-  }
-  .CodeMirror-Tern-completion-string:after {
-    content: "String";
-  }
-  .CodeMirror-Tern-completion-bool:after {
-    content: "Boolean";
-  }
-  .CodeMirror-Tern-tooltip {
-    z-index: 20 !important;
-  }
-  li.CodeMirror-hint-active {
-    background: ${(props) =>
-      props.theme.colors.codeMirror.background.hoverState};
-    border-radius: 0px;
-    color: #fff;
-    &:after {
-      color: #fff;
-    }
-  }
-  .CodeMirror-Tern-hint-doc {
-    display: none;
-    &.visible {
-      display: block;
-      background-color: ${(props) =>
-        props.editorTheme === EditorTheme.DARK ? "#23292e" : "#fff"} !important;
-      color: ${(props) =>
-        props.editorTheme === EditorTheme.DARK
-          ? "#F4F4F4"
-          : "#1E242B"} !important;
-      max-height: 150px;
-      width: 250px;
-      font-size: 12px;
-      padding: 5px !important;
-      border: 1px solid !important;
-      border-color: ${(props) =>
-        props.editorTheme === EditorTheme.DARK
-          ? "#23292e"
-          : "#DEDEDE"} !important;
-      box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.12) !important;
-      overflow: scroll;
-    }
-
-  }
-`;
-
 const getBorderStyle = (
   props: { theme: Theme } & {
     editorTheme?: EditorTheme;
@@ -391,6 +230,20 @@ export const EditorWrapper = styled.div<{
     text-shadow: none;
     font: inherit;
   }
+  .CodeEditorTarget {
+    width: 100%;
+    ${(props) =>
+      props.size === EditorSize.COMPACT
+        ? `
+        position: absolute;
+        left: 0;
+        right: 0;
+      `
+        : `
+          position: relative;
+        `}
+    ${(props) => (props.isFocused ? `z-index: 3;` : `z-index: 0;`)}
+  }
 `;
 
 export const IconContainer = styled.div`
@@ -422,20 +275,13 @@ export const DynamicAutocompleteInputWrapper = styled.div<{
   height: 100%;
   flex: 1;
   position: relative;
-  border-color: ${(props) =>
-    !props.isError && props.isActive && props.skin === Skin.DARK
-      ? Colors.ALABASTER
-      : "transparent"};
+  border: 1px solid ${(props) => (!props.isError ? "transparent" : "red")};
   > span:first-of-type {
     width: 30px;
     position: absolute;
     right: 0px;
   }
   &:hover {
-    border-color: ${(props) =>
-      !props.isError && props.skin === Skin.DARK
-        ? Colors.ALABASTER
-        : "transparent"};
     .lightning-menu {
       background: ${(props) => (!props.isNotHover ? "#090707" : "")};
       svg {
@@ -450,10 +296,28 @@ export const DynamicAutocompleteInputWrapper = styled.div<{
         }
       }
     }
+    .slash-commands {
+      display: flex;
+    }
   }
-  border: 0px;
   border-radius: 0px;
   .lightning-menu {
     z-index: 1 !important;
   }
+  .commands-button {
+    z-index: 2;
+    width: 24px;
+    height: 24px;
+    background: transparent;
+    color: #f86a2b;
+    border: none;
+    font-weight: bold;
+    font-size: 15px;
+    font-style: italic;
+    padding: 0 0 3px;
+    &:hover {
+      background: #f86a2b;
+      color: white;
+    }
+  }
 `;
diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
index 4ae6fb592f..cbc2dcf921 100644
--- a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
@@ -3,8 +3,10 @@ import styled from "styled-components";
 import { isUndefined } from "lodash";
 import { Severity } from "entities/AppsmithConsole";
 import FilterHeader from "./FilterHeader";
-import { BlankState, useFilteredLogs, usePagination } from "./helpers";
+import { BlankState } from "./helpers";
 import LogItem, { getLogItemProps } from "./LogItem";
+import { usePagination, useFilteredLogs } from "./hooks";
+import { createMessage, NO_LOGS } from "constants/messages";
 
 const LIST_HEADER_HEIGHT = "38px";
 
@@ -37,7 +39,7 @@ function DebbuggerLogs(props: Props) {
   const [filter, setFilter] = useState("");
   const [searchQuery, setSearchQuery] = useState(props.searchQuery);
   const filteredLogs = useFilteredLogs(searchQuery, filter);
-  const { paginatedData, next } = usePagination(filteredLogs);
+  const { next, paginatedData } = usePagination(filteredLogs);
   const listRef = useRef<HTMLDivElement>(null);
   const selectedFilter = useMemo(
     () => LOGS_FILTER_OPTIONS.find((option) => option.value === filter),
@@ -79,7 +81,10 @@ function DebbuggerLogs(props: Props) {
 
       <ListWrapper className="debugger-list" ref={listRef}>
         {!paginatedData.length ? (
-          <BlankState hasShortCut={!!props.hasShortCut} />
+          <BlankState
+            hasShortCut={!!props.hasShortCut}
+            placeholderText={createMessage(NO_LOGS)}
+          />
         ) : (
           paginatedData.map((e, index: number) => {
             const logItemProps = getLogItemProps(e);
diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx
index a7641165a9..a541ee2cbb 100644
--- a/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx
@@ -8,6 +8,14 @@ import { showDebugger } from "actions/debuggerActions";
 import Errors from "./Errors";
 import Resizer, { ResizerCSS } from "./Resizer";
 import AnalyticsUtil from "utils/AnalyticsUtil";
+import EntityDeps from "./EntityDependecies";
+import {
+  createMessage,
+  DEBUGGER_ERRORS,
+  DEBUGGER_LOGS,
+  INSPECT_ENTITY,
+} from "constants/messages";
+import { stopEventPropagation } from "utils/AppsmithUtils";
 
 const TABS_HEADER_HEIGHT = 36;
 
@@ -41,14 +49,19 @@ type DebuggerTabsProps = {
 const DEBUGGER_TABS = [
   {
     key: "ERROR",
-    title: "Errors",
+    title: createMessage(DEBUGGER_ERRORS),
     panelComponent: <Errors hasShortCut />,
   },
   {
     key: "LOGS",
-    title: "Logs",
+    title: createMessage(DEBUGGER_LOGS),
     panelComponent: <DebuggerLogs hasShortCut />,
   },
+  {
+    key: "INSPECT_ELEMENTS",
+    title: createMessage(INSPECT_ENTITY),
+    panelComponent: <EntityDeps />,
+  },
 ];
 
 function DebuggerTabs(props: DebuggerTabsProps) {
@@ -65,7 +78,7 @@ function DebuggerTabs(props: DebuggerTabsProps) {
   const onClose = () => dispatch(showDebugger(false));
 
   return (
-    <Container ref={panelRef}>
+    <Container onClick={stopEventPropagation} ref={panelRef}>
       <Resizer panelRef={panelRef} />
       <TabComponent
         onSelect={onTabSelect}
diff --git a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx
new file mode 100644
index 0000000000..76672346ed
--- /dev/null
+++ b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx
@@ -0,0 +1,176 @@
+/* eslint-disable prefer-const */
+import { Collapse } from "@blueprintjs/core";
+import React, { memo, ReactNode, useMemo, useState } from "react";
+import { useSelector } from "react-redux";
+import { AppState } from "reducers";
+import styled from "styled-components";
+import Icon, { IconSize } from "components/ads/Icon";
+import { Classes } from "components/ads/common";
+import InspectElement from "assets/images/InspectElement.svg";
+import { SourceEntity } from "entities/AppsmithConsole";
+import { createMessage, INSPECT_ENTITY_BLANK_STATE } from "constants/messages";
+import { getDependenciesFromInverseDependencies } from "./helpers";
+import { useEntityLink, useSelectedEntity } from "./hooks";
+
+const CollapsibleWrapper = styled.div<{ step: number; isOpen: boolean }>`
+  margin-left: ${(props) => props.step * 10}px;
+  padding-top: ${(props) => props.theme.spaces[3]}px;
+
+  .label-wrapper {
+    display: flex;
+    flex-direction: row;
+    font-weight: ${(props) => props.theme.fontWeights[2]};
+
+    span {
+      margin-left: ${(props) => props.theme.spaces[3] - 1}px;
+    }
+  }
+
+  .${Classes.ICON} {
+    ${(props) => !props.isOpen && `transform: rotate(-90deg);`}
+  }
+`;
+
+const DependenciesWrapper = styled.div`
+  padding: ${(props) => props.theme.spaces[7]}px
+    ${(props) => props.theme.spaces[13] + 1}px;
+  color: ${(props) => props.theme.colors.debugger.inspectElement.color};
+
+  .no-dependencies {
+    margin-left: ${(props) => props.theme.spaces[4]}px;
+  }
+`;
+
+const StyledSpan = styled.div<{ step: number }>`
+  padding-top: ${(props) => props.theme.spaces[3]}px;
+  padding-left: ${(props) => props.theme.spaces[6] + 1}px;
+  margin-left: ${(props) => props.theme.spaces[4]}px;
+  border-left: solid 1px rgba(147, 144, 144, 0.7);
+  text-decoration-line: underline;
+  cursor: pointer;
+`;
+
+const BlankStateContainer = styled.div`
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex: 1;
+  flex-direction: column;
+  color: ${(props) => props.theme.colors.debugger.blankState.color};
+
+  span {
+    margin-top: ${(props) => props.theme.spaces[9] + 1}px;
+  }
+`;
+
+function EntityDeps() {
+  const deps = useSelector((state: AppState) => state.evaluations.dependencies);
+  const selectedEntity = useSelectedEntity();
+
+  const entityDependencies: {
+    directDependencies: string[];
+    inverseDependencies: string[];
+  } | null = useMemo(
+    () =>
+      getDependenciesFromInverseDependencies(
+        deps.inverseDependencyMap,
+        selectedEntity ? selectedEntity.name : null,
+      ),
+    [selectedEntity, deps.inverseDependencyMap],
+  );
+
+  if (!selectedEntity || !entityDependencies) return <BlankState />;
+
+  return (
+    <div>
+      <MemoizedDependencyHierarchy
+        dependencies={entityDependencies.directDependencies}
+        entityName={`Dependencies of ${selectedEntity.name}`}
+        selectedEntity={selectedEntity}
+        type="dependencies"
+      />
+      <MemoizedDependencyHierarchy
+        dependencies={entityDependencies.inverseDependencies}
+        entityName={`References of ${selectedEntity.name}`}
+        selectedEntity={selectedEntity}
+        type="references"
+      />
+    </div>
+  );
+}
+
+function BlankState() {
+  return (
+    <BlankStateContainer>
+      <img src={InspectElement} />
+      <span>{createMessage(INSPECT_ENTITY_BLANK_STATE)}</span>
+    </BlankStateContainer>
+  );
+}
+
+function DependencyHierarchy(props: {
+  dependencies: string[];
+  entityName: string;
+  selectedEntity: SourceEntity;
+  type: string;
+}) {
+  const { navigateToEntity } = useEntityLink();
+  const label = props.dependencies.length
+    ? props.entityName
+    : `No ${props.type} exist for ${props.selectedEntity.name}`;
+
+  return (
+    <DependenciesWrapper>
+      {props.dependencies.length ? (
+        <Collapsible label={label} step={0}>
+          {props.dependencies.map((item) => {
+            return (
+              <StyledSpan
+                className={`t--${props.type}-item`}
+                key={`${props.selectedEntity.id}-${item}`}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  navigateToEntity(item);
+                }}
+                step={2}
+              >
+                {item}
+              </StyledSpan>
+            );
+          })}
+        </Collapsible>
+      ) : (
+        <span className="no-dependencies">{label}</span>
+      )}
+    </DependenciesWrapper>
+  );
+}
+const MemoizedDependencyHierarchy = memo(DependencyHierarchy);
+
+function Collapsible(props: {
+  label: string;
+  step: number;
+  children: ReactNode;
+}) {
+  const [isOpen, setIsOpen] = useState(true);
+
+  return (
+    <CollapsibleWrapper
+      isOpen={isOpen}
+      onClick={(e) => {
+        e.stopPropagation();
+        setIsOpen(!isOpen);
+      }}
+      step={props.step}
+    >
+      <div className="label-wrapper">
+        <Icon name={"downArrow"} size={IconSize.XXS} />
+        <span>{props.label}</span>
+      </div>
+      <Collapse isOpen={isOpen}>{props.children}</Collapse>
+    </CollapsibleWrapper>
+  );
+}
+
+export default EntityDeps;
diff --git a/app/client/src/components/editorComponents/Debugger/EntityLink.tsx b/app/client/src/components/editorComponents/Debugger/EntityLink.tsx
index 56959a7842..51d0ec2765 100644
--- a/app/client/src/components/editorComponents/Debugger/EntityLink.tsx
+++ b/app/client/src/components/editorComponents/Debugger/EntityLink.tsx
@@ -2,7 +2,7 @@ import { DATA_SOURCES_EDITOR_ID_URL } from "constants/routes";
 import { PluginType } from "entities/Action";
 import { ENTITY_TYPE, SourceEntity } from "entities/AppsmithConsole";
 import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
-import { useNavigateToWidget } from "pages/Editor/Explorer/Widgets/WidgetEntity";
+import { useNavigateToWidget } from "pages/Editor/Explorer/Widgets/useNavigateToWidget";
 import React, { useCallback } from "react";
 import { useSelector } from "react-redux";
 import { AppState } from "reducers";
@@ -25,10 +25,11 @@ function ActionLink(props: EntityLinkProps) {
 
   const onClick = useCallback(() => {
     if (action) {
-      const { pageId, pluginType, id } = action;
+      const { id, pageId, pluginType } = action;
       const actionConfig = getActionConfig(pluginType);
       const url =
-        applicationId && actionConfig?.getURL(applicationId, pageId, id);
+        applicationId &&
+        actionConfig?.getURL(applicationId, pageId, id, pluginType);
 
       if (url) {
         history.push(url);
@@ -71,7 +72,7 @@ function WidgetLink(props: EntityLinkProps) {
     AnalyticsUtil.logEvent("DEBUGGER_ENTITY_NAVIGATION", {
       entityType: "WIDGET",
     });
-  }, []);
+  }, [navigateToWidget]);
 
   return (
     <Link
diff --git a/app/client/src/components/editorComponents/Debugger/Errors.tsx b/app/client/src/components/editorComponents/Debugger/Errors.tsx
index c6dd328e42..e4da955f80 100644
--- a/app/client/src/components/editorComponents/Debugger/Errors.tsx
+++ b/app/client/src/components/editorComponents/Debugger/Errors.tsx
@@ -4,6 +4,7 @@ import styled from "styled-components";
 import { getDebuggerErrors } from "selectors/debuggerSelectors";
 import LogItem, { getLogItemProps } from "./LogItem";
 import { BlankState } from "./helpers";
+import { createMessage, NO_ERRORS } from "constants/messages";
 
 const ContainerWrapper = styled.div`
   overflow: hidden;
@@ -23,7 +24,10 @@ function Errors(props: { hasShortCut?: boolean }) {
     <ContainerWrapper>
       <ListWrapper className="debugger-list">
         {!Object.values(errors).length ? (
-          <BlankState hasShortCut={props.hasShortCut} />
+          <BlankState
+            hasShortCut={props.hasShortCut}
+            placeholderText={createMessage(NO_ERRORS)}
+          />
         ) : (
           Object.values(errors).map((e, index) => {
             const logItemProps = getLogItemProps(e);
diff --git a/app/client/src/components/editorComponents/Debugger/LogItem.tsx b/app/client/src/components/editorComponents/Debugger/LogItem.tsx
index ebf355ba41..ba57bef865 100644
--- a/app/client/src/components/editorComponents/Debugger/LogItem.tsx
+++ b/app/client/src/components/editorComponents/Debugger/LogItem.tsx
@@ -5,7 +5,6 @@ import { Message, Severity, SourceEntity } from "entities/AppsmithConsole";
 import React, { useCallback, useState } from "react";
 import ReactJson from "react-json-view";
 import styled from "styled-components";
-import { isString } from "lodash";
 import EntityLink, { DebuggerLinkUI } from "./EntityLink";
 import { SeverityIcon, SeverityIconColor } from "./helpers";
 import { useDispatch } from "react-redux";
@@ -102,7 +101,7 @@ const Log = styled.div<{ collapsed: boolean }>`
 `;
 
 const JsonWrapper = styled.div`
-  padding-top: 4px;
+  padding-top: ${(props) => props.theme.spaces[1]}px;
   svg {
     color: ${(props) => props.theme.colors.debugger.jsonIcon} !important;
     height: 12px !important;
@@ -139,6 +138,10 @@ const StyledSearchIcon = styled(Icon)`
   }
 `;
 
+const MessageWrapper = styled.div`
+  padding-top: ${(props) => props.theme.spaces[1]}px;
+`;
+
 export const getLogItemProps = (e: Message) => {
   return {
     icon: SeverityIcon[e.severity] as IconName,
@@ -149,9 +152,9 @@ export const getLogItemProps = (e: Message) => {
     timeTaken: e.timeTaken ? `${e.timeTaken}ms` : "",
     severity: e.severity,
     text: e.text,
-    message: e.message && isString(e.message) ? e.message : "",
     state: e.state,
     id: e.source ? e.source.id : undefined,
+    messages: e.messages,
   };
 };
 
@@ -163,11 +166,11 @@ type LogItemProps = {
   timeTaken: string;
   severity: Severity;
   text: string;
-  message: string;
   state?: Record<string, any>;
   id?: string;
   source?: SourceEntity;
   expand?: boolean;
+  messages: Message["messages"];
 };
 
 function LogItem(props: LogItemProps) {
@@ -182,12 +185,12 @@ function LogItem(props: LogItemProps) {
     },
     collapsed: 1,
   };
-  const showToggleIcon = props.state || props.message;
+  const showToggleIcon = props.state || props.messages;
   const dispatch = useDispatch();
 
-  const openHelpModal = useCallback((e) => {
+  const openHelpModal = useCallback((e, message?: string) => {
     e.stopPropagation();
-    const text = props.message || props.text;
+    const text = message || props.text;
 
     AnalyticsUtil.logEvent("OPEN_OMNIBAR", {
       source: "DEBUGGER",
@@ -196,6 +199,7 @@ function LogItem(props: LogItemProps) {
     dispatch(setGlobalSearchQuery(text || ""));
     dispatch(toggleShowGlobalSearchModal());
   }, []);
+  const messages = props.messages || [];
 
   return (
     <Log
@@ -248,13 +252,18 @@ function LogItem(props: LogItemProps) {
 
         {showToggleIcon && (
           <StyledCollapse isOpen={isOpen} keepChildrenMounted>
-            {props.message && (
-              <div>
-                <span className="debugger-message" onClick={openHelpModal}>
-                  {props.message}
-                </span>
-              </div>
-            )}
+            {messages.map((e) => {
+              return (
+                <MessageWrapper key={e.message}>
+                  <span
+                    className="debugger-message"
+                    onClick={(event) => openHelpModal(event, e.message)}
+                  >
+                    {e.message}
+                  </span>
+                </MessageWrapper>
+              );
+            })}
             {props.state && (
               <JsonWrapper
                 className="t--debugger-log-state"
diff --git a/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx b/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx
index 853cb5ec72..98ed9f4cb8 100644
--- a/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx
+++ b/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx
@@ -20,6 +20,7 @@ const Top = styled.div`
 
 type ResizerProps = {
   panelRef: RefObject<HTMLDivElement>;
+  setContainerDimensions?: (height: number) => void;
 };
 
 function Resizer(props: ResizerProps) {
@@ -41,9 +42,15 @@ function Resizer(props: ResizerProps) {
       updatedHeight > minHeight
     ) {
       panel.style.height = `${height - movementY}px`;
+      props.setContainerDimensions &&
+        props.setContainerDimensions(height - movementY);
     }
   };
 
+  useEffect(() => {
+    handleResize(0);
+  }, []);
+
   useEffect(() => {
     const handleMouseMove = (e: MouseEvent) => {
       e.preventDefault();
diff --git a/app/client/src/components/editorComponents/Debugger/helpers.test.ts b/app/client/src/components/editorComponents/Debugger/helpers.test.ts
new file mode 100644
index 0000000000..fa7e67d134
--- /dev/null
+++ b/app/client/src/components/editorComponents/Debugger/helpers.test.ts
@@ -0,0 +1,88 @@
+import { DependencyMap } from "utils/DynamicBindingUtils";
+import {
+  getDependenciesFromInverseDependencies,
+  getDependencyChain,
+} from "./helpers";
+
+describe("getDependencies", () => {
+  it("Check if getDependencies returns in a correct format", () => {
+    const input = {
+      "Button1.text": ["Input1.defaultText", "Button1"],
+      "Input1.defaultText": ["Input1.text", "Input1"],
+      "Input1.inputType": ["Input1.isValid", "Input1"],
+      "Input1.text": ["Input1.isValid", "Input1.value", "Input1"],
+      "Input1.isRequired": ["Input1.isValid", "Input1"],
+      "Input1.isValid": ["Button1.isVisible", "Input1"],
+      "Button1.isVisible": ["Button1"],
+      Button1: ["Chart1.chartName"],
+      "Chart1.chartName": ["Chart1"],
+      "Input1.value": ["Input1"],
+    };
+    const output = {
+      directDependencies: ["Input1"],
+      inverseDependencies: ["Input1", "Chart1"],
+    };
+
+    expect(
+      getDependenciesFromInverseDependencies(input, "Button1"),
+    ).toStrictEqual(output);
+  });
+
+  it("Get dependency chain", () => {
+    const inputs: string[] = ["Button1.text", "DatePicker1.value"];
+    const inverseDependencies: DependencyMap[] = [
+      {
+        "Button1.text": ["Input1.defaultText", "Button1"],
+        "Input1.defaultText": ["Checkbox1.label", "Input1.text", "Input1"],
+        "Checkbox1.LEFT": ["Checkbox1.alignWidget", "Checkbox1"],
+        "Checkbox1.defaultCheckedState": ["Checkbox1.isChecked", "Checkbox1"],
+        "Checkbox1.isRequired": ["Checkbox1.isValid", "Checkbox1"],
+        "Checkbox1.isChecked": [
+          "Checkbox1.isValid",
+          "Checkbox1.value",
+          "Checkbox1",
+        ],
+        "Checkbox1.value": ["Checkbox1"],
+        "Checkbox1.isValid": ["Checkbox1"],
+        "Checkbox1.alignWidget": ["Checkbox1"],
+        "Checkbox1.label": ["Checkbox1"],
+        "Input1.text": ["Input1.value", "Input1.isValid", "Input1"],
+        "Input1.inputType": ["Input1.isValid", "Input1"],
+        "Input1.isRequired": ["Input1.isValid", "Input1"],
+        "Input1.isValid": ["Input1"],
+        "Input1.value": ["Input1"],
+      },
+      {
+        "DatePicker1.defaultDate": [
+          "DatePicker1.value",
+          "DatePicker1.selectedDate",
+          "DatePicker1.formattedDate",
+          "DatePicker1",
+        ],
+        "DatePicker1.value": [
+          "DatePicker1.selectedDate",
+          "DatePicker1.formattedDate",
+          "DatePicker1",
+        ],
+        "DatePicker1.selectedDate": [
+          "Text1.text",
+          "DatePicker1.isValid",
+          "DatePicker1",
+        ],
+        "Text1.text": ["Text1.value", "Text1"],
+        "Text1.value": ["Text1"],
+        "DatePicker1.dateFormat": ["DatePicker1.formattedDate", "DatePicker1"],
+        "DatePicker1.isRequired": ["DatePicker1.isValid", "DatePicker1"],
+        "DatePicker1.isValid": ["DatePicker1"],
+        "DatePicker1.formattedDate": ["DatePicker1"],
+      },
+    ];
+    const output = [["Input1.defaultText", "Checkbox1.label"], ["Text1.text"]];
+
+    inputs.map((input: any, index) => {
+      expect(getDependencyChain(input, inverseDependencies[index])).toEqual(
+        output[index],
+      );
+    });
+  });
+});
diff --git a/app/client/src/components/editorComponents/Debugger/helpers.tsx b/app/client/src/components/editorComponents/Debugger/helpers.tsx
index 29e019b9cf..0424c4145a 100644
--- a/app/client/src/components/editorComponents/Debugger/helpers.tsx
+++ b/app/client/src/components/editorComponents/Debugger/helpers.tsx
@@ -1,15 +1,15 @@
-import { Message, Severity } from "entities/AppsmithConsole";
-import React, { useCallback, useEffect, useState } from "react";
-import { useSelector } from "react-redux";
-import { AppState } from "reducers";
+import { Severity } from "entities/AppsmithConsole";
+import React from "react";
 import styled from "styled-components";
 import { getTypographyByKey } from "constants/DefaultTheme";
+import { createMessage, OPEN_THE_DEBUGGER, PRESS } from "constants/messages";
+import { DependencyMap } from "utils/DynamicBindingUtils";
 import {
-  createMessage,
-  NO_LOGS,
-  OPEN_THE_DEBUGGER,
-  PRESS,
-} from "constants/messages";
+  API_EDITOR_URL,
+  BUILDER_PAGE_URL,
+  QUERIES_EDITOR_URL,
+} from "constants/routes";
+import { getEntityNameAndPropertyPath } from "workers/evaluationUtils";
 
 const BlankStateWrapper = styled.div`
   overflow: auto;
@@ -26,7 +26,10 @@ const BlankStateWrapper = styled.div`
   }
 `;
 
-export function BlankState(props: { hasShortCut?: boolean }) {
+export function BlankState(props: {
+  placeholderText?: string;
+  hasShortCut?: boolean;
+}) {
   return (
     <BlankStateWrapper>
       {props.hasShortCut ? (
@@ -36,7 +39,7 @@ export function BlankState(props: { hasShortCut?: boolean }) {
           {createMessage(OPEN_THE_DEBUGGER)}
         </span>
       ) : (
-        <span>{createMessage(NO_LOGS)}</span>
+        <span>{props.placeholderText}</span>
       )}
     </BlankStateWrapper>
   );
@@ -54,46 +57,98 @@ export const SeverityIconColor: Record<Severity, string> = {
   [Severity.WARNING]: "rgb(224, 179, 14)",
 };
 
-export const useFilteredLogs = (query: string, filter?: any) => {
-  let logs = useSelector((state: AppState) => state.ui.debugger.logs);
+export function getDependenciesFromInverseDependencies(
+  deps: DependencyMap,
+  entityName: string | null,
+) {
+  if (!entityName) return null;
 
-  if (filter) {
-    logs = logs.filter((log: Message) => log.severity === filter);
-  }
+  const directDependencies = new Set<string>();
+  const inverseDependencies = new Set<string>();
 
-  if (query) {
-    logs = logs.filter((log: Message) => {
-      if (log.source?.name)
-        return (
-          log.source?.name.toUpperCase().indexOf(query.toUpperCase()) !== -1
-        );
+  Object.entries(deps).forEach(([dependant, dependencies]) => {
+    (dependencies as any).map((dependency: any) => {
+      if (!dependant.includes(entityName) && dependency.includes(entityName)) {
+        const entity = dependant
+          .split(".")
+          .slice(0, 1)
+          .join("");
+
+        directDependencies.add(entity);
+      } else if (
+        dependant.includes(entityName) &&
+        !dependency.includes(entityName)
+      ) {
+        const entity = dependency
+          .split(".")
+          .slice(0, 1)
+          .join("");
+
+        inverseDependencies.add(entity);
+      }
     });
-  }
+  });
 
-  return logs;
+  return {
+    inverseDependencies: Array.from(inverseDependencies),
+    directDependencies: Array.from(directDependencies),
+  };
+}
+
+// Recursively find out dependency chain from
+// the inverse dependency map
+export function getDependencyChain(
+  propertyPath: string,
+  inverseMap: DependencyMap,
+) {
+  let currentChain: string[] = [];
+  const dependents = inverseMap[propertyPath];
+
+  if (!dependents) return currentChain;
+
+  const dependentInfo = getEntityNameAndPropertyPath(propertyPath);
+
+  dependents.map((e) => {
+    if (!e.includes(dependentInfo.entityName)) {
+      currentChain.push(e);
+    }
+
+    if (e !== dependentInfo.entityName) {
+      currentChain = currentChain.concat(getDependencyChain(e, inverseMap));
+    }
+  });
+  return currentChain;
+}
+
+export const onApiEditor = (
+  applicationId: string | undefined,
+  currentPageId: string | undefined,
+) => {
+  return (
+    window.location.pathname.indexOf(
+      API_EDITOR_URL(applicationId, currentPageId),
+    ) > -1
+  );
 };
 
-export const usePagination = (data: Message[], itemsPerPage = 50) => {
-  const [currentPage, setCurrentPage] = useState(1);
-  const [paginatedData, setPaginatedData] = useState<Message[]>([]);
-  const maxPage = Math.ceil(data.length / itemsPerPage);
-
-  useEffect(() => {
-    const data = currentData();
-    setPaginatedData(data);
-  }, [currentPage, data.length]);
-
-  const currentData = useCallback(() => {
-    const end = currentPage * itemsPerPage;
-    return data.slice(0, end);
-  }, [data]);
-
-  const next = useCallback(() => {
-    setCurrentPage((currentPage) => {
-      const newCurrentPage = Math.min(currentPage + 1, maxPage);
-      return newCurrentPage <= 0 ? 1 : newCurrentPage;
-    });
-  }, []);
-
-  return { next, paginatedData };
+export const onQueryEditor = (
+  applicationId: string | undefined,
+  currentPageId: string | undefined,
+) => {
+  return (
+    window.location.pathname.indexOf(
+      QUERIES_EDITOR_URL(applicationId, currentPageId),
+    ) > -1
+  );
+};
+
+export const onCanvas = (
+  applicationId: string | undefined,
+  currentPageId: string | undefined,
+) => {
+  return (
+    window.location.pathname.indexOf(
+      BUILDER_PAGE_URL(applicationId, currentPageId),
+    ) > -1
+  );
 };
diff --git a/app/client/src/components/editorComponents/Debugger/hooks.ts b/app/client/src/components/editorComponents/Debugger/hooks.ts
new file mode 100644
index 0000000000..f03c180549
--- /dev/null
+++ b/app/client/src/components/editorComponents/Debugger/hooks.ts
@@ -0,0 +1,149 @@
+import { useCallback, useEffect, useState } from "react";
+import { useSelector } from "react-redux";
+import { useParams } from "react-router";
+import { ENTITY_TYPE, Message } from "entities/AppsmithConsole";
+import { AppState } from "reducers";
+import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
+import { useNavigateToWidget } from "pages/Editor/Explorer/Widgets/useNavigateToWidget";
+import { getWidget } from "sagas/selectors";
+import { getDataTree } from "selectors/dataTreeSelectors";
+import {
+  getCurrentApplicationId,
+  getCurrentPageId,
+} from "selectors/editorSelectors";
+import { getAction } from "selectors/entitiesSelector";
+import {
+  getCurrentWidgetId,
+  getIsPropertyPaneVisible,
+} from "selectors/propertyPaneSelectors";
+import { isWidget, isAction } from "workers/evaluationUtils";
+import { onApiEditor, onQueryEditor, onCanvas } from "./helpers";
+import history from "utils/history";
+
+export const useFilteredLogs = (query: string, filter?: any) => {
+  let logs = useSelector((state: AppState) => state.ui.debugger.logs);
+
+  if (filter) {
+    logs = logs.filter((log: Message) => log.severity === filter);
+  }
+
+  if (query) {
+    logs = logs.filter((log: Message) => {
+      if (log.source?.name)
+        return (
+          log.source?.name.toUpperCase().indexOf(query.toUpperCase()) !== -1
+        );
+    });
+  }
+
+  return logs;
+};
+
+export const usePagination = (data: Message[], itemsPerPage = 50) => {
+  const [currentPage, setCurrentPage] = useState(1);
+  const [paginatedData, setPaginatedData] = useState<Message[]>([]);
+  const maxPage = Math.ceil(data.length / itemsPerPage);
+
+  useEffect(() => {
+    const data = currentData();
+    setPaginatedData(data);
+  }, [currentPage, data.length]);
+
+  const currentData = useCallback(() => {
+    const end = currentPage * itemsPerPage;
+    return data.slice(0, end);
+  }, [data]);
+
+  const next = useCallback(() => {
+    setCurrentPage((currentPage) => {
+      const newCurrentPage = Math.min(currentPage + 1, maxPage);
+      return newCurrentPage <= 0 ? 1 : newCurrentPage;
+    });
+  }, []);
+
+  return { next, paginatedData };
+};
+
+export const useSelectedEntity = () => {
+  const applicationId = useSelector(getCurrentApplicationId);
+  const currentPageId = useSelector(getCurrentPageId);
+
+  const params: any = useParams();
+  const action = useSelector((state: AppState) => {
+    if (
+      onApiEditor(applicationId, currentPageId) ||
+      onQueryEditor(applicationId, currentPageId)
+    ) {
+      const id = params.apiId || params.queryId;
+
+      return getAction(state, id);
+    }
+
+    return null;
+  });
+
+  const isPropertyPaneVisible = useSelector(getIsPropertyPaneVisible);
+  const selectedWidget = useSelector(getCurrentWidgetId);
+  const widget = useSelector((state: AppState) => {
+    if (onCanvas(applicationId, currentPageId) && isPropertyPaneVisible) {
+      return selectedWidget ? getWidget(state, selectedWidget) : null;
+    }
+
+    return null;
+  });
+
+  if (
+    onApiEditor(applicationId, currentPageId) ||
+    onQueryEditor(applicationId, currentPageId)
+  ) {
+    return {
+      name: action?.name ?? "",
+      type: ENTITY_TYPE.ACTION,
+      id: action?.id ?? "",
+    };
+  } else if (onCanvas(applicationId, currentPageId)) {
+    return {
+      name: widget?.widgetName ?? "",
+      type: ENTITY_TYPE.WIDGET,
+      id: widget?.widgetId ?? "",
+    };
+  }
+
+  return null;
+};
+
+export const useEntityLink = () => {
+  const dataTree = useSelector(getDataTree);
+  const applicationId = useSelector(getCurrentApplicationId);
+  const pageId = useSelector(getCurrentPageId);
+
+  const { navigateToWidget } = useNavigateToWidget();
+
+  const navigateToEntity = useCallback(
+    (name) => {
+      const entity = dataTree[name];
+      if (isWidget(entity)) {
+        navigateToWidget(entity.widgetId, entity.type, pageId || "");
+      } else if (isAction(entity)) {
+        const actionConfig = getActionConfig(entity.pluginType);
+        const url =
+          applicationId &&
+          actionConfig?.getURL(
+            applicationId,
+            pageId || "",
+            entity.actionId,
+            entity.pluginType,
+          );
+
+        if (url) {
+          history.push(url);
+        }
+      }
+    },
+    [dataTree],
+  );
+
+  return {
+    navigateToEntity,
+  };
+};
diff --git a/app/client/src/components/editorComponents/Debugger/index.tsx b/app/client/src/components/editorComponents/Debugger/index.tsx
index 2e7ebb0fb7..86d987f914 100644
--- a/app/client/src/components/editorComponents/Debugger/index.tsx
+++ b/app/client/src/components/editorComponents/Debugger/index.tsx
@@ -10,15 +10,18 @@ import { showDebugger as showDebuggerAction } from "actions/debuggerActions";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { Colors } from "constants/Colors";
 import { getTypographyByKey } from "constants/DefaultTheme";
+import { Layers } from "constants/Layers";
+import { stopEventPropagation } from "utils/AppsmithUtils";
 
 const Container = styled.div<{ errorCount: number }>`
+  z-index: ${Layers.debugger};
   background-color: ${(props) =>
     props.theme.colors.debugger.floatingButton.background};
   position: fixed;
   right: 20px;
   bottom: 20px;
   cursor: pointer;
-  padding: 19px;
+  padding: ${(props) => props.theme.spaces[6]}px;
   color: ${(props) => props.theme.colors.debugger.floatingButton.color};
   border-radius: 50px;
   box-shadow: ${(props) => props.theme.colors.debugger.floatingButton.shadow};
@@ -33,11 +36,9 @@ const Container = styled.div<{ errorCount: number }>`
 
   .debugger-count {
     color: ${Colors.WHITE};
-    font-size: 14px;
-    font-weight: 500;
     ${(props) => getTypographyByKey(props, "h6")}
-    height: 20px;
-    padding: 6px;
+    height: 16px;
+    padding: ${(props) => props.theme.spaces[1]}px;
     background-color: ${(props) =>
       !!props.errorCount
         ? props.theme.colors.debugger.floatingButton.errorCount
@@ -61,11 +62,12 @@ function Debugger() {
     (state: AppState) => state.ui.debugger.isOpen,
   );
 
-  const onClick = () => {
+  const onClick = (e: any) => {
     AnalyticsUtil.logEvent("OPEN_DEBUGGER", {
       source: "CANVAS",
     });
     dispatch(showDebuggerAction(true));
+    stopEventPropagation(e);
   };
 
   if (!showDebugger)
@@ -75,7 +77,7 @@ function Debugger() {
         errorCount={errorCount}
         onClick={onClick}
       >
-        <Icon name="bug" size={IconSize.XXXL} />
+        <Icon name="bug" size={IconSize.XL} />
         <div className="debugger-count">{errorCount}</div>
       </Container>
     );
diff --git a/app/client/src/components/editorComponents/DragLayerComponent.tsx b/app/client/src/components/editorComponents/DragLayerComponent.tsx
index c9fb4ab1f8..a26bae3b02 100644
--- a/app/client/src/components/editorComponents/DragLayerComponent.tsx
+++ b/app/client/src/components/editorComponents/DragLayerComponent.tsx
@@ -4,11 +4,14 @@ import { useDragLayer, XYCoord } from "react-dnd";
 import DropZone from "./Dropzone";
 import { noCollision, currentDropRow } from "utils/WidgetPropsUtils";
 import { OccupiedSpace } from "constants/editorConstants";
-import { CONTAINER_GRID_PADDING } from "constants/WidgetConstants";
+import {
+  CONTAINER_GRID_PADDING,
+  GridDefaults,
+} from "constants/WidgetConstants";
 import { DropTargetContext } from "./DropTargetComponent";
 import { scrollElementIntoParentCanvasView } from "utils/helpers";
 import { getNearestParentCanvas } from "utils/generators";
-
+const GRID_POINT_SIZE = 1;
 const WrappedDragLayer = styled.div<{
   columnWidth: number;
   rowHeight: number;
@@ -17,22 +20,28 @@ const WrappedDragLayer = styled.div<{
 }>`
   position: absolute;
   pointer-events: none;
-  left: ${(props) => (props.noPad ? "0" : `${CONTAINER_GRID_PADDING}px;`)};
-  top: ${(props) => (props.noPad ? "0" : `${CONTAINER_GRID_PADDING}px;`)};
+  left: ${(props) =>
+    props.noPad ? "0" : `${CONTAINER_GRID_PADDING - GRID_POINT_SIZE}px;`};
+  top: ${(props) =>
+    props.noPad ? "0" : `${CONTAINER_GRID_PADDING - GRID_POINT_SIZE}px;`};
   height: ${(props) =>
-    props.noPad ? `100%` : `calc(100% - ${CONTAINER_GRID_PADDING}px)`};
+    props.noPad
+      ? `100%`
+      : `calc(100% - ${(CONTAINER_GRID_PADDING - GRID_POINT_SIZE) * 2}px)`};
   width: ${(props) =>
-    props.noPad ? `100%` : `calc(100% - ${CONTAINER_GRID_PADDING}px)`};
+    props.noPad
+      ? `100%`
+      : `calc(100% - ${(CONTAINER_GRID_PADDING - GRID_POINT_SIZE) * 2}px)`};
 
   background-image: radial-gradient(
-    circle,
-    ${(props) => props.theme.colors.grid} 1px,
+    circle at ${GRID_POINT_SIZE}px ${GRID_POINT_SIZE}px,
+    ${(props) => props.theme.colors.grid} ${GRID_POINT_SIZE}px,
     transparent 0
   );
-  background-size: ${(props) => props.columnWidth}px
-    ${(props) => props.rowHeight}px;
-  background-position: -${(props) => props.columnWidth / 2}px -${(props) =>
-      props.rowHeight / 2}px;
+  background-size: ${(props) =>
+      props.columnWidth - GRID_POINT_SIZE / GridDefaults.DEFAULT_GRID_COLUMNS}px
+    ${(props) =>
+      props.rowHeight - GRID_POINT_SIZE / GridDefaults.DEFAULT_GRID_COLUMNS}px;
 `;
 
 type DragLayerProps = {
@@ -71,7 +80,7 @@ function DragLayerComponent(props: DragLayerProps) {
     x: 0,
     y: 0,
   });
-  const { isDragging, currentOffset, widget, canDrop } = useDragLayer(
+  const { canDrop, currentOffset, isDragging, widget } = useDragLayer(
     (monitor) => ({
       isDragging: monitor.isDragging(),
       currentOffset: monitor.getSourceClientOffset(),
diff --git a/app/client/src/components/editorComponents/DraggableComponent.tsx b/app/client/src/components/editorComponents/DraggableComponent.tsx
index a5cbe41ed3..19f0b04e9b 100644
--- a/app/client/src/components/editorComponents/DraggableComponent.tsx
+++ b/app/client/src/components/editorComponents/DraggableComponent.tsx
@@ -7,11 +7,12 @@ import { useSelector } from "react-redux";
 import { AppState } from "reducers";
 import { getColorWithOpacity } from "constants/DefaultTheme";
 import {
-  useWidgetSelection,
   useShowPropertyPane,
   useWidgetDragResize,
 } from "utils/hooks/dragResizeHooks";
 import AnalyticsUtil from "utils/AnalyticsUtil";
+import { commentModeSelector } from "selectors/commentsSelectors";
+import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
 
 const DraggableWrapper = styled.div`
   display: block;
@@ -50,8 +51,11 @@ export const canDrag = (
   isResizing: boolean,
   isDraggingDisabled: boolean,
   props: any,
+  isCommentMode: boolean,
 ) => {
-  return !isResizing && !isDraggingDisabled && !props.dragDisabled;
+  return (
+    !isResizing && !isDraggingDisabled && !props?.dragDisabled && !isCommentMode
+  );
 };
 
 function DraggableComponent(props: DraggableComponentProps) {
@@ -59,7 +63,9 @@ function DraggableComponent(props: DraggableComponentProps) {
   const showPropertyPane = useShowPropertyPane();
 
   // Dispatch hook handy to set a widget as focused/selected
-  const { selectWidget, focusWidget } = useWidgetSelection();
+  const { focusWidget, selectWidget } = useWidgetSelection();
+
+  const isCommentMode = useSelector(commentModeSelector);
 
   // Dispatch hook handy to set any `DraggableComponent` as dragging/ not dragging
   // The value is boolean
@@ -68,9 +74,12 @@ function DraggableComponent(props: DraggableComponentProps) {
   // This state tells us which widget is selected
   // The value is the widgetId of the selected widget
   const selectedWidget = useSelector(
-    (state: AppState) => state.ui.widgetDragResize.selectedWidget,
+    (state: AppState) => state.ui.widgetDragResize.lastSelectedWidget,
   );
 
+  const selectedWidgets = useSelector(
+    (state: AppState) => state.ui.widgetDragResize.selectedWidgets,
+  );
   // This state tels us which widget is focused
   // The value is the widgetId of the focused widget.
   const focusedWidget = useSelector(
@@ -135,23 +144,13 @@ function DraggableComponent(props: DraggableComponentProps) {
     },
     canDrag: () => {
       // Dont' allow drag if we're resizing or the drag of `DraggableComponent` is disabled
-      return canDrag(isResizing, isDraggingDisabled, props);
+      return canDrag(isResizing, isDraggingDisabled, props, isCommentMode);
     },
   });
 
   // True when any widget is dragging or resizing, including this one
   const isResizingOrDragging = !!isResizing || !!isDragging;
 
-  // When the draggable is clicked
-  const handleClick = (e: any) => {
-    if (!isResizingOrDragging) {
-      selectWidget &&
-        selectedWidget !== props.widgetId &&
-        selectWidget(props.widgetId);
-    }
-    e.stopPropagation();
-  };
-
   // When mouse is over this draggable
   const handleMouseOver = (e: any) => {
     focusWidget &&
@@ -160,10 +159,12 @@ function DraggableComponent(props: DraggableComponentProps) {
       focusWidget(props.widgetId);
     e.stopPropagation();
   };
-
+  const shouldRenderComponent = !(
+    selectedWidgets.includes(props.widgetId) && isDragging
+  );
   // Display this draggable based on the current drag state
   const style: CSSProperties = {
-    display: isCurrentWidgetDragging ? "none" : "flex",
+    display: isCurrentWidgetDragging ? "none" : "block",
   };
 
   // WidgetBoundaries
@@ -172,6 +173,10 @@ function DraggableComponent(props: DraggableComponentProps) {
       style={{
         opacity:
           isResizingOrDragging && selectedWidget !== props.widgetId ? 1 : 0,
+        position: "absolute",
+        transform: `translate(-50%, -50%)`,
+        top: "50%",
+        left: "50%",
       }}
     />
   );
@@ -183,14 +188,9 @@ function DraggableComponent(props: DraggableComponentProps) {
 
   const className = `${classNameForTesting}`;
 
-  const shouldRenderComponent = !(
-    selectedWidget === props.widgetId && isDragging
-  );
-
   return (
     <DraggableWrapper
       className={className}
-      onClick={handleClick}
       onMouseOver={handleMouseOver}
       ref={drag}
       style={style}
diff --git a/app/client/src/components/editorComponents/DropTargetComponent.tsx b/app/client/src/components/editorComponents/DropTargetComponent.tsx
index c4d6e9c1a6..e62988f788 100644
--- a/app/client/src/components/editorComponents/DropTargetComponent.tsx
+++ b/app/client/src/components/editorComponents/DropTargetComponent.tsx
@@ -28,10 +28,10 @@ import { AppState } from "reducers";
 import { useSelector } from "react-redux";
 import {
   useShowPropertyPane,
-  useWidgetSelection,
   useCanvasSnapRowsUpdateHook,
 } from "utils/hooks/dragResizeHooks";
 import { getOccupiedSpaces } from "selectors/editorSelectors";
+import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
 
 type DropTargetComponentProps = WidgetProps & {
   children?: ReactNode;
@@ -74,7 +74,7 @@ export function DropTargetComponent(props: DropTargetComponentProps) {
   const { updateWidget } = useContext(EditorContext);
   const occupiedSpaces = useSelector(getOccupiedSpaces);
   const selectedWidget = useSelector(
-    (state: AppState) => state.ui.widgetDragResize.selectedWidget,
+    (state: AppState) => state.ui.widgetDragResize.lastSelectedWidget,
   );
   const isResizing = useSelector(
     (state: AppState) => state.ui.widgetDragResize.isResizing,
@@ -99,7 +99,7 @@ export function DropTargetComponent(props: DropTargetComponentProps) {
   const [rows, setRows] = useState(snapRows);
 
   const showPropertyPane = useShowPropertyPane();
-  const { selectWidget, focusWidget } = useWidgetSelection();
+  const { deselectAll, focusWidget, selectWidget } = useWidgetSelection();
   const updateCanvasSnapRows = useCanvasSnapRowsUpdateHook();
 
   useEffect(() => {
@@ -237,12 +237,9 @@ export function DropTargetComponent(props: DropTargetComponentProps) {
   const handleFocus = (e: any) => {
     if (!isResizing && !isDragging) {
       if (!props.parentId) {
-        selectWidget && selectWidget(props.widgetId);
+        deselectAll();
         focusWidget && focusWidget(props.widgetId);
         showPropertyPane && showPropertyPane();
-      } else {
-        selectWidget && selectWidget(props.parentId);
-        focusWidget && focusWidget(props.parentId);
       }
     }
     // commenting this out to allow propagation of click events
@@ -253,13 +250,12 @@ export function DropTargetComponent(props: DropTargetComponentProps) {
     ? `${Math.max(rows * props.snapRowSpace, props.minHeight)}px`
     : "100%";
 
-  const border =
+  const boxShadow =
     (isResizing || isDragging) &&
     isExactlyOver &&
     props.widgetId === MAIN_CONTAINER_WIDGET_ID
-      ? "1px solid #DDDDDD"
-      : "1px solid transparent";
-
+      ? "0px 0px 0px 1px #DDDDDD"
+      : "0px 0px 0px 1px transparent";
   const dropRef = !props.dropDisabled ? drop : undefined;
 
   return (
@@ -272,7 +268,7 @@ export function DropTargetComponent(props: DropTargetComponentProps) {
         ref={dropRef}
         style={{
           height,
-          border,
+          boxShadow,
         }}
       >
         {props.children}
diff --git a/app/client/src/components/editorComponents/Dropzone.tsx b/app/client/src/components/editorComponents/Dropzone.tsx
index 29a83003d3..78cd278b8c 100644
--- a/app/client/src/components/editorComponents/Dropzone.tsx
+++ b/app/client/src/components/editorComponents/Dropzone.tsx
@@ -4,6 +4,7 @@ import styled from "styled-components";
 import { snapToGrid } from "utils/helpers";
 import { IntentColors } from "constants/DefaultTheme";
 import { useSpring, animated, interpolate, config } from "react-spring";
+import { Layers } from "constants/Layers";
 
 const SPRING_CONFIG = {
   ...config.gentle,
@@ -124,6 +125,7 @@ export const DropZone = forwardRef(
           height={props.height * props.parentRowHeight}
           ref={ref}
           style={{
+            zIndex: Layers.animatedDropZone,
             transform: interpolate(
               [X, Y],
               (x: number, y: number) => `translate3d(${x}px,${y}px,0)`,
@@ -135,6 +137,7 @@ export const DropZone = forwardRef(
           candrop={props.canDrop}
           height={props.height * props.parentRowHeight}
           style={{
+            zIndex: Layers.animatedSnappingDropZone,
             transform: interpolate(
               [snappedX, snappedY],
               (x: number, y: number) => `translate3d(${x}px,${y}px,0)`,
diff --git a/app/client/src/components/editorComponents/EditableText.tsx b/app/client/src/components/editorComponents/EditableText.tsx
index b8c2983a02..baa81e42c0 100644
--- a/app/client/src/components/editorComponents/EditableText.tsx
+++ b/app/client/src/components/editorComponents/EditableText.tsx
@@ -92,10 +92,25 @@ const TextContainer = styled.div<{ isValid: boolean; minimal: boolean }>`
 `;
 
 export function EditableText(props: EditableTextProps) {
-  const [isEditing, setIsEditing] = useState(!!props.isEditingDefault);
-  const [value, setStateValue] = useState(props.defaultValue);
+  const {
+    beforeUnmount,
+    className,
+    defaultValue,
+    editInteractionKind,
+    forceDefault,
+    hideEditIcon,
+    isEditingDefault,
+    isInvalid,
+    minimal,
+    onBlur,
+    onTextChanged,
+    placeholder,
+    updating,
+    valueTransform,
+  } = props;
+  const [isEditing, setIsEditing] = useState(!!isEditingDefault);
+  const [value, setStateValue] = useState(defaultValue);
   const inputValRef = useRef("");
-  const { beforeUnmount } = props;
 
   const setValue = useCallback((value) => {
     inputValRef.current = value;
@@ -103,16 +118,16 @@ export function EditableText(props: EditableTextProps) {
   }, []);
 
   useEffect(() => {
-    setValue(props.defaultValue);
-  }, [props.defaultValue]);
+    setValue(defaultValue);
+  }, [defaultValue]);
 
   useEffect(() => {
-    setIsEditing(!!props.isEditingDefault);
-  }, [props.defaultValue, props.isEditingDefault]);
+    setIsEditing(!!isEditingDefault);
+  }, [defaultValue, isEditingDefault]);
 
   useEffect(() => {
-    if (props.forceDefault === true) setValue(props.defaultValue);
-  }, [props.forceDefault, props.defaultValue]);
+    if (forceDefault === true) setValue(defaultValue);
+  }, [forceDefault, defaultValue]);
 
   // at times onTextChange is not fired
   // for example when the modal is closed on clicking the overlay
@@ -128,58 +143,63 @@ export function EditableText(props: EditableTextProps) {
     e.preventDefault();
     e.stopPropagation();
   };
-  const onChange = (_value: string) => {
-    props.onBlur && props.onBlur();
-    const isInvalid = props.isInvalid ? props.isInvalid(_value) : false;
-    if (!isInvalid) {
-      props.onTextChanged(_value);
-      setIsEditing(false);
-    } else {
-      Toaster.show({
-        text: "Invalid name",
-        variant: Variant.danger,
-      });
-    }
-  };
+  const onChange = useCallback(
+    (_value: string) => {
+      onBlur && onBlur();
+      const _isInvalid = isInvalid ? isInvalid(_value) : false;
+      if (!_isInvalid) {
+        onTextChanged(_value);
+        setIsEditing(false);
+      } else {
+        Toaster.show({
+          text: "Invalid name",
+          variant: Variant.danger,
+        });
+      }
+    },
+    [isInvalid],
+  );
 
-  const onInputchange = (_value: string) => {
-    let finalVal: string = _value;
-    if (props.valueTransform) {
-      finalVal = props.valueTransform(_value);
-    }
-    setValue(finalVal);
-  };
+  const onInputchange = useCallback(
+    (_value: string) => {
+      let finalVal: string = _value;
+      if (valueTransform) {
+        finalVal = valueTransform(_value);
+      }
+      setValue(finalVal);
+    },
+    [valueTransform],
+  );
 
-  const errorMessage = props.isInvalid && props.isInvalid(value);
+  const errorMessage = isInvalid && isInvalid(value);
   const error = errorMessage ? errorMessage : undefined;
   return (
     <EditableTextWrapper
       isEditing={isEditing}
-      minimal={!!props.minimal}
+      minimal={!!minimal}
       onClick={
-        props.editInteractionKind === EditInteractionKind.SINGLE ? edit : _.noop
+        editInteractionKind === EditInteractionKind.SINGLE ? edit : _.noop
       }
       onDoubleClick={
-        props.editInteractionKind === EditInteractionKind.DOUBLE ? edit : _.noop
+        editInteractionKind === EditInteractionKind.DOUBLE ? edit : _.noop
       }
     >
       <ErrorTooltip isOpen={!!error} message={errorMessage as string}>
-        <TextContainer isValid={!error} minimal={!!props.minimal}>
+        <TextContainer isValid={!error} minimal={!!minimal}>
           <BlueprintEditableText
-            className={props.className}
+            className={className}
             disabled={!isEditing}
             isEditing={isEditing}
-            onCancel={props.onBlur}
+            onCancel={onBlur}
             onChange={onInputchange}
             onConfirm={onChange}
-            placeholder={props.placeholder}
+            placeholder={placeholder}
             selectAllOnFocus
             value={value}
           />
-          {!props.minimal &&
-            !props.hideEditIcon &&
-            !props.updating &&
-            !isEditing && <EditPen alt="Edit pen" src={Edit} />}
+          {!minimal && !hideEditIcon && !updating && !isEditing && (
+            <EditPen alt="Edit pen" src={Edit} />
+          )}
         </TextContainer>
       </ErrorTooltip>
     </EditableTextWrapper>
diff --git a/app/client/src/components/editorComponents/EditorContextProvider.tsx b/app/client/src/components/editorComponents/EditorContextProvider.tsx
index b2dd17cc84..028b03ae9f 100644
--- a/app/client/src/components/editorComponents/EditorContextProvider.tsx
+++ b/app/client/src/components/editorComponents/EditorContextProvider.tsx
@@ -1,4 +1,4 @@
-import React, { Context, createContext, ReactNode } from "react";
+import React, { Context, createContext, ReactNode, useMemo } from "react";
 import { connect } from "react-redux";
 
 import { WidgetOperation } from "widgets/BaseWidget";
@@ -55,76 +55,68 @@ type EditorContextProviderProps = EditorContextType & {
 
 function EditorContextProvider(props: EditorContextProviderProps) {
   const {
-    executeAction,
-    updateWidget,
-    updateWidgetProperty,
-    updateWidgetMetaProperty,
-    disableDrag,
-    children,
-    resetChildrenMetaProperty,
-    deleteWidgetProperty,
     batchUpdateWidgetProperty,
+    children,
+    deleteWidgetProperty,
+    disableDrag,
+    executeAction,
+    resetChildrenMetaProperty,
+    updateWidget,
+    updateWidgetMetaProperty,
+    updateWidgetProperty,
   } = props;
+
+  // Memoize the context provider to prevent
+  // unnecessary renders
+  const contextValue = useMemo(
+    () => ({
+      executeAction,
+      updateWidget,
+      updateWidgetProperty,
+      updateWidgetMetaProperty,
+      disableDrag,
+      resetChildrenMetaProperty,
+      deleteWidgetProperty,
+      batchUpdateWidgetProperty,
+    }),
+    [
+      executeAction,
+      updateWidget,
+      updateWidgetProperty,
+      updateWidgetMetaProperty,
+      disableDrag,
+      resetChildrenMetaProperty,
+      deleteWidgetProperty,
+      batchUpdateWidgetProperty,
+    ],
+  );
   return (
-    <EditorContext.Provider
-      value={{
-        executeAction,
-        updateWidget,
-        updateWidgetProperty,
-        updateWidgetMetaProperty,
-        disableDrag,
-        resetChildrenMetaProperty,
-        deleteWidgetProperty,
-        batchUpdateWidgetProperty,
-      }}
-    >
+    <EditorContext.Provider value={contextValue}>
       {children}
     </EditorContext.Provider>
   );
 }
 
-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    updateWidgetProperty: (
-      widgetId: string,
-      propertyName: string,
-      propertyValue: any,
-    ) =>
-      dispatch(
-        updateWidgetPropertyRequest(
-          widgetId,
-          propertyName,
-          propertyValue,
-          RenderModes.CANVAS,
-        ),
-      ),
-    executeAction: (actionPayload: ExecuteActionPayload) =>
-      dispatch(executeAction(actionPayload)),
-    updateWidget: (
-      operation: WidgetOperation,
-      widgetId: string,
-      payload: any,
-    ) => dispatch(updateWidget(operation, widgetId, payload)),
-    updateWidgetMetaProperty: (
-      widgetId: string,
-      propertyName: string,
-      propertyValue: any,
-    ) =>
-      dispatch(updateWidgetMetaProperty(widgetId, propertyName, propertyValue)),
-    resetChildrenMetaProperty: (widgetId: string) =>
-      dispatch(resetChildrenMetaProperty(widgetId)),
-    disableDrag: (disable: boolean) => {
-      dispatch(disableDragAction(disable));
-    },
-    deleteWidgetProperty: (widgetId: string, propertyPaths: string[]) =>
-      dispatch(deletePropertyAction(widgetId, propertyPaths)),
-    batchUpdateWidgetProperty: (
-      widgetId: string,
-      updates: BatchPropertyUpdatePayload,
-    ) => {
-      dispatch(batchUpdatePropertyAction(widgetId, updates));
-    },
-  };
+const mapDispatchToProps = {
+  updateWidgetProperty: (
+    widgetId: string,
+    propertyName: string,
+    propertyValue: any,
+  ) =>
+    updateWidgetPropertyRequest(
+      widgetId,
+      propertyName,
+      propertyValue,
+      RenderModes.CANVAS,
+    ),
+
+  executeAction,
+  updateWidget,
+  updateWidgetMetaProperty,
+  resetChildrenMetaProperty,
+  disableDrag: disableDragAction,
+  deleteWidgetProperty: deletePropertyAction,
+  batchUpdateWidgetProperty: batchUpdatePropertyAction,
 };
 
 export default connect(null, mapDispatchToProps)(EditorContextProvider);
diff --git a/app/client/src/components/editorComponents/EntityNameComponent.tsx b/app/client/src/components/editorComponents/EntityNameComponent.tsx
index a664c78f94..e2e6654039 100644
--- a/app/client/src/components/editorComponents/EntityNameComponent.tsx
+++ b/app/client/src/components/editorComponents/EntityNameComponent.tsx
@@ -127,10 +127,10 @@ class EntityNameComponent extends React.Component<
     const { focused } = this.state;
     const {
       isValid,
+      onChange,
+      placeholder,
       validationMessage,
       value,
-      placeholder,
-      onChange,
     } = this.props;
 
     return (
diff --git a/app/client/src/components/editorComponents/GlobalSearch/ActionLink.tsx b/app/client/src/components/editorComponents/GlobalSearch/ActionLink.tsx
index 2e6d4c1a10..8b3c590ed5 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/ActionLink.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/ActionLink.tsx
@@ -13,9 +13,9 @@ export const StyledActionLink = styled.span<{ isActiveItem?: boolean }>`
 
 export const ActionLink = withTheme(
   ({
+    isActiveItem,
     item,
     theme,
-    isActiveItem,
   }: {
     item: SearchItem;
     theme: Theme;
diff --git a/app/client/src/components/editorComponents/GlobalSearch/AlgoliaSearchWrapper.tsx b/app/client/src/components/editorComponents/GlobalSearch/AlgoliaSearchWrapper.tsx
index 9425debd85..7dd45b584e 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/AlgoliaSearchWrapper.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/AlgoliaSearchWrapper.tsx
@@ -12,7 +12,7 @@ type SearchProps = {
   children: React.ReactNode;
 };
 
-function Search({ query, children }: SearchProps) {
+function Search({ children, query }: SearchProps) {
   const [queryInState, setQueryInState] = useState(query);
   const debouncedSetQueryInState = useCallback(
     debounce(setQueryInState, 100),
diff --git a/app/client/src/components/editorComponents/GlobalSearch/Description.tsx b/app/client/src/components/editorComponents/GlobalSearch/Description.tsx
index e9af253255..cae754bb9e 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/Description.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/Description.tsx
@@ -1,8 +1,8 @@
-import React, { useCallback, useEffect } from "react";
+import React, { useEffect } from "react";
 import styled from "styled-components";
 import ActionLink from "./ActionLink";
 import Highlight from "./Highlight";
-import { getItemTitle, SEARCH_ITEM_TYPES } from "./utils";
+import { algoliaHighlightTag, getItemTitle, SEARCH_ITEM_TYPES } from "./utils";
 import { getTypographyByKey } from "constants/DefaultTheme";
 import { SearchItem } from "./utils";
 import parseDocumentationContent from "./parseDocumentationContent";
@@ -74,27 +74,57 @@ const Container = styled.div`
   }
 `;
 
-const DocumentationDescription = ({ item }: { item: SearchItem }) => {
-  try {
-    const {
-      _highlightResult: {
-        document: { value: rawDocument },
-        title: { value: rawTitle },
-      },
-    } = item;
-    const content = parseDocumentationContent({
-      rawDocument: rawDocument,
-      rawTitle: rawTitle,
-      path: item.path,
-    });
+function DocumentationDescription({
+  item,
+  query,
+}: {
+  item: SearchItem;
+  query: string;
+}) {
+  const {
+    _highlightResult: {
+      document: { value: rawDocument },
+      title: { value: rawTitle },
+    },
+  } = item;
+  const content = parseDocumentationContent({
+    rawDocument: rawDocument,
+    rawTitle: rawTitle,
+    path: item.path,
+    query,
+  });
+  const containerRef = React.useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    scrollToMatchedValue();
+  }, [content]);
 
-    return content ? (
-      <div dangerouslySetInnerHTML={{ __html: content }} />
-    ) : null;
-  } catch (e) {
-    return null;
-  }
-};
+  const scrollToMatchedValue = () => {
+    const root = containerRef.current;
+    if (!root) return;
+    const list = root.getElementsByTagName(algoliaHighlightTag);
+    if (list.length) {
+      const bestMatch = Array.from(list).reduce((accumulator, currentValue) => {
+        if (
+          currentValue.textContent &&
+          accumulator.textContent &&
+          currentValue.textContent.length > accumulator.textContent.length
+        )
+          return currentValue;
+        return accumulator;
+      }, list[0]);
+
+      bestMatch.scrollIntoView();
+    } else {
+      setTimeout(() => {
+        root.firstElementChild?.scrollIntoView();
+      }, 0);
+    }
+  };
+
+  return content ? (
+    <div dangerouslySetInnerHTML={{ __html: content }} ref={containerRef} />
+  ) : null;
+}
 
 const StyledHitEnterMessageContainer = styled.div`
   background: ${(props) =>
@@ -142,28 +172,12 @@ const descriptionByType = {
 
 function Description(props: Props) {
   const { activeItem, activeItemType } = props;
-  const containerRef = React.useRef<HTMLDivElement>(null);
-
-  const onScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
-    if (
-      props.scrollPositionRef?.current ||
-      props.scrollPositionRef?.current === 0
-    ) {
-      props.scrollPositionRef.current = (e.target as HTMLDivElement).scrollTop;
-    }
-  }, []);
-
-  useEffect(() => {
-    if (containerRef.current) {
-      containerRef.current.scrollTop = props.scrollPositionRef?.current;
-    }
-  }, [containerRef.current, activeItem]);
 
   if (!activeItemType || !activeItem) return null;
   const Component = descriptionByType[activeItemType];
 
   return (
-    <Container onScroll={onScroll} ref={containerRef}>
+    <Container>
       <Component item={activeItem} query={props.query} />
     </Container>
   );
diff --git a/app/client/src/components/editorComponents/GlobalSearch/Footer.tsx b/app/client/src/components/editorComponents/GlobalSearch/Footer.tsx
new file mode 100644
index 0000000000..ad5dfb33b4
--- /dev/null
+++ b/app/client/src/components/editorComponents/GlobalSearch/Footer.tsx
@@ -0,0 +1,49 @@
+import React from "react";
+import styled from "styled-components";
+
+const Wrapper = styled.div`
+  span {
+    color: white;
+    font-variant: all-small-caps;
+    font-size: ${(props) => props.theme.fontSizes[2]}px;
+    margin-right: ${(props) => props.theme.spaces[1]}px;
+  }
+  div {
+    margin-right: ${(props) => props.theme.spaces[7]}px;
+    font-size: ${(props) => props.theme.fontSizes[2]}px;
+    text-align: center;
+  }
+  color: ${(props) => props.theme.colors.globalSearch.searchItemText};
+  padding: ${(props) => props.theme.spaces[1]}px
+    ${(props) => props.theme.spaces[6]}px;
+  display: flex;
+  flex-direction: row;
+`;
+
+const FOOTER_INFO = [
+  {
+    action: "\u2191\u2193",
+    description: "Select",
+  },
+  {
+    action: "ENTER",
+    description: "Open",
+  },
+];
+
+function Footer() {
+  return (
+    <Wrapper>
+      {FOOTER_INFO.map((info) => {
+        return (
+          <div key={info.action}>
+            <span>{info.action}</span>
+            {info.description}
+          </div>
+        );
+      })}
+    </Wrapper>
+  );
+}
+
+export default Footer;
diff --git a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHotKeys.tsx b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHotKeys.tsx
index 43686d95ce..fd79706b8a 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHotKeys.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHotKeys.tsx
@@ -53,7 +53,7 @@ class GlobalSearchHotKeys extends React.Component<Props> {
     return (
       <Hotkeys>
         {this.hotKeysConfig.map(
-          ({ combo, onKeyDown, allowInInput, label, group }, index) => (
+          ({ allowInInput, combo, group, label, onKeyDown }, index) => (
             <Hotkey
               allowInInput={allowInInput}
               combo={combo}
diff --git a/app/client/src/components/editorComponents/GlobalSearch/Highlight.tsx b/app/client/src/components/editorComponents/GlobalSearch/Highlight.tsx
index ebcdea9e13..091ca4f0ba 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/Highlight.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/Highlight.tsx
@@ -1,15 +1,23 @@
 import React from "react";
 
-function Highlight({ match, text }: { match: string; text: string }) {
-  if (!match) return <span>{text}</span>;
+function Highlight({
+  className,
+  match,
+  text,
+}: {
+  className?: string;
+  match: string;
+  text: string;
+}) {
+  if (!match) return <span className={className}>{text}</span>;
 
   const regEx = new RegExp(match, "ig");
   const parts = text?.split(regEx);
-  if (parts?.length === 1) return <span>{text}</span>;
+  if (parts?.length === 1) return <span className={className}>{text}</span>;
   let lastIndex = 0;
 
   return (
-    <span>
+    <span className={className}>
       {parts?.map((part, index) => {
         lastIndex += Math.max(part.length, 0);
         const result = (
diff --git a/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx b/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx
index f1af2aa4fc..84766c4720 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx
@@ -4,6 +4,7 @@ import NoSearchDataImage from "assets/images/no_search_data.png";
 import { NO_SEARCH_DATA_TEXT } from "constants/messages";
 import { getTypographyByKey } from "constants/DefaultTheme";
 import { ReactComponent as DiscordIcon } from "assets/icons/help/discord.svg";
+import AnalyticsUtil from "utils/AnalyticsUtil";
 
 const Container = styled.div`
   display: flex;
@@ -49,6 +50,7 @@ function ResultsNotFound() {
           className="discord-link"
           onClick={() => {
             window.open("https://discord.gg/rBTTVJp", "_blank");
+            AnalyticsUtil.logEvent("DISCORD_LINK_CLICK");
           }}
         >
           <StyledDiscordIcon color="red" height={22} width={24} />
diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx
index bc2afc5b01..7ac95ec680 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx
@@ -26,7 +26,7 @@ type Props = {
   children: React.ReactNode;
 };
 
-function DocsSearchModal({ modalOpen, toggleShow, children }: Props) {
+function DocsSearchModal({ children, modalOpen, toggleShow }: Props) {
   return (
     <StyledDocsSearchModal>
       <Overlay
diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx
index 5972603e91..5c7d32c28c 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useContext, useMemo } from "react";
 import { useSelector } from "react-redux";
 import { Highlight as AlgoliaHighlight } from "react-instantsearch-dom";
 import { Hit as IHit } from "react-instantsearch-core";
-import styled from "styled-components";
+import styled, { css } from "styled-components";
 import { getTypographyByKey } from "constants/DefaultTheme";
 import Highlight from "./Highlight";
 import ActionLink, { StyledActionLink } from "./ActionLink";
@@ -19,15 +19,23 @@ import {
   getPluginIcon,
   homePageIcon,
   pageIcon,
+  apiIcon,
 } from "pages/Editor/Explorer/ExplorerIcons";
 import { HelpIcons } from "icons/HelpIcons";
 import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
 import { AppState } from "reducers";
 import { keyBy, noop } from "lodash";
 import { getPageList } from "selectors/editorSelectors";
+import { PluginType } from "entities/Action";
 
 const DocumentIcon = HelpIcons.DOCUMENT;
 
+const overflowCSS = css`
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+`;
+
 export const SearchItemContainer = styled.div<{
   isActiveItem: boolean;
   itemType: SEARCH_ITEM_TYPES;
@@ -50,6 +58,20 @@ export const SearchItemContainer = styled.div<{
       ? props.theme.colors.globalSearch.activeSearchItemBackground
       : "unset"};
 
+  .text {
+    max-width: 100px;
+    ${overflowCSS}
+  }
+
+  .subtext {
+    color: ${(props) => props.theme.colors.globalSearch.searchItemSubText};
+    font-size: ${(props) => props.theme.fontSizes[1]}px;
+    margin-right: ${(props) => `${props.theme.spaces[2]}px`};
+    display: ${(props) => (props.isActiveItem ? "inline" : "none")};
+    max-width: 50px;
+    ${overflowCSS}
+  }
+
   &:hover {
     background-color: ${(props) =>
       props.itemType !== SEARCH_ITEM_TYPES.sectionTitle &&
@@ -59,6 +81,10 @@ export const SearchItemContainer = styled.div<{
     ${StyledActionLink} {
       visibility: visible;
     }
+
+    .subtext {
+      display: inline;
+    }
   }
 
   ${(props) => getTypographyByKey(props, "p3")};
@@ -90,6 +116,12 @@ const StyledDocumentIcon = styled(DocumentIcon)`
   display: flex;
 `;
 
+const TextWrapper = styled.div`
+  flex: 1;
+  display: flex;
+  justify-content: space-between;
+`;
+
 function DocumentationItem(props: { item: SearchItem; isActiveItem: boolean }) {
   return (
     <>
@@ -122,17 +154,20 @@ function WidgetItem(props: {
   item: SearchItem;
   isActiveItem: boolean;
 }) {
-  const { query, item } = props;
+  const { item, query } = props;
   const { type } = item || {};
-  let title = getItemTitle(item);
+  const title = getItemTitle(item);
   const pageName = usePageName(item.pageId);
-  title = `${title} / ${pageName}`;
+  const subText = `${pageName}`;
 
   return (
     <>
       <WidgetIconWrapper>{getWidgetIcon(type)}</WidgetIconWrapper>
       <ItemTitle>
-        <Highlight match={query} text={title} />
+        <TextWrapper>
+          <Highlight className="text" match={query} text={title} />
+          <Highlight className="subtext" match={query} text={subText} />
+        </TextWrapper>
         <ActionLink isActiveItem={props.isActiveItem} item={props.item} />
       </ItemTitle>
     </>
@@ -158,20 +193,26 @@ function ActionItem(props: {
     return state.entities.plugins.list;
   });
   const pluginGroups = useMemo(() => keyBy(plugins, "id"), [plugins]);
-  const icon = getActionConfig(pluginType)?.getIcon(
-    item.config,
-    pluginGroups[item.config.datasource.pluginId],
-  );
+  const icon =
+    pluginType === PluginType.API
+      ? apiIcon
+      : getActionConfig(pluginType)?.getIcon(
+          item.config,
+          pluginGroups[item.config.datasource.pluginId],
+        );
 
-  let title = getItemTitle(item);
+  const title = getItemTitle(item);
   const pageName = usePageName(config.pageId);
-  title = `${title} / ${pageName}`;
+  const subText = `${pageName}`;
 
   return (
     <>
       <ActionIconWrapper>{icon}</ActionIconWrapper>
       <ItemTitle>
-        <Highlight match={query} text={title} />
+        <TextWrapper>
+          <Highlight className="text" match={query} text={title} />
+          <Highlight className="subtext" match={query} text={subText} />
+        </TextWrapper>
         <ActionLink isActiveItem={props.isActiveItem} item={props.item} />
       </ItemTitle>
     </>
@@ -206,7 +247,7 @@ function PageItem(props: {
   item: SearchItem;
   isActiveItem: boolean;
 }) {
-  const { query, item } = props;
+  const { item, query } = props;
   const title = getItemTitle(item);
   const icon = item.isDefault ? homePageIcon : pageIcon;
 
@@ -265,7 +306,7 @@ type ItemProps = {
 };
 
 function SearchItemComponent(props: ItemProps) {
-  const { item, index, query } = props;
+  const { index, item, query } = props;
   const itemRef = useRef<HTMLDivElement>(null);
   const searchContext = useContext(SearchContext);
   const activeItemIndex = searchContext?.activeItemIndex;
@@ -293,9 +334,7 @@ function SearchItemComponent(props: ItemProps) {
           itemType !== SEARCH_ITEM_TYPES.placeholder
         ) {
           setActiveItemIndex(index);
-          if (itemType !== SEARCH_ITEM_TYPES.document) {
-            searchContext?.handleItemLinkClick(item, "SEARCH_ITEM");
-          }
+          searchContext?.handleItemLinkClick(item, "SEARCH_ITEM");
         }
       }}
       ref={itemRef}
@@ -312,8 +351,8 @@ const SearchResultsContainer = styled.div`
 `;
 
 function SearchResults({
-  searchResults,
   query,
+  searchResults,
 }: {
   searchResults: SearchItem[];
   query: string;
diff --git a/app/client/src/components/editorComponents/GlobalSearch/index.tsx b/app/client/src/components/editorComponents/GlobalSearch/index.tsx
index 735efbdefa..648b2d2a5d 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/index.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/index.tsx
@@ -20,7 +20,7 @@ import SearchContext from "./GlobalSearchContext";
 import Description from "./Description";
 import ResultsNotFound from "./ResultsNotFound";
 import { getActions, getAllPageWidgets } from "selectors/entitiesSelector";
-import { useNavigateToWidget } from "pages/Editor/Explorer/Widgets/WidgetEntity";
+import { useNavigateToWidget } from "pages/Editor/Explorer/Widgets/useNavigateToWidget";
 import {
   toggleShowGlobalSearchModal,
   setGlobalSearchQuery,
@@ -46,6 +46,9 @@ import { keyBy, noop } from "lodash";
 import EntitiesIcon from "assets/icons/ads/entities.svg";
 import DocsIcon from "assets/icons/ads/docs.svg";
 import RecentIcon from "assets/icons/ads/recent.svg";
+import Footer from "./Footer";
+
+import { getCurrentPageId } from "selectors/editorSelectors";
 
 const StyledContainer = styled.div`
   width: 750px;
@@ -63,12 +66,8 @@ const StyledContainer = styled.div`
   ${algoliaHighlightTag},
   & .ais-Highlight-highlighted,
   & .search-highlighted {
-    background: unset;
-    color: ${(props) => props.theme.colors.globalSearch.searchItemHighlight};
+    background-color: #6287b0;
     font-style: normal;
-    text-decoration: underline;
-    text-decoration-color: ${(props) =>
-      props.theme.colors.globalSearch.highlightedTextUnderline};
   }
 `;
 
@@ -92,7 +91,35 @@ const getSectionTitle = (title: string, icon: any) => ({
   icon,
 });
 
+const getIsInCurrentPage = (
+  isWidget: boolean,
+  entity: any,
+  currentPageId?: string,
+) =>
+  isWidget
+    ? entity.pageId === currentPageId
+    : entity?.config?.pageId === currentPageId;
+
+const sortActionsAndWidgets = (a: any, b: any, currentPageId?: string) => {
+  const isAWidget = !!a.widgetId;
+  const isBWidget = !!b.widgetId;
+
+  const aInCurrentPage = getIsInCurrentPage(isAWidget, a, currentPageId);
+  const bInCurrentPage = getIsInCurrentPage(isBWidget, b, currentPageId);
+
+  // page entites on top
+  if (aInCurrentPage && !bInCurrentPage) return -1;
+  if (!aInCurrentPage && bInCurrentPage) return 1;
+
+  // actions before widgets
+  if (isAWidget && !isBWidget) return 1;
+  if (!isAWidget && isBWidget) return -1;
+
+  return 0;
+};
+
 function GlobalSearch() {
+  const currentPageId = useSelector(getCurrentPageId);
   const modalOpen = useSelector(isModalOpenSelector);
   const defaultDocs = useDefaultDocumentationResults(modalOpen);
   const params = useParams<ExplorerURLParams>();
@@ -166,13 +193,18 @@ function GlobalSearch() {
       setQuery(resetSearchQuery);
     } else {
       dispatch(setGlobalSearchQuery(""));
-      if (!query) setActiveItemIndex(1);
+      if (!query)
+        recentEntities.length > 1
+          ? setActiveItemIndex(2)
+          : setActiveItemIndex(1);
     }
   }, [modalOpen]);
 
   useEffect(() => {
-    setActiveItemIndex(1);
-  }, [query]);
+    !query && recentEntities.length > 1
+      ? setActiveItemIndex(2)
+      : setActiveItemIndex(1);
+  }, [query, recentEntities.length]);
 
   const filteredWidgets = useMemo(() => {
     if (!query) return searchableWidgets;
@@ -208,7 +240,7 @@ function GlobalSearch() {
     );
   }, [pages, query]);
 
-  const recentsSectionTitle = getSectionTitle("Recents", RecentIcon);
+  const recentsSectionTitle = getSectionTitle("Recent Entities", RecentIcon);
   const docsSectionTitle = getSectionTitle("Documentation Links", DocsIcon);
   const entitiesSectionTitle = getSectionTitle("Entities", EntitiesIcon);
 
@@ -231,11 +263,15 @@ function GlobalSearch() {
 
     const results = [];
 
+    const actionsAndWidgetsSorted = [
+      ...filteredActions,
+      ...filteredWidgets,
+    ].sort((a, b) => sortActionsAndWidgets(a, b, currentPageId));
+
     const entities = [
       entitiesSectionTitle,
+      ...actionsAndWidgetsSorted,
       ...filteredPages,
-      ...filteredWidgets,
-      ...filteredActions,
       ...filteredDatasources,
     ];
 
@@ -313,9 +349,14 @@ function GlobalSearch() {
 
   const handleActionClick = (item: SearchItem) => {
     const { config } = item;
-    const { pageId, pluginType, id } = config;
+    const { id, pageId, pluginType } = config;
     const actionConfig = getActionConfig(pluginType);
-    const url = actionConfig?.getURL(params.applicationId, pageId, id);
+    const url = actionConfig?.getURL(
+      params.applicationId,
+      pageId,
+      id,
+      pluginType,
+    );
     toggleShow();
     url && history.push(url);
   };
@@ -401,6 +442,7 @@ function GlobalSearch() {
                   <ResultsNotFound />
                 )}
               </div>
+              {!query && <Footer />}
             </StyledContainer>
           </AlgoliaSearchWrapper>
         </SearchModal>
diff --git a/app/client/src/components/editorComponents/GlobalSearch/parseDocumentationContent.test.ts b/app/client/src/components/editorComponents/GlobalSearch/parseDocumentationContent.test.ts
index bc7fa299e8..2f1e3be00f 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/parseDocumentationContent.test.ts
+++ b/app/client/src/components/editorComponents/GlobalSearch/parseDocumentationContent.test.ts
@@ -37,6 +37,7 @@ describe("parseDocumentationContent", () => {
       rawTitle: sampleTitleResponse,
       rawDocument: sampleDocumentResponse,
       path: "master/security",
+      query: "Security",
     };
     const result = parseDocumentationContent(sampleItem);
     expect(result).toStrictEqual(expectedResult);
diff --git a/app/client/src/components/editorComponents/GlobalSearch/parseDocumentationContent.ts b/app/client/src/components/editorComponents/GlobalSearch/parseDocumentationContent.ts
index 43e2dccf6c..7a83e3ba2c 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/parseDocumentationContent.ts
+++ b/app/client/src/components/editorComponents/GlobalSearch/parseDocumentationContent.ts
@@ -1,6 +1,7 @@
 import marked from "marked";
 import { HelpBaseURL } from "constants/HelpConstants";
 import { algoliaHighlightTag } from "./utils";
+import log from "loglevel";
 
 /**
  * @param {String} HTML representing a single element
@@ -39,7 +40,7 @@ const getDocumentationCTA = (path: any) => {
  * Append open documentation button to title
  */
 const updateDocumentDescriptionTitle = (documentObj: any, item: any) => {
-  const { rawTitle, path } = item;
+  const { path, rawTitle } = item;
 
   Array.from(documentObj.querySelectorAll("h1")).forEach((match: any) => {
     match.outerHTML = `<h2>${match.innerHTML}</h2>`;
@@ -66,9 +67,29 @@ const updateDocumentDescriptionTitle = (documentObj: any, item: any) => {
     // append documentation button after title:
     const ctaElement = getDocumentationCTA(path) as Node;
     firstChild.appendChild(ctaElement);
+
+    removeBadHighlights(firstChild, item.query);
   }
 };
 
+// Remove highlights if they don't match well
+const removeBadHighlights = (node: HTMLElement | Document, query: string) => {
+  Array.from(
+    node.querySelectorAll(algoliaHighlightTag) as NodeListOf<HTMLElement>,
+  ).forEach((match) => {
+    // If the length of the highlighted node is less than the 1/2 length of
+    // the query we remove the highlighted tag.
+    // E.g query: "store any" won't highlight "any" nodes
+    if (
+      match.textContent &&
+      match.textContent.length < Math.floor(query.length / 2)
+    ) {
+      const innerHtml = match.innerHTML;
+      match.replaceWith(innerHtml);
+    }
+  });
+};
+
 const replaceHintTagsWithCode = (text: string) => {
   let result = text.replace(/{% hint .*?%}/, "```");
   result = result.replace(/{% endhint .*?%}/, "```");
@@ -78,10 +99,14 @@ const replaceHintTagsWithCode = (text: string) => {
 
 const parseDocumentationContent = (item: any): string | undefined => {
   try {
-    const { rawDocument } = item;
+    const { query, rawDocument } = item;
     let value = rawDocument;
     if (!value) return;
 
+    const aisTag = new RegExp(
+      `&lt;${algoliaHighlightTag}&gt;|&lt;/${algoliaHighlightTag}&gt;`,
+      "g",
+    );
     value = stripMarkdown(value);
     value = replaceHintTagsWithCode(value);
 
@@ -91,10 +116,7 @@ const parseDocumentationContent = (item: any): string | undefined => {
     const documentObj = domparser.parseFromString(parsedDocument, "text/html");
 
     // remove algolia highlight within code sections
-    const aisTag = new RegExp(
-      `&lt;${algoliaHighlightTag}&gt;|&lt;/${algoliaHighlightTag}&gt;`,
-      "g",
-    );
+
     Array.from(documentObj.querySelectorAll("code")).forEach((match) => {
       match.innerHTML = match.innerHTML.replace(aisTag, "");
     });
@@ -117,13 +139,80 @@ const parseDocumentationContent = (item: any): string | undefined => {
       } catch (e) {}
     });
 
+    // Combine adjacent highlighted nodes into a single one
+    let adjacentMatches: string[] = [];
+    const letterRegex = /[a-zA-Z]/g;
+    // Get highlighted tags
+    Array.from(documentObj.querySelectorAll(algoliaHighlightTag)).forEach(
+      (match) => {
+        // If adjacent element is an `algoliaHighlightTag` and the next
+        // text content does not include a letter
+        if (
+          match.nextSibling?.textContent &&
+          !letterRegex.test(match.nextSibling?.textContent) &&
+          match.nextElementSibling?.nodeName.toLowerCase() ===
+            algoliaHighlightTag &&
+          !adjacentMatches.length &&
+          match.textContent
+        ) {
+          // Store the matched word and the text content
+          adjacentMatches = adjacentMatches.concat([
+            match.textContent,
+            match.nextSibling?.textContent,
+          ]);
+          // Remove the text node as we have stored this above
+          match.nextSibling.remove();
+          // Remove the node as we have it's text content
+          match.remove();
+        }
+        // If this is part of a group of highligted words
+        else if (adjacentMatches.length && match.textContent) {
+          // store it's text content
+          adjacentMatches.push(match.textContent);
+
+          // If there are more adjacent highlight nodes ahead
+          if (
+            match.nextElementSibling?.nodeName.toLowerCase() ===
+              algoliaHighlightTag &&
+            match.nextSibling?.textContent &&
+            !letterRegex.test(match.nextSibling?.textContent)
+          ) {
+            // store the text content
+            adjacentMatches.push(match.nextSibling?.textContent);
+            match.nextSibling.remove();
+            // delete the node
+            match.remove();
+          }
+          // We are at the last node of the group
+          else {
+            // Create a algoliaHighlightTag element and add the
+            // grouped text
+            const highlightTag = document.createElement(algoliaHighlightTag);
+            highlightTag.innerText = adjacentMatches.join("");
+
+            // Simply replace(or remove) the last node with the
+            // newly created algoliaHighlightTag
+            match.replaceWith(highlightTag);
+            // Reset
+            adjacentMatches = [];
+          }
+        } else {
+          // Reset adjacentMatches. We are no longer part of a group of adjacent nodes.
+          // Start afresh
+          adjacentMatches = [];
+        }
+      },
+    );
+
+    // Remove highlight for nodes that don't match well
+    removeBadHighlights(documentObj, query);
     // update description title
     updateDocumentDescriptionTitle(documentObj, item);
 
     const content = strip(documentObj.body.innerHTML).trim();
     return content;
   } catch (e) {
-    console.log(e, "err");
+    log.error(e);
     return;
   }
 };
diff --git a/app/client/src/components/editorComponents/GlobalSearch/useRecentEntities.tsx b/app/client/src/components/editorComponents/GlobalSearch/useRecentEntities.tsx
index a2957bf538..7943051a54 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/useRecentEntities.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/useRecentEntities.tsx
@@ -18,9 +18,9 @@ const useResentEntities = () => {
 
   const pages = useSelector(getPageList) || [];
 
-  const populatedRecentEntities = recentEntities
+  const populatedRecentEntities = (recentEntities || [])
     .map((entity) => {
-      const { type, id, params } = entity;
+      const { id, params, type } = entity;
       if (type === "page") {
         const result = pages.find((page) => page.pageId === id);
         if (result) {
diff --git a/app/client/src/components/editorComponents/NavBarItem.tsx b/app/client/src/components/editorComponents/NavBarItem.tsx
index 54a556063c..7e1ad0c060 100644
--- a/app/client/src/components/editorComponents/NavBarItem.tsx
+++ b/app/client/src/components/editorComponents/NavBarItem.tsx
@@ -77,14 +77,14 @@ const ItemContainer = styled.div`
 class NavBarItem extends React.Component<Props> {
   render(): React.ReactNode {
     const {
-      title,
-      icon,
-      path,
       exact,
-      width,
       height,
-      onClick,
+      icon,
       isActive,
+      onClick,
+      path,
+      title,
+      width,
     } = this.props;
 
     return (
diff --git a/app/client/src/components/editorComponents/PaneWrapper.tsx b/app/client/src/components/editorComponents/PaneWrapper.tsx
index e238bc5120..7a84236223 100644
--- a/app/client/src/components/editorComponents/PaneWrapper.tsx
+++ b/app/client/src/components/editorComponents/PaneWrapper.tsx
@@ -4,7 +4,6 @@ export default styled.div`
   background-color: ${(props) => props.theme.colors.propertyPane.bg};
   border-radius: ${(props) => props.theme.radii[0]}px;
   box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.2), 0px 2px 10px rgba(0, 0, 0, 0.1);
-  padding: 24px 16px;
   color: ${(props) => props.theme.colors.textOnDarkBG};
   text-transform: capitalize;
 `;
diff --git a/app/client/src/components/editorComponents/PreventInteractionsOverlay.tsx b/app/client/src/components/editorComponents/PreventInteractionsOverlay.tsx
index c92e7ae5dd..345632ce35 100644
--- a/app/client/src/components/editorComponents/PreventInteractionsOverlay.tsx
+++ b/app/client/src/components/editorComponents/PreventInteractionsOverlay.tsx
@@ -15,6 +15,10 @@ const Container = styled.div`
   width: 100%;
   height: 100%;
   position: relative;
+
+  > div {
+    height: 100%;
+  }
 `;
 
 type Props = {
diff --git a/app/client/src/components/editorComponents/ResizableComponent.tsx b/app/client/src/components/editorComponents/ResizableComponent.tsx
index 9c07e1fe6e..7bfc735b25 100644
--- a/app/client/src/components/editorComponents/ResizableComponent.tsx
+++ b/app/client/src/components/editorComponents/ResizableComponent.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useRef, memo } from "react";
+import React, { useContext, useRef, memo, useMemo } from "react";
 import { XYCoord } from "react-dnd";
 
 import {
@@ -16,13 +16,13 @@ import {
 } from "./ResizableUtils";
 import {
   useShowPropertyPane,
-  useWidgetSelection,
   useWidgetDragResize,
 } from "utils/hooks/dragResizeHooks";
 import { useSelector } from "react-redux";
 import { AppState } from "reducers";
 import Resizable from "resizable";
-import { isDropZoneOccupied, getSnapColumns } from "utils/WidgetPropsUtils";
+import { omit, get } from "lodash";
+import { getSnapColumns, isDropZoneOccupied } from "utils/WidgetPropsUtils";
 import {
   VisibilityContainer,
   LeftHandleStyles,
@@ -38,27 +38,35 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
 import { scrollElementIntoParentCanvasView } from "utils/helpers";
 import { getNearestParentCanvas } from "utils/generators";
 import { getOccupiedSpaces } from "selectors/editorSelectors";
+import { commentModeSelector } from "selectors/commentsSelectors";
+import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
 
 export type ResizableComponentProps = WidgetProps & {
   paddingOffset: number;
 };
 
-/* eslint-disable react/display-name */
-export const ResizableComponent = memo((props: ResizableComponentProps) => {
+export const ResizableComponent = memo(function ResizableComponent(
+  props: ResizableComponentProps,
+) {
   const resizableRef = useRef<HTMLDivElement>(null);
   // Fetch information from the context
   const { updateWidget } = useContext(EditorContext);
   const occupiedSpaces = useSelector(getOccupiedSpaces);
 
-  const { updateDropTargetRows, persistDropTargetRows } = useContext(
+  const { persistDropTargetRows, updateDropTargetRows } = useContext(
     DropTargetContext,
   );
 
+  const isCommentMode = useSelector(commentModeSelector);
+
   const showPropertyPane = useShowPropertyPane();
   const { selectWidget } = useWidgetSelection();
   const { setIsResizing } = useWidgetDragResize();
   const selectedWidget = useSelector(
-    (state: AppState) => state.ui.widgetDragResize.selectedWidget,
+    (state: AppState) => state.ui.widgetDragResize.lastSelectedWidget,
+  );
+  const selectedWidgets = useSelector(
+    (state: AppState) => state.ui.widgetDragResize.selectedWidgets,
   );
   const focusedWidget = useSelector(
     (state: AppState) => state.ui.widgetDragResize.focusedWidget,
@@ -70,6 +78,7 @@ export const ResizableComponent = memo((props: ResizableComponentProps) => {
   const isResizing = useSelector(
     (state: AppState) => state.ui.widgetDragResize.isResizing,
   );
+
   const occupiedSpacesBySiblingWidgets =
     occupiedSpaces && props.parentId && occupiedSpaces[props.parentId]
       ? occupiedSpaces[props.parentId]
@@ -77,7 +86,9 @@ export const ResizableComponent = memo((props: ResizableComponentProps) => {
 
   // isFocused (string | boolean) -> isWidgetFocused (boolean)
   const isWidgetFocused =
-    focusedWidget === props.widgetId || selectedWidget === props.widgetId;
+    focusedWidget === props.widgetId ||
+    selectedWidget === props.widgetId ||
+    selectedWidgets.includes(props.widgetId);
 
   // Calculate the dimensions of the widget,
   // The ResizableContainer's size prop is controlled
@@ -103,15 +114,18 @@ export const ResizableComponent = memo((props: ResizableComponentProps) => {
     possibleBoundingElements.length > 0
       ? possibleBoundingElements[0]
       : undefined;
-  const boundingElementClientRect = boundingElement
-    ? boundingElement.getBoundingClientRect()
-    : undefined;
 
   // onResize handler
   // Checks if the current resize position has any collisions
   // If yes, set isColliding flag to true.
   // If no, set isColliding flag to false.
   const isColliding = (newDimensions: UIElementSize, position: XYCoord) => {
+    // Moving the bounding element calculations inside
+    // to make this expensive operation only whne
+    const boundingElementClientRect = boundingElement
+      ? boundingElement.getBoundingClientRect()
+      : undefined;
+
     const bottom =
       props.topRow +
       position.y / props.parentRowSpace +
@@ -139,9 +153,10 @@ export const ResizableComponent = memo((props: ResizableComponentProps) => {
       return true;
     }
 
+    // Minimum row and columns to be set to a widget.
     if (
-      newRowCols.rightColumn - newRowCols.leftColumn < 1 ||
-      newRowCols.bottomRow - newRowCols.topRow < 1
+      newRowCols.rightColumn - newRowCols.leftColumn < 2 ||
+      newRowCols.bottomRow - newRowCols.topRow < 4
     ) {
       return true;
     }
@@ -246,27 +261,38 @@ export const ResizableComponent = memo((props: ResizableComponentProps) => {
       widgetType: props.type,
     });
   };
+  const handles = useMemo(() => {
+    const allHandles = {
+      left: LeftHandleStyles,
+      top: TopHandleStyles,
+      bottom: BottomHandleStyles,
+      right: RightHandleStyles,
+      bottomRight: BottomRightHandleStyles,
+      topLeft: TopLeftHandleStyles,
+      topRight: TopRightHandleStyles,
+      bottomLeft: BottomLeftHandleStyles,
+    };
+
+    return omit(allHandles, get(props, "disabledResizeHandles", []));
+  }, [props]);
+
+  const isEnabled =
+    !isDragging && isWidgetFocused && !props.resizeDisabled && !isCommentMode;
 
   return (
     <Resizable
       componentHeight={dimensions.height}
       componentWidth={dimensions.width}
-      enable={!isDragging && isWidgetFocused && !props.resizeDisabled}
-      handles={{
-        left: LeftHandleStyles,
-        top: TopHandleStyles,
-        bottom: BottomHandleStyles,
-        right: RightHandleStyles,
-        bottomRight: BottomRightHandleStyles,
-        topLeft: TopLeftHandleStyles,
-        topRight: TopRightHandleStyles,
-        bottomLeft: BottomLeftHandleStyles,
-      }}
+      enable={isEnabled}
+      handles={handles}
       isColliding={isColliding}
       onStart={handleResizeStart}
       onStop={updateSize}
       ref={resizableRef}
       snapGrid={{ x: props.parentColumnSpace, y: props.parentRowSpace }}
+      // Used only for performance tracking, can be removed after optimization.
+      zWidgetId={props.widgetId}
+      zWidgetType={props.type}
     >
       <VisibilityContainer
         padding={props.paddingOffset}
@@ -277,5 +303,4 @@ export const ResizableComponent = memo((props: ResizableComponentProps) => {
     </Resizable>
   );
 });
-
 export default ResizableComponent;
diff --git a/app/client/src/components/editorComponents/ResizeStyledComponents.tsx b/app/client/src/components/editorComponents/ResizeStyledComponents.tsx
index cd814f5033..055423c519 100644
--- a/app/client/src/components/editorComponents/ResizeStyledComponents.tsx
+++ b/app/client/src/components/editorComponents/ResizeStyledComponents.tsx
@@ -16,7 +16,6 @@ export const VisibilityContainer = styled.div<{
 
 export const EdgeHandleStyles = css`
   position: absolute;
-  z-index: 3;
   width: ${EDGE_RESIZE_HANDLE_WIDTH}px;
   height: ${EDGE_RESIZE_HANDLE_WIDTH}px;
   &::before {
diff --git a/app/client/src/components/editorComponents/Sidebar.tsx b/app/client/src/components/editorComponents/Sidebar.tsx
index 8282baf2ff..73093e7658 100644
--- a/app/client/src/components/editorComponents/Sidebar.tsx
+++ b/app/client/src/components/editorComponents/Sidebar.tsx
@@ -7,12 +7,13 @@ import * as Sentry from "@sentry/react";
 import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
+import { Layers } from "constants/Layers";
 
 const SidebarWrapper = styled.div`
   background-color: ${Colors.MINE_SHAFT};
   padding: 0;
   width: ${(props) => props.theme.sidebarWidth};
-  z-index: 3;
+  z-index: ${Layers.sideBar};
 
   color: ${(props) => props.theme.colors.textOnDarkBG};
   overflow-y: auto;
diff --git a/app/client/src/components/editorComponents/StoreAsDatasource.tsx b/app/client/src/components/editorComponents/StoreAsDatasource.tsx
index 35abcea5ff..989d82323c 100644
--- a/app/client/src/components/editorComponents/StoreAsDatasource.tsx
+++ b/app/client/src/components/editorComponents/StoreAsDatasource.tsx
@@ -7,12 +7,12 @@ import Icon, { IconSize } from "components/ads/Icon";
 import { Classes } from "components/ads/common";
 
 export const DatasourceIcon = styled.div<{ enable?: boolean }>`
-  position: absolute;
-  right: -155px;
-  top: 7px;
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-left: 10px;
+  height: 100%;
+  min-height: 37px;
   .${Classes.TEXT} {
     color: ${(props) => props.theme.colors.text.heading};
   }
diff --git a/app/client/src/components/editorComponents/WidgetNameComponent/SettingsControl.tsx b/app/client/src/components/editorComponents/WidgetNameComponent/SettingsControl.tsx
index b33a28bd0f..e0409bc315 100644
--- a/app/client/src/components/editorComponents/WidgetNameComponent/SettingsControl.tsx
+++ b/app/client/src/components/editorComponents/WidgetNameComponent/SettingsControl.tsx
@@ -1,5 +1,6 @@
 import React, { CSSProperties } from "react";
 import { ControlIcons } from "icons/ControlIcons";
+import Icon, { IconSize } from "components/ads/Icon";
 import { Colors } from "constants/Colors";
 import styled from "styled-components";
 import { Tooltip, Classes } from "@blueprintjs/core";
@@ -34,18 +35,41 @@ const SettingsWrapper = styled.div`
 `;
 
 const WidgetName = styled.span`
-  margin-right: 5px;
+  margin-right: ${(props) => props.theme.spaces[1] + 1}px;
+  margin-left: ${(props) => props.theme.spaces[3]}px;
+`;
+
+const StyledErrorIcon = styled(Icon)`
+  &:hover {
+    svg {
+      path {
+        fill: ${Colors.WHITE};
+      }
+    }
+  }
+  margin-right: ${(props) => props.theme.spaces[1]}px;
 `;
 
 type SettingsControlProps = {
   toggleSettings: (e: any) => void;
   activity: Activities;
   name: string;
+  errorCount: number;
 };
 
 const SettingsIcon = ControlIcons.SETTINGS_CONTROL;
 
-const getStyles = (activity: Activities): CSSProperties | undefined => {
+const getStyles = (
+  activity: Activities,
+  errorCount: number,
+): CSSProperties | undefined => {
+  if (errorCount > 0) {
+    return {
+      background: "red",
+      color: Colors.WHITE,
+    };
+  }
+
   switch (activity) {
     case Activities.ACTIVE:
       return {
@@ -69,7 +93,9 @@ export function SettingsControl(props: SettingsControlProps) {
   const settingsIcon = (
     <SettingsIcon
       color={
-        props.activity === Activities.HOVERING
+        !!props.errorCount
+          ? Colors.WHITE
+          : props.activity === Activities.HOVERING
           ? Colors.BLACK_PEARL
           : Colors.WHITE
       }
@@ -77,6 +103,13 @@ export function SettingsControl(props: SettingsControlProps) {
       width={12}
     />
   );
+  const errorIcon = (
+    <StyledErrorIcon
+      fillColor={Colors.WHITE}
+      name="warning"
+      size={IconSize.SMALL}
+    />
+  );
 
   return (
     <StyledTooltip
@@ -86,9 +119,16 @@ export function SettingsControl(props: SettingsControlProps) {
     >
       <SettingsWrapper
         className="t--widget-propertypane-toggle"
+        data-testid="t--widget-propertypane-toggle"
         onClick={props.toggleSettings}
-        style={getStyles(props.activity)}
+        style={getStyles(props.activity, props.errorCount)}
       >
+        {!!props.errorCount && (
+          <>
+            {errorIcon}
+            <span className="t--widget-error-count">{props.errorCount}</span>
+          </>
+        )}
         <WidgetName className="t--widget-name">{props.name}</WidgetName>
         {settingsIcon}
       </SettingsWrapper>
diff --git a/app/client/src/components/editorComponents/WidgetNameComponent/index.tsx b/app/client/src/components/editorComponents/WidgetNameComponent/index.tsx
index 0e5a653bde..61bf20578f 100644
--- a/app/client/src/components/editorComponents/WidgetNameComponent/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetNameComponent/index.tsx
@@ -4,24 +4,23 @@ import { useSelector } from "react-redux";
 import { AppState } from "reducers";
 import { PropertyPaneReduxState } from "reducers/uiReducers/propertyPaneReducer";
 import SettingsControl, { Activities } from "./SettingsControl";
-import {
-  useShowPropertyPane,
-  useWidgetSelection,
-} from "utils/hooks/dragResizeHooks";
+import { useShowPropertyPane } from "utils/hooks/dragResizeHooks";
 import AnalyticsUtil from "utils/AnalyticsUtil";
-import { WidgetType } from "constants/WidgetConstants";
+import { WidgetType, WidgetTypes } from "constants/WidgetConstants";
 import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
+import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
 
-const PositionStyle = styled.div`
+const PositionStyle = styled.div<{ topRow: number }>`
   position: absolute;
-  top: -${(props) => props.theme.spaces[10]}px;
+  top: ${(props) =>
+    props.topRow > 2 ? `${-1 * props.theme.spaces[10]}px` : "calc(100%)"};
   height: ${(props) => props.theme.spaces[10]}px;
-  width: 100%;
-  left: 0;
+  right: 0;
   display: flex;
   padding: 0 4px;
+  cursor: pointer;
 `;
 
 const ControlGroup = styled.div`
@@ -41,6 +40,8 @@ type WidgetNameComponentProps = {
   parentId?: string;
   type: WidgetType;
   showControls?: boolean;
+  topRow: number;
+  errorCount: number;
 };
 
 export function WidgetNameComponent(props: WidgetNameComponentProps) {
@@ -51,7 +52,10 @@ export function WidgetNameComponent(props: WidgetNameComponentProps) {
     (state: AppState) => state.ui.propertyPane,
   );
   const selectedWidget = useSelector(
-    (state: AppState) => state.ui.widgetDragResize.selectedWidget,
+    (state: AppState) => state.ui.widgetDragResize.lastSelectedWidget,
+  );
+  const selectedWidgets = useSelector(
+    (state: AppState) => state.ui.widgetDragResize.selectedWidgets,
   );
   const focusedWidget = useSelector(
     (state: AppState) => state.ui.widgetDragResize.focusedWidget,
@@ -72,6 +76,9 @@ export function WidgetNameComponent(props: WidgetNameComponentProps) {
     ) {
       PerformanceTracker.startTracking(
         PerformanceTransactionName.OPEN_PROPERTY_PANE,
+        { widgetId: props.widgetId },
+        true,
+        [{ name: "widget_type", value: props.type }],
       );
       AnalyticsUtil.logEvent("PROPERTY_PANE_OPEN_CLICK", {
         widgetType: props.type,
@@ -90,27 +97,39 @@ export function WidgetNameComponent(props: WidgetNameComponentProps) {
     e.preventDefault();
     e.stopPropagation();
   };
+  const showAsSelected =
+    selectedWidget === props.widgetId ||
+    selectedWidgets.includes(props.widgetId);
 
   const showWidgetName =
     props.showControls ||
-    ((focusedWidget === props.widgetId || selectedWidget === props.widgetId) &&
+    ((focusedWidget === props.widgetId || showAsSelected) &&
       !isDragging &&
-      !isResizing);
+      !isResizing) ||
+    !!props.errorCount;
 
-  let currentActivity = Activities.NONE;
+  let currentActivity =
+    props.type === WidgetTypes.MODAL_WIDGET
+      ? Activities.HOVERING
+      : Activities.NONE;
   if (focusedWidget === props.widgetId) currentActivity = Activities.HOVERING;
-  if (selectedWidget === props.widgetId) currentActivity = Activities.SELECTED;
+  if (showAsSelected) currentActivity = Activities.SELECTED;
   if (
+    showAsSelected &&
     propertyPaneState.isVisible &&
     propertyPaneState.widgetId === props.widgetId
   )
     currentActivity = Activities.ACTIVE;
 
   return showWidgetName ? (
-    <PositionStyle data-testid="t--settings-controls-positioned-wrapper">
+    <PositionStyle
+      data-testid="t--settings-controls-positioned-wrapper"
+      topRow={props.topRow}
+    >
       <ControlGroup>
         <SettingsControl
           activity={currentActivity}
+          errorCount={props.errorCount}
           name={props.widgetName}
           toggleSettings={togglePropertyEditor}
         />
diff --git a/app/client/src/components/editorComponents/form/FormDialogComponent.tsx b/app/client/src/components/editorComponents/form/FormDialogComponent.tsx
index 5a9b2375a1..5a50a66494 100644
--- a/app/client/src/components/editorComponents/form/FormDialogComponent.tsx
+++ b/app/client/src/components/editorComponents/form/FormDialogComponent.tsx
@@ -1,6 +1,8 @@
-import React, { ReactNode, useState, useCallback } from "react";
+import React, { ReactNode, useState, useEffect } from "react";
 import { isPermitted } from "pages/Applications/permissionHelpers";
 import Dialog from "components/ads/DialogComponent";
+import { useDispatch } from "react-redux";
+import { setShowAppInviteUsersDialog } from "actions/applicationActions";
 
 type FormDialogComponentProps = {
   isOpen?: boolean;
@@ -16,16 +18,17 @@ type FormDialogComponentProps = {
 };
 
 export function FormDialogComponent(props: FormDialogComponentProps) {
-  const [isOpen, setIsOpen] = useState(!!props.isOpen);
+  const [isOpen, setIsOpenState] = useState(!!props.isOpen);
+  const dispatch = useDispatch();
 
-  const onClose = useCallback(() => {
-    setIsOpen(false);
-  }, []);
+  const setIsOpen = (isOpen: boolean) => {
+    setIsOpenState(isOpen);
+    dispatch(setShowAppInviteUsersDialog(isOpen));
+  };
 
-  // track if the dialog is open to close it when clicking cancel within the form
-  const onOpening = useCallback(() => {
-    setIsOpen(true);
-  }, []);
+  useEffect(() => {
+    setIsOpen(!!props.isOpen);
+  }, [props.isOpen]);
 
   const Form = props.Form;
 
@@ -40,14 +43,15 @@ export function FormDialogComponent(props: FormDialogComponentProps) {
     <Dialog
       canOutsideClickClose={!!props.canOutsideClickClose}
       isOpen={isOpen}
-      onOpening={onOpening}
+      onOpening={() => setIsOpen(true)}
       setMaxWidth={props.setMaxWidth}
+      setModalClose={() => setIsOpen(false)}
       title={props.title}
       trigger={props.trigger}
     >
       <Form
         applicationId={props.applicationId}
-        onCancel={onClose}
+        onCancel={() => setIsOpen(false)}
         orgId={props.orgId}
       />
     </Dialog>
diff --git a/app/client/src/components/editorComponents/form/fields/DropdownFieldWrapper.tsx b/app/client/src/components/editorComponents/form/fields/DropdownFieldWrapper.tsx
index 38c510a93a..4664ecb6b1 100644
--- a/app/client/src/components/editorComponents/form/fields/DropdownFieldWrapper.tsx
+++ b/app/client/src/components/editorComponents/form/fields/DropdownFieldWrapper.tsx
@@ -1,4 +1,5 @@
 import Dropdown from "components/ads/Dropdown";
+import { Colors } from "constants/Colors";
 import React, { useEffect, useState } from "react";
 import { WrappedFieldInputProps } from "redux-form";
 
@@ -39,6 +40,7 @@ function DropdownFieldWrapper(props: DropdownWrapperProps) {
 
   return (
     <Dropdown
+      bgColor={Colors.ROYAL_BLUE}
       className={props.className}
       height={props.height}
       onSelect={onSelectHandler}
diff --git a/app/client/src/components/editorComponents/form/fields/DynamicTextField.tsx b/app/client/src/components/editorComponents/form/fields/DynamicTextField.tsx
index 81b13f4aea..9247f2bbc0 100644
--- a/app/client/src/components/editorComponents/form/fields/DynamicTextField.tsx
+++ b/app/client/src/components/editorComponents/form/fields/DynamicTextField.tsx
@@ -20,6 +20,7 @@ class DynamicTextField extends React.Component<
       theme?: EditorTheme;
       hoverInteraction?: boolean;
       border?: CodeEditorBorder;
+      showLightningMenu?: boolean;
     }
 > {
   render() {
diff --git a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
index 1355fcb2e8..e44ee2dee8 100644
--- a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
+++ b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
@@ -1,4 +1,5 @@
 import React, { ChangeEvent } from "react";
+import ReactDOM from "react-dom";
 import {
   BaseFieldProps,
   change,
@@ -12,7 +13,8 @@ import CodeEditor, {
 import { API_EDITOR_FORM_NAME } from "constants/forms";
 import { AppState } from "reducers";
 import { connect } from "react-redux";
-import _ from "lodash";
+import get from "lodash/get";
+import merge from "lodash/merge";
 import {
   DEFAULT_DATASOURCE,
   EmbeddedRestDatasource,
@@ -36,6 +38,8 @@ import { DATA_SOURCES_EDITOR_ID_URL } from "constants/routes";
 import Icon, { IconSize } from "components/ads/Icon";
 import Text, { TextType } from "components/ads/Text";
 import history from "utils/history";
+import { getDatasourceInfo } from "pages/Editor/APIEditor/DatasourceList";
+import * as FontFamilies from "constants/Fonts";
 
 type ReduxStateProps = {
   orgId: string;
@@ -59,26 +63,84 @@ type Props = EditorProps &
 const DatasourceContainer = styled.div`
   display: flex;
   position: relative;
-  width: calc(100% - 155px);
 `;
+
+const hintContainerStyles: React.CSSProperties = {
+  display: "flex",
+  flexDirection: "column",
+  fontFamily: `${FontFamilies.TextFonts}`,
+};
+
+const mainContainerStyles: React.CSSProperties = {
+  display: "flex",
+  justifyContent: "space-between",
+  marginBottom: "6px",
+};
+
+const datasourceNameStyles: React.CSSProperties = {
+  fontSize: "14px",
+  fontWeight: 500,
+  color: "#090707",
+  overflow: "hidden",
+  textOverflow: "ellipsis",
+  whiteSpace: "nowrap",
+};
+const datasourceInfoStyles: React.CSSProperties = {
+  color: "#4B4848",
+  fontWeight: 400,
+  fontSize: "12px",
+  overflow: "hidden",
+  textOverflow: "ellipsis",
+  whiteSpace: "nowrap",
+};
+const italicInfoStyles = {
+  ...datasourceInfoStyles,
+  flexShrink: 0,
+  fontStyle: "italic",
+};
+
+//Avoiding styled components since ReactDOM.render cannot directly work with it
+function CustomHint(props: { datasource: Datasource }) {
+  return (
+    <div style={hintContainerStyles}>
+      <div style={mainContainerStyles}>
+        <span style={datasourceNameStyles}>{props.datasource.name}</span>
+        <span style={italicInfoStyles}>
+          {getDatasourceInfo(props.datasource)}
+        </span>
+      </div>
+      <span style={datasourceInfoStyles}>
+        {get(props.datasource, "datasourceConfiguration.url")}
+      </span>
+    </div>
+  );
+}
+
+const apiFormValueSelector = formValueSelector(API_EDITOR_FORM_NAME);
 class EmbeddedDatasourcePathComponent extends React.Component<Props> {
   handleDatasourceUrlUpdate = (datasourceUrl: string) => {
-    const { datasource, pluginId, orgId } = this.props;
+    const { datasource, orgId, pluginId } = this.props;
     const urlHasUpdated =
       datasourceUrl !== datasource.datasourceConfiguration?.url;
     if (urlHasUpdated) {
-      this.props.updateDatasource({
-        ...DEFAULT_DATASOURCE(pluginId, orgId),
+      const isDatasourceRemoved =
+        datasourceUrl.indexOf(datasource.datasourceConfiguration?.url) === -1;
+      let newDatasource = isDatasourceRemoved
+        ? { ...DEFAULT_DATASOURCE(pluginId, orgId) }
+        : { ...datasource };
+      newDatasource = {
+        ...newDatasource,
         datasourceConfiguration: {
-          ...datasource.datasourceConfiguration,
+          ...newDatasource.datasourceConfiguration,
           url: datasourceUrl,
         },
-      });
+      };
+      this.props.updateDatasource(newDatasource);
     }
   };
 
   handlePathUpdate = (path: string) => {
-    const { value, onChange } = this.props.input;
+    const { onChange, value } = this.props.input;
     if (onChange && value !== path) {
       onChange(path);
     }
@@ -95,8 +157,8 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
         path: "",
       };
     }
-    if ("id" in datasource && datasource.id) {
-      const datasourceUrl = datasource.datasourceConfiguration.url;
+    if (datasource && datasource.hasOwnProperty("id")) {
+      const datasourceUrl = get(datasource, "datasourceConfiguration.url", "");
       if (value.includes(datasourceUrl)) {
         return {
           datasourceUrl,
@@ -128,7 +190,7 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
       typeof valueOrEvent === "string"
         ? valueOrEvent
         : valueOrEvent.target.value;
-    const { path, datasourceUrl } = this.parseInputValue(value);
+    const { datasourceUrl, path } = this.parseInputValue(value);
     this.handlePathUpdate(path);
     this.handleDatasourceUrlUpdate(datasourceUrl);
   };
@@ -142,7 +204,7 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
         "id" in datasource &&
         datasource.id
       ) {
-        const end = datasource.datasourceConfiguration.url.length;
+        const end = get(datasource, "datasourceConfiguration.url", "").length;
         editorInstance.markText(
           { ch: 0, line: 0 },
           { ch: end, line: 0 },
@@ -172,17 +234,23 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
               completeSingle: false,
               hint: () => {
                 const list = datasourceList
-                  .filter((datasource) =>
+                  .filter((datasource: Datasource) =>
                     (datasource.datasourceConfiguration?.url || "").includes(
                       parsed.datasourceUrl,
                     ),
                   )
-                  .map((datasource) => ({
+                  .map((datasource: Datasource) => ({
                     text: datasource.datasourceConfiguration.url,
                     data: datasource,
                     className: !datasource.isValid
-                      ? "datasource-hint invalid"
-                      : "datasource-hint",
+                      ? "datasource-hint custom invalid"
+                      : "datasource-hint custom",
+                    render: (element: HTMLElement, self: any, data: any) => {
+                      ReactDOM.render(
+                        <CustomHint datasource={data.data} />,
+                        element,
+                      );
+                    },
                   }));
                 const hints = {
                   list,
@@ -213,7 +281,7 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
       datasource,
       input: { value },
     } = this.props;
-    const datasourceUrl = _.get(datasource, "datasourceConfiguration.url", "");
+    const datasourceUrl = get(datasource, "datasourceConfiguration.url", "");
     const displayValue = `${datasourceUrl}${value}`;
     const input = {
       ...this.props.input,
@@ -237,7 +305,7 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
     return (
       <DatasourceContainer>
         <CodeEditor {...props} />
-        {datasource && !("id" in datasource) ? (
+        {displayValue && datasource && !("id" in datasource) ? (
           <StoreAsDatasource enable={!!displayValue} />
         ) : datasource && "id" in datasource ? (
           <DatasourceIcon
@@ -261,8 +329,6 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
   }
 }
 
-const apiFormValueSelector = formValueSelector(API_EDITOR_FORM_NAME);
-
 const mapStateToProps = (
   state: AppState,
   ownProps: { pluginId: string },
@@ -275,7 +341,7 @@ const mapStateToProps = (
       (d) => d.id === datasourceFromAction.id,
     );
     if (datasourceFromDataSourceList) {
-      datasourceMerged = _.merge(
+      datasourceMerged = merge(
         {},
         datasourceFromAction,
         datasourceFromDataSourceList,
diff --git a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
index 514a02a016..387dc51dad 100644
--- a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
+++ b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
@@ -14,8 +14,12 @@ import {
 import Text, { Case, TextType } from "components/ads/Text";
 import { Classes } from "components/ads/common";
 
-const KeyValueStackContainer = styled.div`
-  padding: ${(props) => props.theme.spaces[4]}px
+type CustomStack = {
+  removeTopPadding?: boolean;
+};
+
+const KeyValueStackContainer = styled.div<CustomStack>`
+  padding: ${(props) => (props.removeTopPadding ? 0 : props.theme.spaces[4])}px
     ${(props) => props.theme.spaces[14]}px
     ${(props) => props.theme.spaces[11] + 1}px
     ${(props) => props.theme.spaces[11] + 2}px;
@@ -89,19 +93,21 @@ function KeyValueRow(props: Props & WrappedFieldArrayProps) {
   }, [props.fields, props.pushFields]);
 
   return (
-    <KeyValueStackContainer>
-      <FlexContainer>
-        <Flex className="key-value" size={1}>
-          <Text case={Case.CAPITALIZE} type={TextType.H6}>
-            Key
-          </Text>
-        </Flex>
-        <Flex className="key-value" size={3}>
-          <Text case={Case.CAPITALIZE} type={TextType.H6}>
-            Value
-          </Text>
-        </Flex>
-      </FlexContainer>
+    <KeyValueStackContainer removeTopPadding={props.hideHeader}>
+      {!props.hideHeader && (
+        <FlexContainer>
+          <Flex className="key-value" size={1}>
+            <Text case={Case.CAPITALIZE} type={TextType.H6}>
+              Key
+            </Text>
+          </Flex>
+          <Flex className="key-value" size={3}>
+            <Text case={Case.CAPITALIZE} type={TextType.H6}>
+              Value
+            </Text>
+          </Flex>
+        </FlexContainer>
+      )}
       {props.fields.length > 0 && (
         <>
           {props.fields.map((field: any, index: number) => {
@@ -130,7 +136,6 @@ function KeyValueRow(props: Props & WrappedFieldArrayProps) {
                     hoverInteraction
                     name={`${field}.key`}
                     placeholder={`Key ${index + 1}`}
-                    showLightningMenu={false}
                     theme={props.theme}
                   />
                 </Flex>
@@ -224,6 +229,7 @@ type Props = {
   placeholder?: string;
   pushFields?: boolean;
   dataTreePath?: string;
+  hideHeader?: boolean;
   theme?: EditorTheme;
 };
 
diff --git a/app/client/src/components/formControls/BaseControl.tsx b/app/client/src/components/formControls/BaseControl.tsx
index 9087cb0178..4c9f6d26d3 100644
--- a/app/client/src/components/formControls/BaseControl.tsx
+++ b/app/client/src/components/formControls/BaseControl.tsx
@@ -51,6 +51,7 @@ export interface ControlData {
   isRequired?: boolean;
   hidden?: HiddenType;
   placeholderText?: string;
+  schema?: any;
 }
 
 export interface ControlFunctions {
diff --git a/app/client/src/components/formControls/CheckboxControl.tsx b/app/client/src/components/formControls/CheckboxControl.tsx
index 072ab52186..d2a7e02fe8 100644
--- a/app/client/src/components/formControls/CheckboxControl.tsx
+++ b/app/client/src/components/formControls/CheckboxControl.tsx
@@ -17,7 +17,7 @@ class CheckboxControl extends BaseControl<CheckboxControlProps> {
   }
 
   render() {
-    const { configProperty, label, info } = this.props;
+    const { configProperty, info, label } = this.props;
 
     return <StyledCheckbox info={info} label={label} name={configProperty} />;
   }
diff --git a/app/client/src/components/formControls/DropDownControl.tsx b/app/client/src/components/formControls/DropDownControl.tsx
index cf27809189..c62fc612b0 100644
--- a/app/client/src/components/formControls/DropDownControl.tsx
+++ b/app/client/src/components/formControls/DropDownControl.tsx
@@ -49,7 +49,7 @@ const customSelectStyles = {
 
 class DropDownControl extends BaseControl<DropDownControlProps> {
   render() {
-    const { configProperty, options, label, isRequired, subtitle } = this.props;
+    const { configProperty, isRequired, label, options, subtitle } = this.props;
 
     return (
       <div>
diff --git a/app/client/src/components/formControls/DynamicInputTextControl.tsx b/app/client/src/components/formControls/DynamicInputTextControl.tsx
index 856f9b7c25..d6caaf97c3 100644
--- a/app/client/src/components/formControls/DynamicInputTextControl.tsx
+++ b/app/client/src/components/formControls/DynamicInputTextControl.tsx
@@ -16,11 +16,11 @@ export function InputText(props: {
   name: string;
   actionName: string;
 }) {
-  const { actionName, name, placeholder, label, isRequired } = props;
+  const { actionName, isRequired, label, name, placeholder } = props;
   const dataTreePath = actionPathFromName(actionName, name);
 
   return (
-    <div style={{ width: "50vh", height: "55px" }}>
+    <div style={{ width: "50vh", minHeight: "55px" }}>
       <FormLabel>
         {label} {isRequired && "*"}
       </FormLabel>
@@ -36,7 +36,7 @@ export function InputText(props: {
 
 class DynamicInputTextControl extends BaseControl<DynamicInputControlProps> {
   render() {
-    const { label, placeholderText, configProperty, actionName } = this.props;
+    const { actionName, configProperty, label, placeholderText } = this.props;
 
     return (
       <InputText
diff --git a/app/client/src/components/formControls/DynamicTextFieldControl.test.tsx b/app/client/src/components/formControls/DynamicTextFieldControl.test.tsx
index 79f3a621a6..dd3508467c 100644
--- a/app/client/src/components/formControls/DynamicTextFieldControl.test.tsx
+++ b/app/client/src/components/formControls/DynamicTextFieldControl.test.tsx
@@ -66,7 +66,10 @@ describe("DynamicTextFieldControl", () => {
     );
     const createTemplateButton = screen.getByText("Create");
     userEvent.click(createTemplateButton);
-    expect(screen.getByText("test plugin template")).toBeDefined();
+    // Test each word separately because they are in different spans
+    expect(screen.getByText("test")).toBeDefined();
+    expect(screen.getByText("plugin")).toBeDefined();
+    expect(screen.getByText("template")).toBeDefined();
     waitFor(async () => {
       await expect(screen.findByText("Create")).toBeNull();
     });
diff --git a/app/client/src/components/formControls/DynamicTextFieldControl.tsx b/app/client/src/components/formControls/DynamicTextFieldControl.tsx
index 6d3d2b111e..ff5a441f4b 100644
--- a/app/client/src/components/formControls/DynamicTextFieldControl.tsx
+++ b/app/client/src/components/formControls/DynamicTextFieldControl.tsx
@@ -61,12 +61,12 @@ class DynamicTextControl extends BaseControl<
 
   render() {
     const {
-      responseType,
-      label,
-      placeholderText,
       actionName,
       configProperty,
       evaluationSubstitutionType,
+      label,
+      placeholderText,
+      responseType,
     } = this.props;
     const dataTreePath = actionPathFromName(actionName, configProperty);
     const isNewQuery =
@@ -122,6 +122,7 @@ export interface DynamicTextFieldProps extends ControlProps {
   responseType: string;
   placeholderText?: string;
   evaluationSubstitutionType: EvaluationSubstitutionType;
+  mutedHinting?: boolean;
 }
 
 const mapStateToProps = (state: AppState, props: DynamicTextFieldProps) => {
diff --git a/app/client/src/components/formControls/FieldArrayControl.tsx b/app/client/src/components/formControls/FieldArrayControl.tsx
new file mode 100644
index 0000000000..6dba80f6b7
--- /dev/null
+++ b/app/client/src/components/formControls/FieldArrayControl.tsx
@@ -0,0 +1,106 @@
+import React, { useEffect } from "react";
+import FormControl from "pages/Editor/FormControl";
+import Text, { TextType } from "components/ads/Text";
+import Icon, { IconSize } from "components/ads/Icon";
+import { Classes } from "components/ads/common";
+import styled from "styled-components";
+import { FieldArray } from "redux-form";
+import FormLabel from "components/editorComponents/FormLabel";
+import { ControlProps } from "./BaseControl";
+
+const CenteredIcon = styled(Icon)`
+  margin-top: 25px;
+  &.hide {
+    opacity: 0;
+    pointer-events: none;
+  }
+`;
+
+const PrimaryBox = styled.div`
+  display: flex;
+  flex-direction: column;
+  border: 2px solid ${(props) => props.theme.colors.apiPane.dividerBg};
+  padding: 10px;
+  border-radius: 5px;
+`;
+
+const SecondaryBox = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 5px;
+`;
+
+const AddMoreAction = styled.div`
+  width: fit-content;
+  cursor: pointer;
+  display: flex;
+  margin-top: 16px;
+  .${Classes.TEXT} {
+    margin-left: 8px;
+    color: #03b365;
+  }
+`;
+
+function NestedComponents(props: any) {
+  useEffect(() => {
+    if (props.fields.length < 1) {
+      props.fields.push({});
+    }
+  }, [props.fields.length]);
+  return (
+    <PrimaryBox>
+      {props.fields &&
+        props.fields.length > 0 &&
+        props.fields.map((field: string, index: number) => {
+          return (
+            <SecondaryBox key={index}>
+              {props.schema.map((sch: any, idx: number) => {
+                sch = {
+                  ...sch,
+                  configProperty: `${field}.${sch.key}`,
+                };
+                return (
+                  <FormControl
+                    config={sch}
+                    formName={props.formName}
+                    key={idx}
+                  />
+                );
+              })}
+              <CenteredIcon
+                name="delete"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  props.fields.remove(index);
+                }}
+                size={IconSize.XXL}
+              />
+            </SecondaryBox>
+          );
+        })}
+      <AddMoreAction onClick={() => props.fields.push({})}>
+        {/*Hardcoded label to be removed */}
+        <Text type={TextType.H5}>+ Add Condition (And)</Text>
+      </AddMoreAction>
+    </PrimaryBox>
+  );
+}
+
+export default function FieldArrayControl(props: FieldArrayControlProps) {
+  const { configProperty, formName, label, schema } = props;
+  return (
+    <>
+      <FormLabel>{label}</FormLabel>
+      <FieldArray
+        component={NestedComponents}
+        name={configProperty}
+        props={{ formName, schema }}
+        rerenderOnEveryChange={false}
+      />
+    </>
+  );
+}
+
+export type FieldArrayControlProps = ControlProps;
diff --git a/app/client/src/components/formControls/FilePickerControl.tsx b/app/client/src/components/formControls/FilePickerControl.tsx
index 11525ef585..49a51eecc4 100644
--- a/app/client/src/components/formControls/FilePickerControl.tsx
+++ b/app/client/src/components/formControls/FilePickerControl.tsx
@@ -121,7 +121,7 @@ class FilePickerControl extends BaseControl<FilePickerControlProps> {
   }
 
   render() {
-    const { configProperty, label, isRequired } = this.props;
+    const { configProperty, isRequired, label } = this.props;
 
     return (
       <>
diff --git a/app/client/src/components/formControls/FixedKeyInputControl.tsx b/app/client/src/components/formControls/FixedKeyInputControl.tsx
index f3efdd7a0b..0afa6578ba 100644
--- a/app/client/src/components/formControls/FixedKeyInputControl.tsx
+++ b/app/client/src/components/formControls/FixedKeyInputControl.tsx
@@ -13,12 +13,12 @@ const Wrapper = styled.div`
 class FixKeyInputControl extends BaseControl<FixedKeyInputControlProps> {
   render() {
     const {
+      configProperty,
+      dataType,
+      fixedKey,
+      isRequired,
       label,
       placeholderText,
-      dataType,
-      configProperty,
-      isRequired,
-      fixedKey,
     } = this.props;
 
     return (
diff --git a/app/client/src/components/formControls/InputNumberControl.tsx b/app/client/src/components/formControls/InputNumberControl.tsx
index 0890a14c84..a3102ae668 100644
--- a/app/client/src/components/formControls/InputNumberControl.tsx
+++ b/app/client/src/components/formControls/InputNumberControl.tsx
@@ -23,7 +23,7 @@ export function InputText(props: {
   dataType?: string;
   name: string;
 }) {
-  const { name, placeholder, dataType, label } = props;
+  const { dataType, label, name, placeholder } = props;
 
   return (
     <FormGroup data-cy={name}>
@@ -36,11 +36,11 @@ export function InputText(props: {
 class InputNumberControl extends BaseControl<InputControlProps> {
   render() {
     const {
-      propertyValue,
-      label,
-      placeholderText,
       configProperty,
       dataType,
+      label,
+      placeholderText,
+      propertyValue,
     } = this.props;
 
     return (
diff --git a/app/client/src/components/formControls/InputTextControl.tsx b/app/client/src/components/formControls/InputTextControl.tsx
index 5cdb133522..e8419a03b4 100644
--- a/app/client/src/components/formControls/InputTextControl.tsx
+++ b/app/client/src/components/formControls/InputTextControl.tsx
@@ -30,14 +30,14 @@ export function InputText(props: {
   disabled?: boolean;
 }) {
   const {
+    dataType,
+    disabled,
+    encrypted,
+    isRequired,
+    label,
     name,
     placeholder,
-    dataType,
-    label,
-    isRequired,
-    disabled,
     subtitle,
-    encrypted,
   } = props;
 
   return (
@@ -71,15 +71,15 @@ export function InputText(props: {
 class InputTextControl extends BaseControl<InputControlProps> {
   render() {
     const {
-      validationMessage,
-      propertyValue,
+      configProperty,
+      dataType,
+      disabled,
       isValid,
       label,
       placeholderText,
-      dataType,
-      configProperty,
-      disabled,
+      propertyValue,
       subtitle,
+      validationMessage,
     } = this.props;
 
     return (
diff --git a/app/client/src/components/formControls/SwitchControl.tsx b/app/client/src/components/formControls/SwitchControl.tsx
index 7c5a02ad16..6ef651f0fb 100644
--- a/app/client/src/components/formControls/SwitchControl.tsx
+++ b/app/client/src/components/formControls/SwitchControl.tsx
@@ -42,7 +42,7 @@ export class SwitchField extends React.Component<Props, any> {
   }
 
   render() {
-    const { label, isRequired, input, info } = this.props;
+    const { info, input, isRequired, label } = this.props;
 
     return (
       <div>
@@ -64,7 +64,7 @@ export class SwitchField extends React.Component<Props, any> {
 
 class SwitchControl extends BaseControl<SwitchControlProps> {
   render() {
-    const { configProperty, label, isRequired, info } = this.props;
+    const { configProperty, info, isRequired, label } = this.props;
 
     return (
       <Field
diff --git a/app/client/src/components/propertyControls/ActionSelectorControl.tsx b/app/client/src/components/propertyControls/ActionSelectorControl.tsx
index 32e6cef1a4..fe01e9b992 100644
--- a/app/client/src/components/propertyControls/ActionSelectorControl.tsx
+++ b/app/client/src/components/propertyControls/ActionSelectorControl.tsx
@@ -15,9 +15,7 @@ class ActionSelectorControl extends BaseControl<ControlProps> {
     return (
       <ActionCreator
         additionalAutoComplete={this.props.additionalAutoComplete}
-        isValid={this.props.isValid}
         onValueChange={this.handleValueUpdate}
-        validationMessage={this.props.errorMessage}
         value={propertyValue}
       />
     );
diff --git a/app/client/src/components/propertyControls/BaseControl.tsx b/app/client/src/components/propertyControls/BaseControl.tsx
index 8647dbb6bd..a79f1f1d7a 100644
--- a/app/client/src/components/propertyControls/BaseControl.tsx
+++ b/app/client/src/components/propertyControls/BaseControl.tsx
@@ -34,13 +34,14 @@ export interface ControlProps extends ControlData, ControlFunctions {
 export interface ControlData
   extends Omit<PropertyPaneControlConfig, "additionalAutoComplete"> {
   propertyValue?: any;
-  isValid: boolean;
   errorMessage?: string;
-  expected: string;
+  expected?: string;
   evaluatedValue: any;
-  validationMessage?: string;
   widgetProperties: any;
   useValidationMessage?: boolean;
+  parentPropertyName: string;
+  parentPropertyValue: unknown;
+  additionalDynamicData: Record<string, Record<string, unknown>>;
 }
 export interface ControlFunctions {
   onPropertyChange?: (propertyName: string, propertyValue: string) => void;
diff --git a/app/client/src/components/propertyControls/ButtonTabControl.tsx b/app/client/src/components/propertyControls/ButtonTabControl.tsx
index f2b075cb7a..8c808a555f 100644
--- a/app/client/src/components/propertyControls/ButtonTabControl.tsx
+++ b/app/client/src/components/propertyControls/ButtonTabControl.tsx
@@ -7,7 +7,7 @@ import produce from "immer";
 
 class ButtonTabControl extends BaseControl<ButtonTabControlProps> {
   selectButton = (value: string) => {
-    const { propertyValue, defaultValue } = this.props;
+    const { defaultValue, propertyValue } = this.props;
     const values: string[] = propertyValue
       ? propertyValue.split(",")
       : defaultValue
@@ -24,7 +24,7 @@ class ButtonTabControl extends BaseControl<ButtonTabControlProps> {
     }
   };
   render() {
-    const { propertyValue, options } = this.props;
+    const { options, propertyValue } = this.props;
     return (
       <ButtonTabComponent
         options={options}
diff --git a/app/client/src/components/propertyControls/ChartDataControl.tsx b/app/client/src/components/propertyControls/ChartDataControl.tsx
index fff42890d8..e2bbc92ca4 100644
--- a/app/client/src/components/propertyControls/ChartDataControl.tsx
+++ b/app/client/src/components/propertyControls/ChartDataControl.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { get, has, isString } from "lodash";
+import { get, isString } from "lodash";
 import BaseControl, { ControlProps } from "./BaseControl";
 import { ControlWrapper, StyledPropertyPaneButton } from "./StyledControls";
 import styled from "constants/DefaultTheme";
@@ -81,10 +81,7 @@ type RenderComponentProps = {
   index: string;
   item: ChartData;
   length: number;
-  validationMessage: {
-    data: string;
-    seriesName: string;
-  };
+  dataTreePath: string;
   deleteOption: (index: string) => void;
   updateOption: (index: string, key: string, value: string) => void;
   evaluated: {
@@ -96,13 +93,13 @@ type RenderComponentProps = {
 
 function DataControlComponent(props: RenderComponentProps) {
   const {
+    dataTreePath,
     deleteOption,
-    updateOption,
-    item,
-    index,
-    length,
     evaluated,
-    validationMessage,
+    index,
+    item,
+    length,
+    updateOption,
   } = props;
 
   return (
@@ -121,6 +118,7 @@ function DataControlComponent(props: RenderComponentProps) {
       </ActionHolder>
       <StyledOptionControlWrapper orientation={"HORIZONTAL"}>
         <CodeEditor
+          dataTreePath={`${dataTreePath}.seriesName`}
           evaluatedValue={evaluated?.seriesName}
           expected={"string"}
           input={{
@@ -147,6 +145,7 @@ function DataControlComponent(props: RenderComponentProps) {
         className={"t--property-control-chart-series-data-control"}
       >
         <CodeEditor
+          dataTreePath={`${dataTreePath}.data`}
           evaluatedValue={evaluated?.data}
           expected={`Array<x:string, y:number>`}
           input={{
@@ -161,12 +160,6 @@ function DataControlComponent(props: RenderComponentProps) {
               updateOption(index, "data", value);
             },
           }}
-          meta={{
-            error: has(validationMessage, "data")
-              ? get(validationMessage, "data")
-              : "",
-            touched: true,
-          }}
           mode={EditorModes.JSON_WITH_BINDING}
           placeholder=""
           size={EditorSize.EXTENDED}
@@ -186,7 +179,6 @@ class ChartDataControl extends BaseControl<ControlProps> {
       : this.props.propertyValue;
 
     const dataLength = Object.keys(chartData).length;
-    const { validationMessage } = this.props;
 
     const evaluatedValue = this.props.evaluatedValue;
     const firstKey = Object.keys(chartData)[0] as string;
@@ -201,6 +193,7 @@ class ChartDataControl extends BaseControl<ControlProps> {
 
       return (
         <DataControlComponent
+          dataTreePath={`${this.props.dataTreePath}.${firstKey}`}
           deleteOption={this.deleteOption}
           evaluated={get(evaluatedValue, `${firstKey}`)}
           index={firstKey}
@@ -208,7 +201,6 @@ class ChartDataControl extends BaseControl<ControlProps> {
           length={1}
           theme={this.props.theme}
           updateOption={this.updateOption}
-          validationMessage={get(validationMessage, `${firstKey}`)}
         />
       );
     }
@@ -221,6 +213,7 @@ class ChartDataControl extends BaseControl<ControlProps> {
 
             return (
               <DataControlComponent
+                dataTreePath={`${this.props.dataTreePath}.${key}`}
                 deleteOption={this.deleteOption}
                 evaluated={get(evaluatedValue, `${key}`)}
                 index={key}
@@ -229,7 +222,6 @@ class ChartDataControl extends BaseControl<ControlProps> {
                 length={dataLength}
                 theme={this.props.theme}
                 updateOption={this.updateOption}
-                validationMessage={get(validationMessage, `${key}`)}
               />
             );
           })}
diff --git a/app/client/src/components/propertyControls/CodeEditorControl.tsx b/app/client/src/components/propertyControls/CodeEditorControl.tsx
index e081757ed0..0109900832 100644
--- a/app/client/src/components/propertyControls/CodeEditorControl.tsx
+++ b/app/client/src/components/propertyControls/CodeEditorControl.tsx
@@ -11,26 +11,23 @@ import {
 class CodeEditorControl extends BaseControl<ControlProps> {
   render() {
     const {
-      validationMessage,
-      expected,
-      propertyValue,
-      isValid,
       dataTreePath,
       evaluatedValue,
+      expected,
+      propertyValue,
       useValidationMessage,
     } = this.props;
+
     const props: Partial<ControlProps> = {};
+
     if (dataTreePath) props.dataTreePath = dataTreePath;
     if (evaluatedValue) props.evaluatedValue = evaluatedValue;
     if (expected) props.expected = expected;
 
     return (
       <CodeEditor
+        additionalDynamicData={this.props.additionalAutoComplete}
         input={{ value: propertyValue, onChange: this.onChange }}
-        meta={{
-          error: isValid ? "" : validationMessage,
-          touched: true,
-        }}
         mode={EditorModes.TEXT_WITH_BINDING}
         size={EditorSize.EXTENDED}
         tabBehaviour={TabBehaviour.INDENT}
diff --git a/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx b/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx
index 72bf4291bf..65c3c82276 100644
--- a/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx
+++ b/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx
@@ -52,7 +52,6 @@ class ColumnActionSelectorControl extends BaseControl<
                 <InputTextWrapper>
                   <InputText
                     evaluatedValue={columnAction.label}
-                    isValid
                     label={columnAction.label}
                     onChange={this.updateColumnActionLabel.bind(
                       this,
@@ -64,12 +63,10 @@ class ColumnActionSelectorControl extends BaseControl<
                 </InputTextWrapper>
                 <Wrapper>
                   <ActionCreator
-                    isValid={(columnAction as any).isValid}
                     onValueChange={this.updateColumnActionFunction.bind(
                       this,
                       columnAction,
                     )}
-                    validationMessage={(columnAction as any).message}
                     value={columnAction.dynamicTrigger}
                   />
                 </Wrapper>
diff --git a/app/client/src/components/propertyControls/ComputeTablePropertyControl.tsx b/app/client/src/components/propertyControls/ComputeTablePropertyControl.tsx
index b570e3d891..c0d99e219d 100644
--- a/app/client/src/components/propertyControls/ComputeTablePropertyControl.tsx
+++ b/app/client/src/components/propertyControls/ComputeTablePropertyControl.tsx
@@ -14,7 +14,7 @@ import styled from "styled-components";
 import {
   JSToString,
   stringToJS,
-} from "components/editorComponents/ActionCreator";
+} from "components/editorComponents/ActionCreator/Fields";
 
 const PromptMessage = styled.span`
   line-height: 17px;
@@ -32,8 +32,6 @@ export function InputText(props: {
   label: string;
   value: string;
   onChange: (event: React.ChangeEvent<HTMLTextAreaElement> | string) => void;
-  isValid: boolean;
-  errorMessage?: string;
   evaluatedValue?: any;
   expected?: string;
   placeholder?: string;
@@ -42,16 +40,14 @@ export function InputText(props: {
   theme: EditorTheme;
 }) {
   const {
-    errorMessage,
-    expected,
-    value,
-    isValid,
-    onChange,
-    placeholder,
+    additionalDynamicData,
     dataTreePath,
     evaluatedValue,
-    additionalDynamicData,
+    expected,
+    onChange,
+    placeholder,
     theme,
+    value,
   } = props;
   return (
     <StyledDynamicInput>
@@ -64,10 +60,6 @@ export function InputText(props: {
           value: value,
           onChange: onChange,
         }}
-        meta={{
-          error: isValid ? "" : errorMessage,
-          touched: true,
-        }}
         mode={EditorModes.TEXT_WITH_BINDING}
         placeholder={placeholder}
         promptMessage={
@@ -90,13 +82,11 @@ class ComputeTablePropertyControl extends BaseControl<
 > {
   render() {
     const {
-      expected,
-      propertyValue,
-      isValid,
-      label,
       dataTreePath,
-      validationMessage,
       defaultValue,
+      expected,
+      label,
+      propertyValue,
       theme,
     } = this.props;
     const tableId = this.props.widgetProperties.widgetName;
@@ -121,9 +111,7 @@ class ComputeTablePropertyControl extends BaseControl<
           currentRow,
         }}
         dataTreePath={dataTreePath}
-        errorMessage={validationMessage}
         expected={expected}
-        isValid={isValid}
         label={label}
         onChange={this.onTextChange}
         theme={theme}
diff --git a/app/client/src/components/propertyControls/CustomFusionChartControl.tsx b/app/client/src/components/propertyControls/CustomFusionChartControl.tsx
index 515efffeb4..bcf39b84f7 100644
--- a/app/client/src/components/propertyControls/CustomFusionChartControl.tsx
+++ b/app/client/src/components/propertyControls/CustomFusionChartControl.tsx
@@ -3,21 +3,12 @@ import InputTextControl, { InputText } from "./InputTextControl";
 
 class CustomFusionChartControl extends InputTextControl {
   render() {
-    const expected = "{\n  type: string,\n  dataSource: Object\n}";
-    const {
-      propertyValue,
-      isValid,
-      label,
-      placeholderText,
-      dataTreePath,
-      validationMessage,
-    } = this.props;
+    const expected = '{\n  "type": string,\n  "dataSource": Object\n}';
+    const { dataTreePath, label, placeholderText, propertyValue } = this.props;
     return (
       <InputText
         dataTreePath={dataTreePath}
-        errorMessage={validationMessage}
         expected={expected}
-        isValid={isValid}
         label={label}
         onChange={this.onTextChange}
         placeholder={placeholderText}
diff --git a/app/client/src/components/propertyControls/DatePickerControl.tsx b/app/client/src/components/propertyControls/DatePickerControl.tsx
index 96aa68f0d3..0151e46e44 100644
--- a/app/client/src/components/propertyControls/DatePickerControl.tsx
+++ b/app/client/src/components/propertyControls/DatePickerControl.tsx
@@ -46,11 +46,11 @@ class DatePickerControl extends BaseControl<
   year = this.now.get("year");
   maxDate: Date = this.now
     .clone()
-    .set({ month: 11, date: 31, year: this.year + 20 })
+    .set({ month: 11, date: 31, year: this.year + 100 })
     .toDate();
   minDate: Date = this.now
     .clone()
-    .set({ month: 0, date: 1, year: this.year - 20 })
+    .set({ month: 0, date: 1, year: this.year - 100 })
     .toDate();
 
   constructor(props: DatePickerControlProps) {
diff --git a/app/client/src/components/propertyControls/DropDownControl.tsx b/app/client/src/components/propertyControls/DropDownControl.tsx
index 8d906de06e..5402bf3b21 100644
--- a/app/client/src/components/propertyControls/DropDownControl.tsx
+++ b/app/client/src/components/propertyControls/DropDownControl.tsx
@@ -6,9 +6,14 @@ import { DropdownOption } from "components/ads/Dropdown";
 class DropDownControl extends BaseControl<DropDownControlProps> {
   render() {
     let defaultSelected: DropdownOption = {
-      label: "No results.",
+      label: "No selection.",
       value: undefined,
     };
+    if (this.props.defaultValue) {
+      defaultSelected = this.props.options.find(
+        (option) => option.value === this.props.defaultValue,
+      );
+    }
 
     const selected: DropdownOption = this.props.options.find(
       (option) => option.value === this.props.propertyValue,
@@ -51,6 +56,7 @@ class DropDownControl extends BaseControl<DropDownControlProps> {
 
 export interface DropDownControlProps extends ControlProps {
   options: any[];
+  defaultValue?: string;
   placeholderText: string;
   propertyValue: string;
   optionWidth?: string;
diff --git a/app/client/src/components/propertyControls/IconTabControl.tsx b/app/client/src/components/propertyControls/IconTabControl.tsx
index 4646c5c626..d2bbee97bc 100644
--- a/app/client/src/components/propertyControls/IconTabControl.tsx
+++ b/app/client/src/components/propertyControls/IconTabControl.tsx
@@ -6,7 +6,7 @@ import IconTabsComponent, {
 
 class IconTabControl extends BaseControl<IconTabControlProps> {
   selectOption = (value: string) => {
-    const { propertyValue, defaultValue } = this.props;
+    const { defaultValue, propertyValue } = this.props;
     if (propertyValue === value) {
       this.updateProperty(this.props.propertyName, defaultValue);
     } else {
@@ -14,7 +14,7 @@ class IconTabControl extends BaseControl<IconTabControlProps> {
     }
   };
   render() {
-    const { propertyValue, options } = this.props;
+    const { options, propertyValue } = this.props;
     return (
       <IconTabsComponent
         options={options}
diff --git a/app/client/src/components/propertyControls/InputTextControl.tsx b/app/client/src/components/propertyControls/InputTextControl.tsx
index 545629c6f7..f4d441229b 100644
--- a/app/client/src/components/propertyControls/InputTextControl.tsx
+++ b/app/client/src/components/propertyControls/InputTextControl.tsx
@@ -14,8 +14,6 @@ export function InputText(props: {
   label: string;
   value: string;
   onChange: (event: React.ChangeEvent<HTMLTextAreaElement> | string) => void;
-  isValid: boolean;
-  errorMessage?: string;
   evaluatedValue?: any;
   expected?: string;
   placeholder?: string;
@@ -25,15 +23,13 @@ export function InputText(props: {
   hideEvaluatedValue?: boolean;
 }) {
   const {
-    errorMessage,
-    expected,
-    value,
-    isValid,
-    onChange,
-    placeholder,
     dataTreePath,
     evaluatedValue,
+    expected,
     hideEvaluatedValue,
+    onChange,
+    placeholder,
+    value,
   } = props;
 
   return (
@@ -48,10 +44,6 @@ export function InputText(props: {
           value: value,
           onChange: onChange,
         }}
-        meta={{
-          error: isValid ? "" : errorMessage,
-          touched: true,
-        }}
         mode={EditorModes.TEXT_WITH_BINDING}
         placeholder={placeholder}
         size={EditorSize.EXTENDED}
@@ -65,26 +57,22 @@ export function InputText(props: {
 class InputTextControl extends BaseControl<InputControlProps> {
   render() {
     const {
+      additionalAutoComplete,
+      dataTreePath,
+      defaultValue,
       expected,
-      propertyValue,
-      isValid,
+      hideEvaluatedValue,
       label,
       placeholderText,
-      dataTreePath,
-      validationMessage,
-      defaultValue,
-      additionalAutoComplete,
-      hideEvaluatedValue,
+      propertyValue,
     } = this.props;
 
     return (
       <InputText
         additionalAutocomplete={additionalAutoComplete}
         dataTreePath={dataTreePath}
-        errorMessage={validationMessage}
         expected={expected}
         hideEvaluatedValue={hideEvaluatedValue}
-        isValid={isValid}
         label={label}
         onChange={this.onTextChange}
         placeholder={placeholderText}
diff --git a/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx b/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx
index fd49fbc6ed..fba1e02396 100644
--- a/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx
+++ b/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx
@@ -39,6 +39,8 @@ const StyledOptionControlInputGroup = styled(StyledInputGroup)`
   margin-bottom: 2px;
   width: 100%;
   padding-left: 30px;
+  padding-right: 60px;
+  text-overflow: ellipsis;
   &&& {
     input {
       padding-left: 24px;
@@ -93,12 +95,12 @@ function ColumnControlComponent(props: RenderComponentProps) {
   const [value, setValue] = useState(props.item.label);
 
   const {
-    updateOption,
-    onEdit,
-    item,
     deleteOption,
-    toggleVisibility,
     index,
+    item,
+    onEdit,
+    toggleVisibility,
+    updateOption,
   } = props;
   const [visibility, setVisibility] = useState(item.isVisible);
   const debouncedUpdate = debounce(updateOption, 1000);
diff --git a/app/client/src/components/propertyControls/StepControl.tsx b/app/client/src/components/propertyControls/StepControl.tsx
index 3659b0f22e..28d4225aef 100644
--- a/app/client/src/components/propertyControls/StepControl.tsx
+++ b/app/client/src/components/propertyControls/StepControl.tsx
@@ -25,7 +25,7 @@ class StepControl extends BaseControl<StepControlProps> {
   };
 
   render() {
-    const { min, max, steps, displayFormat } = this.getStepTypeControls();
+    const { displayFormat, max, min, steps } = this.getStepTypeControls();
     return (
       <StepComponent
         displayFormat={displayFormat}
diff --git a/app/client/src/components/propertyControls/TabControl.tsx b/app/client/src/components/propertyControls/TabControl.tsx
index 074263af64..64c567015d 100644
--- a/app/client/src/components/propertyControls/TabControl.tsx
+++ b/app/client/src/components/propertyControls/TabControl.tsx
@@ -66,7 +66,7 @@ type RenderComponentProps = {
 };
 
 function TabControlComponent(props: RenderComponentProps) {
-  const { deleteOption, updateOption, item, index } = props;
+  const { deleteOption, index, item, updateOption } = props;
   const debouncedUpdate = debounce(updateOption, 1000);
   const handleChange = useCallback(() => props.onEdit && props.onEdit(index), [
     index,
diff --git a/app/client/src/components/stories/FilePicker.stories.tsx b/app/client/src/components/stories/FilePicker.stories.tsx
index 8fd569b06a..f9edcec2bc 100644
--- a/app/client/src/components/stories/FilePicker.stories.tsx
+++ b/app/client/src/components/stories/FilePicker.stories.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import FilePicker, { CloudinaryUploader } from "../ads/FilePicker";
+import FilePicker, { CloudinaryUploader, FileType } from "../ads/FilePicker";
 
 export default {
   title: "FilePicker",
@@ -12,6 +12,15 @@ function ShowUploadedFile(data: any) {
 
 export const withDynamicProps = () => (
   <FilePicker
+    fileType={FileType.IMAGE}
+    fileUploader={CloudinaryUploader}
+    onFileUploaded={(data) => ShowUploadedFile(data)}
+  />
+);
+
+export const withJsonInputType = () => (
+  <FilePicker
+    fileType={FileType.JSON}
     fileUploader={CloudinaryUploader}
     onFileUploaded={(data) => ShowUploadedFile(data)}
   />
diff --git a/app/client/src/components/utils/CollapseComponent.tsx b/app/client/src/components/utils/CollapseComponent.tsx
index 933b90fe79..198eec7bad 100644
--- a/app/client/src/components/utils/CollapseComponent.tsx
+++ b/app/client/src/components/utils/CollapseComponent.tsx
@@ -5,17 +5,18 @@ import { Collapse, Icon } from "@blueprintjs/core";
 
 const CollapseWrapper = styled.div`
   position: relative;
-  border-top: 1px solid #ffffff2e;
-  padding: 12px;
+  margin-top: ${(props) => props.theme.spaces[3]}px;
   .collapse-title {
-    color: ${Colors.CADET_BLUE};
+    color: ${Colors.TROUT_DARK};
     letter-spacing: 0.04em;
     text-transform: uppercase;
     font-weight: 500;
     font-size: 12px;
     line-height: 16px;
     display: flex;
-    justify-content: space-between;
+    gap: 4px;
+    cursor: pointer;
+    /* justify-content: space-between; */
     .icon {
       transition: transform 0.3s;
       cursor: pointer;
@@ -24,8 +25,11 @@ const CollapseWrapper = styled.div`
       }
     }
   }
-  .inner-content {
-    margin-top: 12px;
+  && .bp3-collapse-body {
+    position: relative;
+    border: none;
+    box-shadow: none;
+    padding: 0;
   }
 `;
 
@@ -34,7 +38,7 @@ function CollapseComponent(props: {
   title?: string;
   isOpen?: boolean;
 }) {
-  const [open, toggleOpen] = React.useState(true);
+  const [open, toggleOpen] = React.useState(false);
   const handleIsOpen = () => {
     toggleOpen(!open);
   };
@@ -43,13 +47,12 @@ function CollapseComponent(props: {
   }
   return (
     <CollapseWrapper>
-      <div className="collapse-title">
+      <div className="collapse-title" onClick={handleIsOpen}>
         {props.title}
         <Icon
           className={`icon ${!open ? "collapse" : ""}`}
           icon="chevron-down"
           iconSize={16}
-          onClick={handleIsOpen}
         />
       </div>
       <Collapse isOpen={open} keepChildrenMounted>
diff --git a/app/client/src/configs/index.ts b/app/client/src/configs/index.ts
index fa580394d0..7ce9f30e0f 100644
--- a/app/client/src/configs/index.ts
+++ b/app/client/src/configs/index.ts
@@ -42,6 +42,8 @@ export type INJECTED_CONFIGS = {
   mailEnabled: boolean;
   disableTelemetry: boolean;
   cloudServicesBaseUrl: string;
+  googleRecaptchaSiteKey: string;
+  onboardingFormEnabled: boolean;
 };
 declare global {
   interface Window {
@@ -94,7 +96,7 @@ const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
       (process.env.REACT_APP_CLIENT_LOG_LEVEL as
         | "debug"
         | "error"
-        | undefined) || "debug",
+        | undefined) || "error",
     google: process.env.REACT_APP_GOOGLE_MAPS_API_KEY || "",
     enableTNCPP: process.env.REACT_APP_TNC_PP
       ? process.env.REACT_APP_TNC_PP.length > 0
@@ -115,6 +117,9 @@ const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
       : false,
     disableTelemetry: true,
     cloudServicesBaseUrl: process.env.REACT_APP_CLOUD_SERVICES_BASE_URL || "",
+    googleRecaptchaSiteKey:
+      process.env.REACT_APP_GOOGLE_RECAPTCHA_SITE_KEY || "",
+    onboardingFormEnabled: !!process.env.REACT_APP_SHOW_ONBOARDING_FORM,
   };
 };
 
@@ -165,6 +170,11 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
   );
   const google = getConfig(ENV_CONFIG.google, APPSMITH_FEATURE_CONFIGS.google);
 
+  const googleRecaptchaSiteKey = getConfig(
+    ENV_CONFIG.googleRecaptchaSiteKey,
+    APPSMITH_FEATURE_CONFIGS.googleRecaptchaSiteKey,
+  );
+
   // As the following shows, the config variables can be set using a combination
   // of env variables and injected configs
   const smartLook = getConfig(
@@ -243,6 +253,10 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
       enabled: google.enabled,
       apiKey: google.value,
     },
+    googleRecaptchaSiteKey: {
+      enabled: googleRecaptchaSiteKey.enabled,
+      apiKey: googleRecaptchaSiteKey.value,
+    },
     enableRapidAPI:
       ENV_CONFIG.enableRapidAPI || APPSMITH_FEATURE_CONFIGS.enableRapidAPI,
     enableGithubOAuth:
@@ -269,5 +283,6 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
     cloudServicesBaseUrl:
       ENV_CONFIG.cloudServicesBaseUrl ||
       APPSMITH_FEATURE_CONFIGS.cloudServicesBaseUrl,
+    onboardingFormEnabled: ENV_CONFIG.onboardingFormEnabled,
   };
 };
diff --git a/app/client/src/configs/types.ts b/app/client/src/configs/types.ts
index 7a73abd169..41fde2417f 100644
--- a/app/client/src/configs/types.ts
+++ b/app/client/src/configs/types.ts
@@ -72,4 +72,10 @@ export type AppsmithUIConfigs = {
   commentsTestModeEnabled: boolean;
 
   cloudServicesBaseUrl: string;
+
+  googleRecaptchaSiteKey: {
+    enabled: boolean;
+    apiKey: string;
+  };
+  onboardingFormEnabled: boolean;
 };
diff --git a/app/client/src/constants/ApiEditorConstants.ts b/app/client/src/constants/ApiEditorConstants.ts
index c142a5ca63..61d22b5f6c 100644
--- a/app/client/src/constants/ApiEditorConstants.ts
+++ b/app/client/src/constants/ApiEditorConstants.ts
@@ -37,7 +37,7 @@ export const DEFAULT_API_ACTION_CONFIG: ApiActionConfig = {
   pluginSpecifiedTemplates: [
     {
       // JSON smart substitution
-      value: false,
+      value: true,
     },
   ],
 };
@@ -65,17 +65,11 @@ export const POST_BODY_FORMAT_OPTIONS: Array<{
   { label: ApiContentTypes.RAW, value: "raw" },
 ];
 
-export const POST_BODY_FORMAT_OPTIONS_NO_MULTI_PART = POST_BODY_FORMAT_OPTIONS.filter(
-  (option) => {
-    return option.value !== "multipart/form-data";
-  },
-);
-
 export const POST_BODY_FORMATS = POST_BODY_FORMAT_OPTIONS.map((option) => {
   return option.value;
 });
 
-export const POST_BODY_FORMAT_TITLES_NO_MULTI_PART = POST_BODY_FORMAT_OPTIONS_NO_MULTI_PART.map(
+export const POST_BODY_FORMAT_TITLES = POST_BODY_FORMAT_OPTIONS.map(
   (option) => {
     return { title: option.label, key: option.value };
   },
diff --git a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
index a4534ff617..73e3fa87c6 100644
--- a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
+++ b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
@@ -56,6 +56,7 @@ export enum EventType {
   ON_HOVER = "ON_HOVER",
   ON_TOGGLE = "ON_TOGGLE",
   ON_LOAD = "ON_LOAD",
+  ON_MODAL_CLOSE = "ON_MODAL_CLOSE",
   ON_TEXT_CHANGE = "ON_TEXT_CHANGE",
   ON_SUBMIT = "ON_SUBMIT",
   ON_CHECK_CHANGE = "ON_CHECK_CHANGE",
@@ -71,6 +72,9 @@ export enum EventType {
   ON_VIDEO_END = "ON_VIDEO_END",
   ON_VIDEO_PLAY = "ON_VIDEO_PLAY",
   ON_VIDEO_PAUSE = "ON_VIDEO_PAUSE",
+  ON_RATE_CHANGED = "ON_RATE_CHANGED",
+  ON_IFRAME_URL_CHANGED = "ON_IFRAME_URL_CHANGED",
+  ON_IFRAME_MESSAGE_RECEIVED = "ON_IFRAME_MESSAGE_RECEIVED",
 }
 
 export type ActionType =
@@ -101,7 +105,7 @@ export interface ExecuteErrorPayload extends ErrorActionPayload {
 // Group 1 = datasource (https://www.domain.com)
 // Group 2 = path (/nested/path)
 // Group 3 = params (?param=123&param2=12)
-export const urlGroupsRegexExp = /^(https?:\/{2}\S+?)(\/\S*?)(\?\S*)?$/;
+export const urlGroupsRegexExp = /^(https?:\/{2}\S+?)(\/[\s\S]*?)(\?(?![^{]*})[\s\S]*)?$/;
 
 export const EXECUTION_PARAM_KEY = "executionParams";
 export const EXECUTION_PARAM_REFERENCE_REGEX = /this.params/g;
diff --git a/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts b/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
index 9924dc4954..e8bd302a02 100644
--- a/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
+++ b/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
@@ -23,12 +23,12 @@ export default [
           "Encode query params for all APIs. Also encode form body when Content-Type header is set to x-www-form-encoded",
       },
       {
-        label: "[Beta] Smart JSON Substitution",
+        label: "Smart JSON Substitution",
         configProperty: "actionConfiguration.pluginSpecifiedTemplates[0].value",
         controlType: "CHECKBOX",
         info:
           "Turning on this property fixes the JSON substitution of bindings in API body by adding/removing quotes intelligently and reduces developer errors",
-        initialValue: false,
+        initialValue: true,
       },
       // {
       //   label: "Cache response",
diff --git a/app/client/src/constants/Colors.tsx b/app/client/src/constants/Colors.tsx
index b3e9bbe418..e84c959cde 100644
--- a/app/client/src/constants/Colors.tsx
+++ b/app/client/src/constants/Colors.tsx
@@ -10,6 +10,7 @@ export const Colors: Record<string, string> = {
   MYSTIC: "#E1E8ED",
   AQUA_HAZE: "#EEF2F5",
   GRAY_CHATEAU: "#A2A6A8",
+  DARK_GRAY: "#A9A7A7",
   LIGHT_GREYISH_BLUE: "#B0BFCB",
   SUNGLOW: "#FFCB33",
   SOFT_ORANGE: "#f7c75b",
@@ -29,7 +30,7 @@ export const Colors: Record<string, string> = {
   TUNDORA: "#404040",
   DOVE_GRAY: "#6D6D6D",
   SLATE_GRAY: "#768896",
-  SILVER_CHALICE: "#9F9F9F",
+  SILVER_CHALICE: "#A9A7A7",
   PORCELAIN: "#EBEEF0",
   HIT_GRAY: "#A1ACB3",
   JUNGLE_MIST: "#BCCCD9",
@@ -61,7 +62,7 @@ export const Colors: Record<string, string> = {
   TROUT_DARK: "#535B62",
   ALABASTER: "#F9F8F8",
   WATUSI: "#FFE0D2",
-  GRAY: "#828282",
+  GRAY: "#858282",
   ATHENS_GRAY_DARKER: "#F8F9FA",
   POMEGRANATE: "#F44336",
   RIVER_BED: "#4A545B",
@@ -75,6 +76,11 @@ export const Colors: Record<string, string> = {
   Galliano: "#E0B30E",
   ROYAL_BLUE: "#457AE6",
   ALTO2: "#E0DEDE",
+  SEA_SHELL: "#F1F1F1",
+  DANUBE: "#6A86CE",
+  OPAQ_BLUE: "rgba(106, 134, 206, 0.1)",
+  RATE_ACTIVE: "#FFCB45",
+  RATE_INACTIVE: "#F2F2F2",
 };
 
 export type Color = typeof Colors[keyof typeof Colors];
diff --git a/app/client/src/constants/CommentConstants.tsx b/app/client/src/constants/CommentConstants.tsx
index 0f600f06f2..db76d6891f 100644
--- a/app/client/src/constants/CommentConstants.tsx
+++ b/app/client/src/constants/CommentConstants.tsx
@@ -5,4 +5,5 @@ export const COMMENT_EVENTS = {
   INSERT_COMMENT_THREAD: "insert:commentThread",
   INSERT_COMMENT: "insert:comment",
   UPDATE_COMMENT_THREAD: "update:commentThread",
+  UPDATE_COMMENT: "update:comment",
 };
diff --git a/app/client/src/constants/CustomChartConstants.ts b/app/client/src/constants/CustomChartConstants.ts
new file mode 100644
index 0000000000..6b51653a59
--- /dev/null
+++ b/app/client/src/constants/CustomChartConstants.ts
@@ -0,0 +1,118 @@
+export const CUSTOM_CHART_TYPES = [
+  "area2d",
+  "bar2d",
+  "bar3d",
+  "boxandwhisker2d",
+  "candlestick",
+  "chord",
+  "dragnode",
+  "dragarea",
+  "dragcolumn2d",
+  "dragline",
+  "errorbar2d",
+  "errorline",
+  "errorscatter",
+  "funnel",
+  "gantt",
+  "heatmap",
+  "hbullet",
+  "hled",
+  "InverseMSArea",
+  "InverseMSColumn2D",
+  "InverseMSLine",
+  "LogMSColumn2D",
+  "LogMSLine",
+  "MultiAxisLine",
+  "multilevelpie",
+  "overlappedcolumn2d",
+  "overlappedbar2d",
+  "pyramid",
+  "radar",
+  "angulargauge",
+  "realtimearea",
+  "bulb",
+  "realtimecolumn",
+  "cylinder",
+  "HLinearGauge",
+  "realtimeline",
+  "realtimelinedy",
+  "realtimestackedarea",
+  "realtimestackedcolumn",
+  "thermometer",
+  "sankey",
+  "selectscatter",
+  "sparkcolumn",
+  "sparkline",
+  "sparkwinloss",
+  "msstepline",
+  "sunburst",
+  "treemap",
+  "vbullet",
+  "vled",
+  "waterfall2d",
+  "zoomline",
+  "zoomlinedy",
+  "zoomscatter",
+  "column2d",
+  "column3d",
+  "line",
+  "area",
+  "bar2d",
+  "bar3d",
+  "pie2d",
+  "pie3d",
+  "doughnut2d",
+  "doughnut3d",
+  "pareto2d",
+  "pareto3d",
+  "scrollcombidy2d",
+  "scrollcombi2d",
+  "scrollstackedcolumn2d",
+  "scrollmsstackedcolumn2d",
+  "scrollmsstackedcolumn2dlinedy",
+  "scrollstackedbar2d",
+  "scrollarea2d",
+  "scrollline2d",
+  "scrollcolumn2d",
+  "scrollbar2d",
+  "bubble",
+  "scatter",
+  "msstackedcolumn2d",
+  "stackedarea2d",
+  "stackedbar3d",
+  "stackedbar2d",
+  "stackedcolumn3d",
+  "stackedcolumn2d",
+  "msstackedcolumn2dlinedy",
+  "stackedcolumn3dlinedy",
+  "mscolumn3dlinedy",
+  "mscombidy2d",
+  "mscombidy3d",
+  "stackedcolumn3dline",
+  "stackedcolumn2dline",
+  "mscolumnline3d",
+  "mscombi3d",
+  "mscombi2d",
+  "marimekko",
+  "MSArea",
+  "msbar3d",
+  "msbar2d",
+  "msline",
+  "mscolumn3d",
+  "mscolumn2d",
+  "spline",
+  "splinearea",
+  "msspline",
+  "mssplinedy",
+  "mssplinearea",
+  "stackedcolumn2dlinedy",
+  "stackedarea2dlinedy",
+];
+
+export const CUSTOM_CHART_DEFAULT_PARSED = {
+  type: "",
+  dataSource: {
+    chart: {},
+    data: [],
+  },
+};
diff --git a/app/client/src/constants/DefaultTheme.tsx b/app/client/src/constants/DefaultTheme.tsx
index 59051e5f89..34ba46bc0c 100644
--- a/app/client/src/constants/DefaultTheme.tsx
+++ b/app/client/src/constants/DefaultTheme.tsx
@@ -9,10 +9,10 @@ import { JSXElementConstructor } from "react";
 export type FontFamily = typeof FontFamilies[keyof typeof FontFamilies];
 
 const {
-  default: styled,
-  css,
-  keyframes,
   createGlobalStyle,
+  css,
+  default: styled,
+  keyframes,
   ThemeProvider,
 } = styledComponents as styledComponents.ThemedStyledComponentsModule<Theme>;
 
@@ -50,6 +50,34 @@ export const hideScrollbar = css`
   }
 `;
 
+export const thinScrollbar = css`
+  ::-webkit-scrollbar {
+    width: 4px;
+  }
+
+  /* Track */
+  ::-webkit-scrollbar-track {
+    border-radius: 10px;
+  }
+
+  /* Handle */
+  ::-webkit-scrollbar-thumb {
+    background: transparent;
+    border-radius: 10px;
+  }
+  &:hover {
+    ::-webkit-scrollbar-thumb {
+      background: ${Colors.PORCELAIN};
+      border-radius: 10px;
+    }
+  }
+
+  /* Handle on hover */
+  ::-webkit-scrollbar-thumb:hover {
+    background: ${Colors.PORCELAIN};
+  }
+`;
+
 export const truncateTextUsingEllipsis = css`
   text-overflow: ellipsis;
   overflow: hidden;
@@ -289,6 +317,7 @@ type PropertyPaneTheme = {
   height: number;
   dividerColor: Color;
   titleHeight: number;
+  connectionsHeight: number;
 };
 
 export type NestedObjectOrArray<T> =
@@ -316,9 +345,11 @@ export type Theme = {
   propertyPane: PropertyPaneTheme;
   headerHeight: string;
   smallHeaderHeight: string;
+  integrationsPageUnusableHeight: string;
+  backBanner: string;
   homePage: any;
   sidebarWidth: string;
-  canvasPadding: string;
+  canvasBottomPadding: number;
   sideNav: {
     minWidth: number;
     maxWidth: number;
@@ -361,6 +392,7 @@ export type Theme = {
     };
   };
   pageContentWidth: number;
+  tabPanelHeight: number;
   alert: Record<string, { color: Color }>;
   lightningMenu: {
     [Skin.DARK]: {
@@ -530,6 +562,7 @@ type buttonVariant = {
 };
 
 type ColorType = {
+  overlayColor: string;
   button: {
     disabledText: ShadeColor;
   };
@@ -867,6 +900,7 @@ type ColorType = {
     separator: string;
     searchItemHighlight: string;
     searchItemText: string;
+    searchItemSubText: string;
     highlightedTextUnderline: string;
     documentationCtaBackground: string;
     documentationCtaText: string;
@@ -898,11 +932,15 @@ type ColorType = {
     sendButton: string;
     addCommentInputBackground: string;
     pin: string;
-    commentModeButtonIcon: string;
-    commentModeButtonBackground: string;
+    activeModeBackground: string;
+    activeModeIcon: string;
+    modeIcon: string;
     emojiPicker: string;
     resolved: string;
     unresolved: string;
+    resolvedFill: string;
+    unresolvedFill: string;
+    resolvedPath: string;
     childCommentsIndent: string;
     commentBackground: string;
     contextMenuTrigger: string;
@@ -915,6 +953,34 @@ type ColorType = {
     contextMenuTitleHover: ShadeColor;
     appCommentsHeaderTitle: ShadeColor;
     appCommentsClose: ShadeColor;
+    viewLatest: string;
+    commentTime: string;
+    pinId: string;
+    commentsFilter: string;
+    appCommentsHeaderBorder: string;
+    unreadIndicator: string;
+    unreadIndicatorCommentCard: string;
+    pinnedByText: string;
+    pinnedThreadBackground: string;
+    visibleThreadBackground: string;
+    cardOptionsIcon: string;
+    appCommentsPlaceholderText: string;
+    cardHoverBackground: string;
+    introTitle: string;
+    introContent: string;
+    modeIconCircleStroke: string;
+    activeModeIconCircleStroke: string;
+  };
+  mentionSuggestion: {
+    nameText: string;
+    usernameText: string;
+    hover: string;
+  };
+  reactionsComponent: {
+    reactionBackground: string;
+    reactionBackgroundActive: string;
+    text: string;
+    textActive: string;
   };
   treeDropdown: {
     targetBg: string;
@@ -950,6 +1016,9 @@ type ColorType = {
     dropdownSelectBg: ShadeColor;
     multiDropdownBoxHoverBg: ShadeColor;
     iconColor: ShadeColor;
+    ctaTextColor: string;
+    ctaBackgroundColor: string;
+    ctaLearnMoreTextColor: string;
   };
   scrollbar: string;
   scrollbarBG: string;
@@ -960,6 +1029,9 @@ type ColorType = {
     label: string;
     entity: string;
     entityLink: string;
+    inspectElement: {
+      color: string;
+    };
     floatingButton: {
       background: string;
       color: string;
@@ -990,9 +1062,53 @@ type ColorType = {
     background: string;
   };
   mentionsInput: Record<string, string>;
+  showcaseCarousel: Record<string, string>;
+  displayImageUpload: Record<string, string>;
+  notifications: Record<string, string>;
+  widgetGroupingContextMenu: {
+    border: string;
+    actionActiveBg: string;
+  };
+};
+
+const notifications = {
+  time: "#858282",
+  listHeaderTitle: "#090707",
+  markAllAsReadButtonBackground: "#f0f0f0",
+  markAllAsReadButtonText: "#716E6E",
+  unreadIndicator: "#F86A2B",
+  bellIndicator: "#E22C2C",
+  label: "#858282",
+};
+
+const displayImageUpload = {
+  background: "#AEBAD9",
+  label: "#457AE6",
+};
+
+const showcaseCarousel = {
+  activeStepDot: "#F86A2B",
+  inactiveStepDot: "#FEEDE5",
+};
+
+const reactionsComponent = {
+  reactionBackground: lightShades[2],
+  reactionBackgroundActive: "#FEEDE5",
+  text: lightShades[7],
+  textActive: "#BF4109",
+  borderActive: "#BF4109",
+};
+
+const mentionSuggestion = {
+  nameText: "#090707",
+  usernameText: "#716E6E",
+  hover: "#EBEBEB",
 };
 
 const comments = {
+  introTitle: "#090707",
+  introContent: "#716E6E",
+  commentsFilter: "#6A86CE",
   profileUserName: darkShades[11],
   threadTitle: darkShades[8],
   commentBody: darkShades[8],
@@ -1003,11 +1119,13 @@ const comments = {
   sendButton: "#6A86CE",
   addCommentInputBackground: "#FAFAFA",
   pin: "#EF4141",
-  commentModeButtonIcon: "#6A86CE",
-  commentModeButtonBackground: "#262626",
+  activeModeBackground: "#090707",
   emojiPicker: lightShades[5],
-  resolved: Colors.GREEN,
+  resolved: Colors.BLACK,
   unresolved: lightShades[5],
+  resolvedFill: Colors.BLACK,
+  unresolvedFill: "transparent",
+  resolvedPath: Colors.WHITE,
   childCommentsIndent: lightShades[13],
   commentBackground: lightShades[2],
   contextMenuTrigger: darkShades[6],
@@ -1020,6 +1138,22 @@ const comments = {
   contextMenuTitleHover: darkShades[11],
   appCommentsHeaderTitle: darkShades[11],
   appCommentsClose: lightShades[15],
+  viewLatest: "#F86A2B",
+  commentTime: lightShades[7],
+  pinId: lightShades[8],
+  appCommentsHeaderBorder: lightShades[3],
+  unreadIndicator: "#E00D0D",
+  unreadIndicatorCommentCard: "#F86A2B",
+  pinnedByText: lightShades[7],
+  pinnedThreadBackground: "#FFFAE9",
+  visibleThreadBackground: "#FBEED0",
+  cardOptionsIcon: "#777272",
+  appCommentsPlaceholderText: lightShades[8],
+  activeModeIcon: "#F0F0F0",
+  modeIcon: "#6D6D6D",
+  cardHoverBackground: "#FAFAFA",
+  modeIconCircleStroke: "#222222",
+  activeModeIconCircleStroke: "#090707",
 };
 
 const auth: any = {
@@ -1063,6 +1197,7 @@ const globalSearch = {
   separator: "#424242",
   searchItemHighlight: "#fff",
   searchItemText: "rgba(255, 255, 255, 0.6)",
+  searchItemSubText: "rgba(255, 255, 255, 0.4)",
   highlightedTextUnderline: "#03B365",
   helpBarText: "#C2C2C2",
   documentationCtaBackground: "rgba(3, 179, 101, 0.1)",
@@ -1086,9 +1221,16 @@ const mentionsInput = {
   focusedItemBackground: "#cee4e5",
   itemBorderBottom: "#cee4e5",
   mentionBackground: "#cee4e5",
+  mentionsInviteBtnPlusIcon: "#6A86CE",
 };
 
 export const dark: ColorType = {
+  overlayColor: "#090707cc",
+  notifications,
+  displayImageUpload,
+  showcaseCarousel,
+  mentionSuggestion,
+  reactionsComponent,
   mentionsInput,
   helpModal,
   globalSearch,
@@ -1496,6 +1638,9 @@ export const dark: ColorType = {
     dropdownSelectBg: darkShades[2],
     multiDropdownBoxHoverBg: darkShades[0],
     iconColor: darkShades[5],
+    ctaTextColor: "#202223",
+    ctaBackgroundColor: "rgb(248, 106, 43, 0.1)",
+    ctaLearnMoreTextColor: "#f86a2b",
   },
   scrollbar: getColorWithOpacity(Colors.LIGHT_GREY, 0.5),
   scrollbarBG: getColorWithOpacity(Colors.CODE_GRAY, 0.5),
@@ -1515,6 +1660,9 @@ export const dark: ColorType = {
       errorCount: "#F22B2B",
       noErrorCount: "#03B365",
     },
+    inspectElement: {
+      color: "#D4D4D4",
+    },
     blankState: {
       color: "#D4D4D4",
       shortcut: "#D4D4D4",
@@ -1531,15 +1679,29 @@ export const dark: ColorType = {
       backgroundColor: "#291B1D",
     },
   },
+  widgetGroupingContextMenu: {
+    border: "#69b5ff",
+    actionActiveBg: "#e1e1e1",
+  },
 };
 
 export const light: ColorType = {
+  overlayColor: "#090707cc",
+  notifications,
+  displayImageUpload,
+  showcaseCarousel,
+  mentionSuggestion,
+  reactionsComponent,
   mentionsInput,
   helpModal,
   globalSearch,
   comments: {
     ...comments,
-    commentModeButtonBackground: "#FAFAFA",
+    activeModeBackground: "#EBEBEB",
+    activeModeIcon: "#4B4848",
+    modeIcon: "#858282",
+    modeIconCircleStroke: "#fff",
+    activeModeIconCircleStroke: "#EBEBEB",
   },
   selected: lightShades[12],
   header: {
@@ -1945,6 +2107,9 @@ export const light: ColorType = {
     dropdownSelectBg: lightShades[14],
     multiDropdownBoxHoverBg: lightShades[11],
     iconColor: lightShades[5],
+    ctaTextColor: "#202223",
+    ctaBackgroundColor: "rgb(248, 106, 43, 0.1)",
+    ctaLearnMoreTextColor: "#f86a2b",
   },
   scrollbar: getColorWithOpacity(Colors.CHARCOAL, 0.5),
   scrollbarBG: "transparent",
@@ -1964,8 +2129,11 @@ export const light: ColorType = {
       errorCount: "#F22B2B",
       noErrorCount: "#03B365",
     },
+    inspectElement: {
+      color: "#090707",
+    },
     blankState: {
-      color: "#716e6e",
+      color: "#090707",
       shortcut: "black",
     },
     info: {
@@ -1980,6 +2148,10 @@ export const light: ColorType = {
       backgroundColor: "rgba(242, 43, 43, 0.08)",
     },
   },
+  widgetGroupingContextMenu: {
+    border: "#69b5ff",
+    actionActiveBg: "#e1e1e1",
+  },
 };
 
 export const theme: Theme = {
@@ -2056,7 +2228,7 @@ export const theme: Theme = {
     },
     btnSmall: {
       fontSize: 11,
-      lineHeight: 13,
+      lineHeight: 12,
       letterSpacing: 0.4,
       fontWeight: 600,
     },
@@ -2110,6 +2282,7 @@ export const theme: Theme = {
   propertyPane: {
     width: 270,
     titleHeight: 40,
+    connectionsHeight: 30,
     height: 600,
     dividerColor: Colors.MAKO,
   },
@@ -2151,7 +2324,7 @@ export const theme: Theme = {
     paneTextUnderline: Colors.LIGHT_GREYISH_BLUE,
     paneSectionLabel: Colors.CADET_BLUE,
     navBG: Colors.SHARK,
-    grid: Colors.TROUT,
+    grid: Colors.ALTO2,
     containerBorder: Colors.FRENCH_PASS,
     menuButtonBGInactive: Colors.JUNGLE_MIST,
     menuIconColorInactive: Colors.OXFORD_BLUE,
@@ -2229,7 +2402,9 @@ export const theme: Theme = {
   },
   headerHeight: "48px",
   smallHeaderHeight: "35px",
-  canvasPadding: "20px 0 200px 0",
+  integrationsPageUnusableHeight: "182px",
+  backBanner: "30px",
+  canvasBottomPadding: 200,
   sideNav: {
     maxWidth: 220,
     minWidth: 50,
@@ -2283,6 +2458,7 @@ export const theme: Theme = {
     },
   },
   pageContentWidth: 1224,
+  tabPanelHeight: 34,
   alert: {
     info: {
       color: Colors.AZURE_RADIANCE,
diff --git a/app/client/src/constants/FieldExpectedValue.ts b/app/client/src/constants/FieldExpectedValue.ts
index 6ae293519e..0bbd33cc4f 100644
--- a/app/client/src/constants/FieldExpectedValue.ts
+++ b/app/client/src/constants/FieldExpectedValue.ts
@@ -135,7 +135,6 @@ const FIELD_VALUES: Record<
     allowedFileTypes: "Array<string>",
     isRequired: "boolean",
     isVisible: "boolean",
-    uploadedFileUrls: "string",
     // onFilesSelected: "Function Call",
   },
   CHECKBOX_WIDGET: {
@@ -166,10 +165,35 @@ const FIELD_VALUES: Record<
     isVisible: "boolean",
   },
   LIST_WIDGET: {
-    items: "Array<Object>",
+    listData: "Array<Object>",
     isVisible: "boolean",
     gridGap: "number",
   },
+  RATE_WIDGET: {
+    maxCount: "number",
+    defaultRate: "number",
+    activeColor: "string",
+    inactiveColor: "string",
+    size: "RATE_SMALL | RATE_MEDIUM | RATE_LARGE",
+    tooltips: "Array<string>",
+    isVisible: "boolean",
+    isDisabled: "boolean",
+  },
+  IFRAME_WIDGET: {
+    source: "string",
+    title: "string",
+    borderOpacity: "number",
+    borderWidth: "number",
+  },
+  DIVIDER_WIDGET: {
+    orientation: "string",
+    capType: "string",
+    capSide: "number",
+    isVisible: "boolean",
+    strokeStyle: "solid | dashed | dotted",
+    dividerColor: "string",
+    thickness: "number",
+  },
 };
 
 export default FIELD_VALUES;
diff --git a/app/client/src/constants/HelpConstants.ts b/app/client/src/constants/HelpConstants.ts
index ecd9087c09..7aa8807616 100644
--- a/app/client/src/constants/HelpConstants.ts
+++ b/app/client/src/constants/HelpConstants.ts
@@ -41,7 +41,7 @@ export const HelpMap = {
   },
   DROP_DOWN_WIDGET: {
     path: "/widget-reference/dropdown",
-    searchKey: "Dropdown",
+    searchKey: "Select",
   },
   RADIO_GROUP_WIDGET: {
     path: "/widget-reference/radio",
@@ -115,6 +115,18 @@ export const HelpMap = {
     path: "/widget-reference/switch",
     searchKey: "Switch",
   },
+  RATE_WIDGET: {
+    path: "/widget-reference/rate",
+    searchKey: "Rate",
+  },
+  IFRAME_WIDGET: {
+    path: "/widget-reference/iframe",
+    searchKey: "Iframe",
+  },
+  DIVIDER_WIDGET: {
+    path: "/widget-reference/divider",
+    searchKey: "Divider",
+  },
 };
 
 export const HelpBaseURL = "https://docs.appsmith.com";
diff --git a/app/client/src/constants/Layers.tsx b/app/client/src/constants/Layers.tsx
index 7942685514..89030d6a0c 100644
--- a/app/client/src/constants/Layers.tsx
+++ b/app/client/src/constants/Layers.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-enum Indices {
+export enum Indices {
   Layer0,
   Layer1,
   Layer2,
@@ -9,18 +9,45 @@ enum Indices {
   Layer5,
   Layer6,
   Layer7,
+  Layer8,
+  Layer9,
+  Layer21 = 21,
   LayerMax = 99999,
 }
 
 export const Layers = {
   dropZone: Indices.Layer0,
+
   dragPreview: Indices.Layer1,
-  widgetName: Indices.Layer2,
+  // All Widgets Parent layer
+  positionedWidget: Indices.Layer1,
+  // Modal needs to higher than other widgets.
+  modalWidget: Indices.Layer2,
+  // Dropdown portaled to the canvas
+  dropdownWidget: Indices.Layer2,
+  // dropdown portaled to Modal Container with higher index than Overlay
+  dropdownModalWidget: Indices.Layer21,
+  selectedWidget: Indices.Layer2,
+  // Layers when dragging
+  animatedSnappingDropZone: Indices.Layer2,
+
+  animatedDropZone: Indices.Layer3,
+  // Must be higher than any widget
+  widgetName: Indices.Layer3,
   apiPane: Indices.Layer3,
+  // Propane needs to match sidebar to show propane on top side bar.
+  // Sidebar needs to be more than modal so that u can use side bar whilst u have the modal showing up on the canvas.
+  sideBar: Indices.Layer3,
+  propertyPane: Indices.Layer3,
+
   help: Indices.Layer4,
+  contextMenu: Indices.Layer4,
   dynamicAutoComplete: Indices.Layer5,
   debugger: Indices.Layer6,
   productUpdates: Indices.Layer7,
+  portals: Indices.Layer8,
+  header: Indices.Layer9,
+  appComments: Indices.Layer9,
   max: Indices.LayerMax,
 };
 
diff --git a/app/client/src/constants/PropertyControlConstants.tsx b/app/client/src/constants/PropertyControlConstants.tsx
index abcfe209eb..ebef9908ea 100644
--- a/app/client/src/constants/PropertyControlConstants.tsx
+++ b/app/client/src/constants/PropertyControlConstants.tsx
@@ -1,5 +1,6 @@
 import { getPropertyControlTypes } from "components/propertyControls";
 import { VALIDATION_TYPES } from "constants/WidgetValidation";
+import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 const ControlTypes = getPropertyControlTypes();
 export type ControlType = typeof ControlTypes[keyof typeof ControlTypes];
 
@@ -48,6 +49,7 @@ export type PropertyPaneControlConfig = {
   additionalAutoComplete?: (
     props: any,
   ) => Record<string, Record<string, unknown>>;
+  evaluationSubstitutionType?: EvaluationSubstitutionType;
 };
 
 export type PropertyPaneConfig =
diff --git a/app/client/src/constants/ReduxActionConstants.tsx b/app/client/src/constants/ReduxActionConstants.tsx
index 9fc10fd0c2..a28980fc84 100644
--- a/app/client/src/constants/ReduxActionConstants.tsx
+++ b/app/client/src/constants/ReduxActionConstants.tsx
@@ -9,6 +9,51 @@ export const ReduxSagaChannels: { [key: string]: string } = {
 };
 
 export const ReduxActionTypes: { [key: string]: string } = {
+  INCREMENT_COMMENT_THREAD_UNREAD_COUNT:
+    "INCREMENT_COMMENT_THREAD_UNREAD_COUNT",
+  DECREMENT_COMMENT_THREAD_UNREAD_COUNT:
+    "DECREMENT_COMMENT_THREAD_UNREAD_COUNT",
+  FETCH_UNREAD_COMMENT_THREADS_COUNT_REQUEST:
+    "FETCH_UNREAD_COMMENT_THREADS_COUNT_REQUEST",
+  FETCH_UNREAD_COMMENT_THREADS_COUNT_SUCCESS:
+    "FETCH_UNREAD_COMMENT_THREADS_COUNT_SUCCESS",
+  MARK_NOTIFICATION_AS_READ_REQUEST: "MARK_NOTIFICATION_AS_READ_REQUEST",
+  MARK_NOTIFICATION_AS_READ_SUCCESS: "MARK_NOTIFICATION_AS_READ_SUCCESS",
+  FETCH_UNREAD_NOTIFICATIONS_COUNT_REQUEST:
+    "FETCH_UNREAD_NOTIFICATIONS_COUNT_REQUEST",
+  FETCH_UNREAD_NOTIFICATIONS_COUNT_SUCCESS:
+    "FETCH_UNREAD_NOTIFICATIONS_COUNT_SUCCESS",
+  RESET_NOTIFICATIONS: "RESET_NOTIFICATIONS",
+  MARK_ALL_NOTIFICATIONS_AS_READ_REQUEST:
+    "MARK_ALL_NOTIFICATIONS_AS_READ_REQUEST",
+  MARK_ALL_NOTIFICATIONS_AS_READ_SUCCESS:
+    "MARK_ALL_NOTIFICATIONS_AS_READ_SUCCESS",
+  SET_IS_NOTIFICATIONS_LIST_VISIBLE: "SET_IS_NOTIFICATIONS_LIST_VISIBLE",
+  NEW_NOTIFICATION_EVENT: "NEW_NOTIFICATION_EVENT",
+  FETCH_NOTIFICATIONS_REQUEST: "FETCH_NOTIFICATIONS_REQUEST",
+  FETCH_NOTIFICATIONS_SUCCESS: "FETCH_NOTIFICATIONS_SUCCESS",
+  SET_SHOW_APP_INVITE_USERS_MODAL: "SET_SHOW_APP_INVITE_USERS_MODAL",
+  UPDATE_COMMENT_EVENT: "UPDATE_COMMENT_EVENT",
+  ADD_COMMENT_REACTION: "ADD_COMMENT_REACTION",
+  REMOVE_COMMENT_REACTION: "REMOVE_COMMENT_REACTION",
+  UPLOAD_PROFILE_PHOTO: "UPLOAD_PROFILE_PHOTO",
+  REMOVE_PROFILE_PHOTO: "REMOVE_PROFILE_PHOTO",
+  HIDE_COMMENTS_INTRO_CAROUSEL: "HIDE_COMMENTS_INTRO_CAROUSEL",
+  SHOW_COMMENTS_INTRO_CAROUSEL: "SHOW_COMMENTS_INTRO_CAROUSEL",
+  PROCEED_TO_NEXT_TOUR_STEP: "PROCEED_TO_NEXT_TOUR_STEP",
+  SET_ACTIVE_TOUR: "SET_ACTIVE_TOUR",
+  RESET_ACTIVE_TOUR: "RESET_ACTIVE_TOUR",
+  SET_ACTIVE_TOUR_INDEX: "SET_ACTIVE_TOUR_INDEX",
+  SET_ARE_COMMENTS_ENABLED: "SET_ARE_COMMENTS_ENABLED",
+  DELETE_THREAD_REQUEST: "DELETE_THREAD_REQUEST",
+  DELETE_THREAD_SUCCESS: "DELETE_THREAD_SUCCESS",
+  EDIT_COMMENT_REQUEST: "EDIT_COMMENT_REQUEST",
+  EDIT_COMMENT_SUCCESS: "EDIT_COMMENT_SUCCESS",
+  MARK_THREAD_AS_READ_REQUEST: "MARK_THREAD_AS_READ_REQUEST",
+  SET_VISIBLE_THREAD: "SET_VISIBLE_THREAD",
+  RESET_VISIBLE_THREAD: "RESET_VISIBLE_THREAD",
+  SET_APP_COMMENTS_FILTER: "SET_APP_COMMENTS_FILTER",
+  SET_SHOULD_SHOW_RESOLVED_COMMENTS: "SET_SHOULD_SHOW_RESOLVED_COMMENTS",
   DELETE_COMMENT_REQUEST: "DELETE_COMMENT_REQUEST",
   DELETE_COMMENT_SUCCESS: "DELETE_COMMENT_SUCCESS",
   PIN_COMMENT_THREAD_REQUEST: "PIN_COMMENT_THREAD_REQUEST",
@@ -50,6 +95,7 @@ export const ReduxActionTypes: { [key: string]: string } = {
   REPORT_ERROR: "REPORT_ERROR",
   FLUSH_ERRORS: "FLUSH_ERRORS",
   FLUSH_AND_REDIRECT: "FLUSH_AND_REDIRECT",
+  REDIRECT_TO_NEW_INTEGRATIONS: "REDIRECT_TO_NEW_INTEGRATIONS",
   SAFE_CRASH_APPSMITH: "SAFE_CRASH_APPSMITH",
   SAFE_CRASH_APPSMITH_REQUEST: "SAFE_CRASH_APPSMITH_REQUEST",
   INIT_CANVAS_LAYOUT: "INIT_CANVAS_LAYOUT",
@@ -62,6 +108,8 @@ export const ReduxActionTypes: { [key: string]: string } = {
   LOAD_WIDGET_PANE: "LOAD_WIDGET_PANE",
   ZOOM_IN_CANVAS: "ZOOM_IN_CANVAS",
   ZOOM_OUT_CANVAS: "ZOOM_OUT_CANVAS",
+  START_CANVAS_SELECTION: "START_CANVAS_SELECTION",
+  STOP_CANVAS_SELECTION: "STOP_CANVAS_SELECTION",
   UNDO_CANVAS_ACTION: "UNDO_CANVAS_ACTION",
   REDO_CANVAS_ACTION: "REDO_CANVAS_ACTION",
   LOAD_WIDGET_CONFIG: "LOAD_WIDGET_CONFIG",
@@ -75,6 +123,7 @@ export const ReduxActionTypes: { [key: string]: string } = {
   DEBUGGER_ERROR_LOG: "DEBUGGER_ERROR_LOG",
   DEBUGGER_UPDATE_ERROR_LOG: "DEBUGGER_UPDATE_ERROR_LOG",
   DEBUGGER_UPDATE_ERROR_LOGS: "DEBUGGER_UPDATE_ERROR_LOGS",
+  DEBUGGER_ERROR_ANALYTICS: "DEBUGGER_ERROR_ANALYTICS",
   CLEAR_DEBUGGER_LOGS: "CLEAR_DEBUGGER_LOGS",
   SHOW_DEBUGGER: "SHOW_DEBUGGER",
   SET_THEME: "SET_THEME",
@@ -84,6 +133,7 @@ export const ReduxActionTypes: { [key: string]: string } = {
   REMOVE_PAGE_WIDGET: "REMOVE_PAGE_WIDGET",
   LOAD_API_RESPONSE: "LOAD_API_RESPONSE",
   LOAD_QUERY_RESPONSE: "LOAD_QUERY_RESPONSE",
+  RUN_ACTION_SHORTCUT_REQUEST: "RUN_ACTION_SHORTCUT_REQUEST",
   RUN_ACTION_INIT: "RUN_ACTION_INIT",
   RUN_ACTION_REQUEST: "RUN_ACTION_REQUEST",
   RUN_ACTION_SUCCESS: "RUN_ACTION_SUCCESS",
@@ -101,6 +151,8 @@ export const ReduxActionTypes: { [key: string]: string } = {
   WIDGET_MOVE: "WIDGET_MOVE",
   WIDGET_RESIZE: "WIDGET_RESIZE",
   WIDGET_DELETE: "WIDGET_DELETE",
+  WIDGET_BULK_DELETE: "WIDGET_BULK_DELETE",
+  WIDGET_SINGLE_DELETE: "WIDGET_SINGLE_DELETE",
   SHOW_PROPERTY_PANE: "SHOW_PROPERTY_PANE",
   UPDATE_CANVAS_LAYOUT: "UPDATE_CANVAS_LAYOUT",
   UPDATE_WIDGET_PROPERTY_REQUEST: "UPDATE_WIDGET_PROPERTY_REQUEST",
@@ -147,6 +199,10 @@ export const ReduxActionTypes: { [key: string]: string } = {
   ONBOARDING_CREATE_APPLICATION: "ONBOARDING_CREATE_APPLICATION",
   FETCH_DATASOURCES_INIT: "FETCH_DATASOURCES_INIT",
   FETCH_DATASOURCES_SUCCESS: "FETCH_DATASOURCES_SUCCESS",
+  FETCH_MOCK_DATASOURCES_INIT: "FETCH_MOCK_DATASOURCES_INIT",
+  FETCH_MOCK_DATASOURCES_SUCCESS: "FETCH_MOCK_DATASOURCES_SUCCESS",
+  ADD_MOCK_DATASOURCES_INIT: "ADD_MOCK_DATASOURCES_INIT",
+  ADD_MOCK_DATASOURCES_SUCCESS: "ADD_MOCK_DATASOURCES_SUCCESS",
   SAVE_DATASOURCE_NAME: "SAVE_DATASOURCE_NAME",
   SAVE_DATASOURCE_NAME_SUCCESS: "SAVE_DATASOURCE_NAME_SUCCESS",
   CREATE_DATASOURCE_INIT: "CREATE_DATASOURCE_INIT",
@@ -188,7 +244,6 @@ export const ReduxActionTypes: { [key: string]: string } = {
   PUBLISH_APPLICATION_SUCCESS: "PUBLISH_APPLICATION_SUCCESS",
   CHANGE_APPVIEW_ACCESS_INIT: "CHANGE_APPVIEW_ACCESS_INIT",
   CHANGE_APPVIEW_ACCESS_SUCCESS: "CHANGE_APPVIEW_ACCESS_SUCCESS",
-  CHANGE_APPVIEW_ACCESS_ERROR: "CHANGE_APPVIEW_ACCESS_ERROR",
   CREATE_PAGE_INIT: "CREATE_PAGE_INIT",
   CREATE_PAGE_SUCCESS: "CREATE_PAGE_SUCCESS",
   FETCH_PAGE_LIST_INIT: "FETCH_PAGE_LIST_INIT",
@@ -225,6 +280,7 @@ export const ReduxActionTypes: { [key: string]: string } = {
   RESET_PASSWORD_VERIFY_TOKEN_SUCCESS: "RESET_PASSWORD_VERIFY_TOKEN_SUCCESS",
   RESET_PASSWORD_VERIFY_TOKEN_INIT: "RESET_PASSWORD_VERIFY_TOKEN_INIT",
   EXECUTE_PAGE_LOAD_ACTIONS: "EXECUTE_PAGE_LOAD_ACTIONS",
+  EXECUTE_PAGE_LOAD_ACTIONS_COMPLETE: "EXECUTE_PAGE_LOAD_ACTIONS_COMPLETE",
   SWITCH_ORGANIZATION_INIT: "SWITCH_ORGANIZATION_INIT",
   SWITCH_ORGANIZATION_SUCCESS: "SWITCH_ORGANIZATION_SUCCESS",
   FETCH_ORG_ROLES_INIT: "FETCH_ORG_ROLES_INIT",
@@ -238,6 +294,7 @@ export const ReduxActionTypes: { [key: string]: string } = {
   UPLOAD_ORG_LOGO: "UPLOAD_ORG_LOGO",
   REMOVE_ORG_LOGO: "REMOVE_ORG_LOGO",
   SAVING_ORG_INFO: "SAVING_ORG_INFO",
+  SET_LAST_UPDATED_TIME: "SET_LAST_UPDATED_TIME",
   SET_CURRENT_ORG: "SET_CURRENT_ORG",
   SET_CURRENT_ORG_ID: "SET_CURRENT_ORG_ID",
   FETCH_CURRENT_ORG: "FETCH_CURRENT_ORG",
@@ -255,7 +312,14 @@ export const ReduxActionTypes: { [key: string]: string } = {
   INVITED_USER_SIGNUP_SUCCESS: "INVITED_USER_SIGNUP_SUCCESS",
   INVITED_USER_SIGNUP_INIT: "INVITED_USER_SIGNUP_INIT",
   DISABLE_WIDGET_DRAG: "DISABLE_WIDGET_DRAG",
+  SELECT_WIDGET_INIT: "SELECT_WIDGET_INIT",
+  SHIFT_SELECT_WIDGET_INIT: "SHIFT_SELECT_WIDGET_INIT",
   SELECT_WIDGET: "SELECT_WIDGET",
+  SELECT_MULTIPLE_WIDGETS: "SELECT_MULTIPLE_WIDGETS",
+  SELECT_MULTIPLE_WIDGETS_INIT: "SELECT_MULTIPLE_WIDGETS_INIT",
+  SELECT_ALL_WIDGETS_IN_CANVAS_INIT: "SELECT_ALL_WIDGETS_IN_CANVAS_INIT",
+  DESELECT_WIDGETS: "DESELECT_WIDGETS",
+  SELECT_WIDGETS: "SELECT_WIDGETS",
   FOCUS_WIDGET: "FOCUS_WIDGET",
   SET_WIDGET_DRAGGING: "SET_WIDGET_DRAGGING",
   SET_WIDGET_RESIZING: "SET_WIDGET_RESIZING",
@@ -339,6 +403,7 @@ export const ReduxActionTypes: { [key: string]: string } = {
   FETCH_ALL_ROLES_INIT: "FETCH_ALL_ROLES_INIT",
   DELETE_ORG_USER_INIT: "DELETE_ORG_USER_INIT",
   DELETE_ORG_USER_SUCCESS: "DELETE_ORG_USER_SUCCESS",
+  LEAVE_ORG_INIT: "LEAVE_ORG_INIT",
   CHANGE_ORG_USER_ROLE_INIT: "CHANGE_ORG_USER_ROLE_INIT",
   CHANGE_ORG_USER_ROLE_SUCCESS: "CHANGE_ORG_USER_ROLE_SUCCESS",
   UPDATE_USER_DETAILS_INIT: "UPDATE_USER_DETAILS_INIT",
@@ -389,6 +454,8 @@ export const ReduxActionTypes: { [key: string]: string } = {
   CURRENT_APPLICATION_LAYOUT_UPDATE: "CURRENT_APPLICATION_LAYOUT_UPDATE",
   FORK_APPLICATION_INIT: "FORK_APPLICATION_INIT",
   FORK_APPLICATION_SUCCESS: "FORK_APPLICATION_SUCCESS",
+  IMPORT_APPLICATION_INIT: "IMPORT_APPLICATION_INIT",
+  IMPORT_APPLICATION_SUCCESS: "IMPORT_APPLICATION_SUCCESS",
   SET_WIDGET_LOADING: "SET_WIDGET_LOADING",
   SET_GLOBAL_SEARCH_QUERY: "SET_GLOBAL_SEARCH_QUERY",
   TOGGLE_SHOW_GLOBAL_SEARCH_MODAL: "TOGGLE_SHOW_GLOBAL_SEARCH_MODAL",
@@ -396,6 +463,7 @@ export const ReduxActionTypes: { [key: string]: string } = {
   RESET_UNREAD_RELEASES_COUNT: "RESET_UNREAD_RELEASES_COUNT",
   SET_LOADING_ENTITIES: "SET_LOADING_ENTITIES",
   RESET_CURRENT_APPLICATION: "RESET_CURRENT_APPLICATION",
+  SELECT_WIDGETS_IN_AREA: "SELECT_WIDGETS_IN_AREA",
   RESET_APPLICATION_WIDGET_STATE_REQUEST:
     "RESET_APPLICATION_WIDGET_STATE_REQUEST",
   SAAS_GET_OAUTH_ACCESS_TOKEN: "SAAS_GET_OAUTH_ACCESS_TOKEN",
@@ -405,11 +473,28 @@ export const ReduxActionTypes: { [key: string]: string } = {
   SET_RECENT_ENTITIES: "SET_RECENT_ENTITIES",
   RESET_RECENT_ENTITIES: "RESET_RECENT_ENTITIES",
   UPDATE_API_ACTION_BODY_CONTENT_TYPE: "UPDATE_API_ACTION_BODY_CONTENT_TYPE",
+  EXECUTE_COMMAND: "EXECUTE_COMMAND",
 };
 
 export type ReduxActionType = typeof ReduxActionTypes[keyof typeof ReduxActionTypes];
 
 export const ReduxActionErrorTypes: { [key: string]: string } = {
+  FETCH_NOTIFICATIONS_ERROR: "FETCH_NOTIFICATIONS_ERROR",
+  MARK_ALL_NOTIFICAIONS_AS_READ_ERROR: "MARK_ALL_NOTIFICAIONS_AS_READ_ERROR",
+  FETCH_UNREAD_NOTIFICATIONS_COUNT_ERROR:
+    "FETCH_UNREAD_NOTIFICATIONS_COUNT_ERROR",
+  MARK_NOTIFICATION_AS_READ_ERROR: "MARK_NOTIFICATION_AS_READ_ERROR",
+  CREATE_COMMENT_THREAD_ERROR: "CREATE_COMMENT_THREAD_ERROR",
+  ADD_COMMENT_TO_THREAD_ERROR: "ADD_COMMENT_TO_THREAD_ERROR",
+  FETCH_APPLICATION_COMMENTS_ERROR: "FETCH_APPLICATION_COMMENTS_ERROR",
+  SET_COMMENT_RESOLUTION_ERROR: "SET_COMMENT_RESOLUTION_ERROR",
+  PIN_COMMENT_THREAD_ERROR: "PIN_COMMENT_THREAD_ERROR",
+  DELETE_COMMENT_ERROR: "DELETE_COMMENT_ERROR",
+  MARK_THREAD_AS_READ_ERROR: "MARK_THREAD_AS_READ_ERROR",
+  EDIT_COMMENT_ERROR: "EDIT_COMMENT_ERROR",
+  DELETE_COMMENT_THREAD_ERROR: "DELETE_COMMENT_THREAD_ERROR",
+  ADD_COMMENT_REACTION_ERROR: "ADD_COMMENT_REACTION_ERROR",
+  DELETE_COMMENT_REACTION_ERROR: "DELETE_COMMENT_REACTION_ERROR",
   INITIALIZE_APPSMITH_ERROR: "INITIALIZE_APPSMITH_ERROR",
   API_ERROR: "API_ERROR",
   WIDGET_DELETE_ERROR: "WIDGET_DELETE_ERROR",
@@ -421,7 +506,6 @@ export const ReduxActionErrorTypes: { [key: string]: string } = {
   WIDGET_ADD_CHILD_ERROR: "WIDGET_ADD_CHILD_ERROR",
   FETCH_PAGE_ERROR: "FETCH_PAGE_ERROR",
   SAVE_PAGE_ERROR: "SAVE_PAGE_ERROR",
-  DELETE_ORG_USER_ERROR: "DELETE_ORG_USER_ERROR",
   FETCH_WIDGET_CARDS_ERROR: "FETCH_WIDGET_CARDS_ERROR",
   WIDGET_OPERATION_ERROR: "WIDGET_OPERATION_ERROR",
   FETCH_PROPERTY_PANE_CONFIGS_ERROR: "FETCH_PROPERTY_PANE_CONFIGS_ERROR",
@@ -435,6 +519,8 @@ export const ReduxActionErrorTypes: { [key: string]: string } = {
   RUN_ACTION_ERROR: "RUN_ACTION_ERROR",
   EXECUTE_ACTION_ERROR: "EXECUTE_ACTION_ERROR",
   FETCH_DATASOURCES_ERROR: "FETCH_DATASOURCES_ERROR",
+  FETCH_MOCK_DATASOURCES_ERROR: "FETCH_MOCK_DATASOURCES_ERROR",
+  ADD_MOCK_DATASOURCES_ERROR: "ADD_MOCK_DATASOURCES_ERROR",
   SEARCH_APIORPROVIDERS_ERROR: "SEARCH_APIORPROVIDERS_ERROR",
   UPDATE_DATASOURCE_ERROR: "UPDATE_DATASOURCE_ERROR",
   SAVE_DATASOURCE_NAME_ERROR: "SAVE_DATASOURCE_NAME_ERROR",
@@ -497,6 +583,7 @@ export const ReduxActionErrorTypes: { [key: string]: string } = {
   SAVE_ACTION_NAME_ERROR: "SAVE_ACTION_NAME_ERROR",
   FETCH_USER_APPLICATIONS_ORGS_ERROR: "FETCH_USER_APPLICATIONS_ORGS_ERROR",
   FORK_APPLICATION_ERROR: "FORK_APPLICATION_ERROR",
+  IMPORT_APPLICATION_ERROR: "IMPORT_APPLICATION_ERROR",
   FETCH_ALL_USERS_ERROR: "FETCH_ALL_USERS_ERROR",
   FETCH_ALL_ROLES_ERROR: "FETCH_ALL_ROLES_ERROR",
   UPDATE_USER_DETAILS_ERROR: "UPDATE_USER_DETAILS_ERROR",
@@ -509,6 +596,8 @@ export const ReduxActionErrorTypes: { [key: string]: string } = {
   PASTE_COPIED_WIDGET_ERROR: "PASTE_COPIED_WIDGET_ERROR",
   WIDGET_ADD_CHILDREN_ERROR: "WIDGET_ADD_CHILDREN_ERROR",
   FAILED_CORRECTING_BINDING_PATHS: "FAILED_CORRECTING_BINDING_PATHS",
+  DELETE_ORG_USER_ERROR: "DELETE_ORG_USER_ERROR",
+  CHANGE_APPVIEW_ACCESS_ERROR: "CHANGE_APPVIEW_ACCESS_ERROR",
 };
 
 export const ReduxFormActionTypes: { [key: string]: string } = {
diff --git a/app/client/src/constants/ThirdPartyConstants.tsx b/app/client/src/constants/ThirdPartyConstants.tsx
index 9672955d90..c9f8112d05 100644
--- a/app/client/src/constants/ThirdPartyConstants.tsx
+++ b/app/client/src/constants/ThirdPartyConstants.tsx
@@ -1 +1,3 @@
 export type ENVIRONMENT = "PRODUCTION" | "STAGING" | "LOCAL";
+export const S3_BUCKET_URL =
+  "https://s3.us-east-2.amazonaws.com/assets.appsmith.com";
diff --git a/app/client/src/constants/TourSteps.tsx b/app/client/src/constants/TourSteps.tsx
new file mode 100644
index 0000000000..83191eef20
--- /dev/null
+++ b/app/client/src/constants/TourSteps.tsx
@@ -0,0 +1,8 @@
+import { TourType } from "entities/Tour";
+import commentsTourSteps from "comments/tour/commentsTourSteps";
+
+const TourStepsByType = {
+  [TourType.COMMENTS_TOUR]: commentsTourSteps,
+};
+
+export default TourStepsByType;
diff --git a/app/client/src/constants/WidgetConstants.tsx b/app/client/src/constants/WidgetConstants.tsx
index 8d477e78d7..97eee7a9a7 100644
--- a/app/client/src/constants/WidgetConstants.tsx
+++ b/app/client/src/constants/WidgetConstants.tsx
@@ -27,6 +27,9 @@ export enum WidgetTypes {
   LIST_WIDGET = "LIST_WIDGET",
   SWITCH_WIDGET = "SWITCH_WIDGET",
   TABS_MIGRATOR_WIDGET = "TABS_MIGRATOR_WIDGET",
+  RATE_WIDGET = "RATE_WIDGET",
+  IFRAME_WIDGET = "IFRAME_WIDGET",
+  DIVIDER_WIDGET = "DIVIDER_WIDGET",
 }
 
 export type WidgetType = keyof typeof WidgetTypes;
@@ -96,19 +99,24 @@ export const layoutConfigurations: LayoutConfigurations = {
   FLUID: { minWidth: -1, maxWidth: -1 },
 };
 
+export const LATEST_PAGE_VERSION = 27;
+
 export const GridDefaults = {
   DEFAULT_CELL_SIZE: 1,
   DEFAULT_WIDGET_WIDTH: 200,
   DEFAULT_WIDGET_HEIGHT: 100,
-  DEFAULT_GRID_COLUMNS: 16,
-  DEFAULT_GRID_ROW_HEIGHT: 40,
+  DEFAULT_GRID_COLUMNS: 64,
+  DEFAULT_GRID_ROW_HEIGHT: 10,
   CANVAS_EXTENSION_OFFSET: 2,
 };
 
-export const CONTAINER_GRID_PADDING =
-  (GridDefaults.DEFAULT_GRID_ROW_HEIGHT / 2) * 0.8;
+// Note: Widget Padding + Container Padding === DEFAULT_GRID_ROW_HEIGHT to gracefully lose one row when a container is used,
+// which wud allow the user to place elements centered inside a container(columns are rendered proportionaly so it take cares of itselves).
 
-export const WIDGET_PADDING = (GridDefaults.DEFAULT_GRID_ROW_HEIGHT / 2) * 0.2;
+export const CONTAINER_GRID_PADDING =
+  GridDefaults.DEFAULT_GRID_ROW_HEIGHT * 0.6;
+
+export const WIDGET_PADDING = GridDefaults.DEFAULT_GRID_ROW_HEIGHT * 0.4;
 
 export const WIDGET_CLASSNAME_PREFIX = "WIDGET_";
 export const MAIN_CONTAINER_WIDGET_ID = "0";
@@ -142,3 +150,17 @@ export const TEXT_SIZES = {
 };
 
 export type TextSize = keyof typeof TextSizes;
+
+export enum RateSizes {
+  SMALL = "SMALL",
+  MEDIUM = "MEDIUM",
+  LARGE = "LARGE",
+}
+
+export const RATE_SIZES = {
+  SMALL: 12,
+  MEDIUM: 16,
+  LARGE: 21,
+};
+
+export type RateSize = keyof typeof RateSizes;
diff --git a/app/client/src/constants/WidgetValidation.ts b/app/client/src/constants/WidgetValidation.ts
index d1e0837c78..af3ca9e249 100644
--- a/app/client/src/constants/WidgetValidation.ts
+++ b/app/client/src/constants/WidgetValidation.ts
@@ -10,6 +10,7 @@ export enum VALIDATION_TYPES {
   BOOLEAN = "BOOLEAN",
   OBJECT = "OBJECT",
   ARRAY = "ARRAY",
+  ARRAY_OPTIONAL = "ARRAY_OPTIONAL",
   TABLE_DATA = "TABLE_DATA",
   OPTIONS_DATA = "OPTIONS_DATA",
   DATE_ISO_STRING = "DATE_ISO_STRING",
@@ -31,6 +32,9 @@ export enum VALIDATION_TYPES {
   ROW_INDICES = "ROW_INDICES",
   IMAGE = "IMAGE",
   TABS_DATA = "TABS_DATA",
+  RATE_DEFAULT_RATE = "RATE_DEFAULT_RATE",
+  RATE_MAX_COUNT = "RATE_MAX_COUNT",
+  COLOR_PICKER_TEXT = "COLOR_PICKER_TEXT",
 }
 
 export type ValidationResponse = {
diff --git a/app/client/src/constants/defs/forge.json b/app/client/src/constants/defs/forge.json
new file mode 100644
index 0000000000..876bb7a773
--- /dev/null
+++ b/app/client/src/constants/defs/forge.json
@@ -0,0 +1,11263 @@
+{
+  "!name": "../../node-forge/lib/aes.js",
+  "!define": {
+    "forge.aes.Algorithm.prototype.initialize.!0": {
+      "key": {
+        "!type": "string",
+        "!span": "2009[76:4]-2012[76:7]"
+      },
+      "decrypt": {
+        "!type": "bool",
+        "!span": "2023[77:4]-2030[77:11]"
+      }
+    },
+    "forge.aes.Algorithm.!1": {
+      "prototype": {
+        "encrypt": {},
+        "afterFinish": {},
+        "generateHashTable": {},
+        "generateSubHashTable": {},
+        "start": "modes.gcm.prototype.start",
+        "decrypt": "modes.gcm.prototype.decrypt",
+        "multiply": "modes.gcm.prototype.multiply",
+        "pow": "modes.gcm.prototype.pow",
+        "tableMultiply": "modes.gcm.prototype.tableMultiply",
+        "ghash": "modes.gcm.prototype.ghash"
+      }
+    },
+    "forge.aes.Algorithm.!1.prototype.encrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "19360[681:12]-19364[681:16]"
+      }
+    },
+    "forge.aes.Algorithm.!1.prototype.afterFinish.!1": {
+      "decrypt": {
+        "!type": "bool",
+        "!span": "6102[201:10]-6109[201:17]"
+      },
+      "overflow": {
+        "!type": "number",
+        "!span": "6182[204:10]-6190[204:18]",
+        "!doc": "get # of bytes that won't fill a block"
+      }
+    },
+    "forge.aes.Algorithm.!1.!0": {
+      "blockSize": {
+        "!type": "number",
+        "!span": "4691[159:4]-4700[159:13]"
+      },
+      "cipher": {
+        "encrypt": "modes.gcm.cipher.encrypt",
+        "decrypt": "modes.gcm.cipher.decrypt"
+      }
+    },
+    "forge.asn1.create.!ret": {
+      "tagClass": {
+        "!type": "number",
+        "!span": "8212[212:4]-8220[212:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "8236[213:4]-8240[213:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "8252[214:4]-8263[214:15]"
+      },
+      "composed": {
+        "!type": "bool",
+        "!span": "8282[215:4]-8290[215:12]"
+      },
+      "read": {
+        "!type": "number",
+        "!span": "19652[653:42]-19656[655:1]"
+      },
+      "original": "_fromDer.!ret"
+    },
+    "forge.asn1.validate.!1": {
+      "name": {
+        "!type": "string",
+        "!span": "12601[409:2]-12605[409:6]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "12637[410:2]-12645[410:10]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "12671[411:2]-12675[411:6]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "12699[412:2]-12710[412:13]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "12720[413:2]-12731[413:13]"
+      },
+      "value": {
+        "0": {
+          "name": {
+            "!type": "string",
+            "!span": "12777[415:4]-12781[415:8]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "12823[416:4]-12831[416:12]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "12859[417:4]-12863[417:8]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "12888[418:4]-12899[418:15]"
+          },
+          "capture": {
+            "!type": "string",
+            "!span": "12912[419:4]-12919[419:11]"
+          }
+        },
+        "1": {
+          "name": {
+            "!type": "string",
+            "!span": "13002[422:4]-13006[422:8]",
+            "!doc": "Name (subject) (RDNSequence)"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "13048[423:4]-13056[423:12]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "13084[424:4]-13088[424:8]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "13114[425:4]-13125[425:15]"
+          },
+          "captureAsn1": {
+            "!type": "string",
+            "!span": "13137[426:4]-13148[426:15]"
+          }
+        },
+        "2": {
+          "name": {
+            "!type": "string",
+            "!span": "6195[231:2]-6199[231:6]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "6227[232:2]-6235[232:10]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "6261[233:2]-6265[233:6]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "6289[234:2]-6300[234:13]"
+          },
+          "captureAsn1": {
+            "!type": "string",
+            "!span": "6310[235:2]-6321[235:13]"
+          },
+          "value": {
+            "0": {
+              "name": {
+                "!type": "string",
+                "!span": "6363[237:4]-6367[237:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "6417[238:4]-6425[238:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "6453[239:4]-6457[239:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "6483[240:4]-6494[240:15]"
+              },
+              "value": {
+                "<i>": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "6522[242:6]-6526[242:10]"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "6567[243:6]-6575[243:14]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "6605[244:6]-6609[244:10]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "6632[245:6]-6643[245:17]"
+                  },
+                  "capture": {
+                    "!type": "string",
+                    "!span": "6658[246:6]-6665[246:13]"
+                  }
+                }
+              }
+            },
+            "1": {
+              "name": {
+                "!type": "string",
+                "!span": "6724[250:4]-6728[250:8]",
+                "!doc": "subjectPublicKey"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "6775[251:4]-6783[251:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "6811[252:4]-6815[252:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "6842[253:4]-6853[253:15]"
+              },
+              "value": {
+                "<i>": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "6904[256:6]-6908[256:10]",
+                    "!doc": "RSAPublicKey"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "6970[257:6]-6978[257:14]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "7008[258:6]-7012[258:10]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "7040[259:6]-7051[259:17]"
+                  },
+                  "optional": {
+                    "!type": "bool",
+                    "!span": "7065[260:6]-7073[260:14]"
+                  },
+                  "captureAsn1": {
+                    "!type": "string",
+                    "!span": "7087[261:6]-7098[261:17]"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "3": {
+          "name": {
+            "!type": "string",
+            "!span": "13245[431:4]-13249[431:8]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "13294[432:4]-13302[432:12]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "13337[433:4]-13341[433:8]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "13350[434:4]-13361[434:15]"
+          },
+          "optional": {
+            "!type": "bool",
+            "!span": "13373[435:4]-13381[435:12]"
+          },
+          "capture": {
+            "!type": "string",
+            "!span": "13393[436:4]-13400[436:11]"
+          },
+          "value": {
+            "<i>": {
+              "name": {
+                "!type": "string",
+                "!span": "13460[438:6]-13464[438:10]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "13511[439:6]-13519[439:14]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "13549[440:6]-13553[440:10]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "13581[441:6]-13592[441:17]"
+              },
+              "value": {
+                "0": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "13624[443:8]-13628[443:12]"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "13682[444:8]-13690[444:16]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "13722[445:8]-13726[445:12]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "13751[446:8]-13762[446:19]"
+                  }
+                },
+                "1": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "13789[448:8]-13793[448:12]"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "13848[449:8]-13856[449:16]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "13888[450:8]-13892[450:12]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "13917[451:8]-13928[451:19]"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "forge.asn1.prettyPrint.!0": {
+      "tagClass": {
+        "!type": "number",
+        "!span": "9228[254:4]-9236[254:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "9256[255:4]-9260[255:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "9276[256:4]-9287[256:15]"
+      },
+      "composed": {
+        "!type": "bool",
+        "!span": "9310[257:4]-9318[257:12]"
+      }
+    },
+    "forge.cipher.algorithms.<i>.!ret": "+forge.des.Algorithm",
+    "forge.cipher.BlockCipher.!0": {
+      "key": {
+        "!type": "string",
+        "!span": "2009[76:4]-2012[76:7]"
+      },
+      "decrypt": {
+        "!type": "bool",
+        "!span": "2023[77:4]-2030[77:11]"
+      }
+    },
+    "forge.cipher.modes.ecb.prototype.unpad.!1": {
+      "decrypt": {
+        "!type": "bool",
+        "!span": "6102[201:10]-6109[201:17]"
+      },
+      "overflow": {
+        "!type": "number",
+        "!span": "6182[204:10]-6190[204:18]",
+        "!doc": "get # of bytes that won't fill a block"
+      }
+    },
+    "forge.cipher.modes.ecb.!0": {
+      "blockSize": {
+        "!type": "number",
+        "!span": "4691[159:4]-4700[159:13]"
+      },
+      "cipher": {
+        "encrypt": "modes.gcm.cipher.encrypt",
+        "decrypt": "modes.gcm.cipher.decrypt"
+      }
+    },
+    "forge.cipher.modes.cfb.prototype.encrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "6987[257:10]-6991[257:14]"
+      }
+    },
+    "forge.cipher.modes.cfb.prototype.decrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "8719[317:10]-8723[317:14]"
+      }
+    },
+    "forge.cipher.modes.ofb.prototype.encrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "11014[400:10]-11018[400:14]"
+      }
+    },
+    "forge.cipher.modes.ctr.prototype.encrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "13308[482:12]-13312[482:16]"
+      }
+    },
+    "forge.cipher.modes.gcm.prototype.encrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "19360[681:12]-19364[681:16]"
+      }
+    },
+    "forge.des.Algorithm.prototype.initialize.!0": {
+      "plugin": {
+        "md": {
+          "create": {}
+        },
+        "formatKey": "forge.random.plugin.formatKey",
+        "formatSeed": "forge.random.plugin.formatSeed",
+        "cipher": "forge.random.plugin.cipher",
+        "increment": "forge.random.plugin.increment"
+      },
+      "reseeds": {
+        "!type": "number",
+        "!span": "1481[48:4]-1488[48:11]",
+        "!doc": "update reseed count"
+      },
+      "generated": {
+        "!type": "number",
+        "!span": "1536[50:4]-1545[50:13]",
+        "!doc": "amount of data generated so far"
+      },
+      "keyBytes": {
+        "!type": "string",
+        "!span": "1582[52:4]-1590[52:12]",
+        "!doc": "get digest for key bytes"
+      },
+      "pools": {
+        "<i>": {
+          "algorithm": {
+            "!type": "string",
+            "!span": "808[38:4]-817[38:13]"
+          },
+          "blockLength": {
+            "!type": "number",
+            "!span": "833[39:4]-844[39:15]"
+          },
+          "digestLength": {
+            "!type": "number",
+            "!span": "854[40:4]-866[40:16]"
+          },
+          "messageLengthSize": {
+            "!type": "number",
+            "!span": "1061[46:4]-1078[46:21]",
+            "!doc": "size of message length in bytes"
+          },
+          "messageLength64": "forge.random.pools.<i>.fullMessageLength",
+          "fullMessageLength": "forge.random.pools.<i>.fullMessageLength",
+          "start": "forge.random.pools.<i>.start",
+          "update": "forge.random.pools.<i>.update",
+          "digest": "forge.random.pools.<i>.digest"
+        }
+      },
+      "pool": {
+        "!type": "number",
+        "!span": "1866[64:6]-1870[64:10]",
+        "!doc": "entropy pools are written to cyclically, starting at index 0"
+      },
+      "seed": "forge.random.seed",
+      "generate": "forge.random.generate",
+      "generateSync": "forge.random.generateSync",
+      "seedFile": "forge.random.seedFile",
+      "seedFileSync": "forge.random.seedFileSync",
+      "collect": "forge.random.collect",
+      "collectInt": "forge.random.collectInt",
+      "registerWorker": "forge.random.registerWorker",
+      "getBytes": "forge.random.getBytes",
+      "getBytesSync": "forge.random.getBytesSync",
+      "createInstance": "forge.random.createInstance"
+    },
+    "forge.des.Algorithm.prototype.initialize.!0.plugin.md.create.!ret": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "808[38:4]-817[38:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "833[39:4]-844[39:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "854[40:4]-866[40:16]"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "1061[46:4]-1078[46:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "messageLength64": "forge.random.pools.<i>.fullMessageLength",
+      "fullMessageLength": "forge.random.pools.<i>.fullMessageLength",
+      "start": "forge.random.pools.<i>.start",
+      "update": "forge.random.pools.<i>.update",
+      "digest": "forge.random.pools.<i>.digest"
+    },
+    "forge.pki.ed25519.generateKeyPair.!0": {
+      "seed": {
+        "!type": "+Float32Array",
+        "!span": "5339[164:43]-5343[164:47]"
+      }
+    },
+    "forge.pki.pbe.generatePkcs12Key.!5": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "2315[98:4]-2324[98:13]",
+        "!doc": "SHA-512 => sha512"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "2372[99:4]-2383[99:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "2394[100:4]-2406[100:16]"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "2611[106:4]-2628[106:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "messageLength128": "_createKDF.!1.fullMessageLength",
+      "fullMessageLength": "_createKDF.!1.fullMessageLength",
+      "start": "_createKDF.!1.start",
+      "update": "_createKDF.!1.update",
+      "digest": "_createKDF.!1.digest"
+    },
+    "forge.pki.pbe.opensslDeriveBytes.!3": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "746[36:4]-755[36:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "768[37:4]-779[37:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "789[38:4]-801[38:16]"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "996[44:4]-1013[44:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "messageLength64": "hash.!0.fullMessageLength",
+      "fullMessageLength": "hash.!0.fullMessageLength",
+      "start": "hash.!0.start",
+      "update": "hash.!0.update",
+      "digest": "hash.!0.digest"
+    },
+    "forge.pki.encryptPrivateKeyInfo.!2": {
+      "legacy": {
+        "!type": "bool",
+        "!span": "4915[152:5]-4921[152:11]"
+      },
+      "algorithm": {
+        "!type": "string",
+        "!span": "4929[152:19]-4938[152:28]"
+      },
+      "saltSize": {
+        "!type": "number",
+        "!span": "6295[196:28]-6303[196:36]"
+      },
+      "count": {
+        "!type": "number",
+        "!span": "6339[198:30]-6344[198:35]"
+      },
+      "prfAlgorithm": {
+        "!type": "string",
+        "!span": "6433[202:5]-6445[202:17]"
+      }
+    },
+    "forge.pki.encryptedPrivateKeyFromPem.!0": {
+      "encode": {},
+      "decode": {}
+    },
+    "forge.pki.encryptedPrivateKeyFromPem.!0.encode.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "27457[901:4]-27461[901:8]"
+      }
+    },
+    "forge.pki.encryptedPrivateKeyFromPem.!0.decode.!ret": {
+      "<i>": {
+        "type": {
+          "!type": "string",
+          "!span": "3012[109:6]-3016[109:10]"
+        },
+        "procType": {
+          "version": {
+            "!type": "string",
+            "!span": "4449[158:26]-4456[158:33]"
+          },
+          "type": {
+            "!type": "string",
+            "!span": "4469[158:46]-4473[158:50]"
+          }
+        },
+        "contentDomain": {
+          "!type": "string",
+          "!span": "3056[111:6]-3069[111:19]",
+          "!doc": "special-case Content-Domain"
+        },
+        "dekInfo": {
+          "algorithm": {
+            "!type": "string",
+            "!span": "4967[168:25]-4976[168:34]"
+          },
+          "parameters": {
+            "!type": "string",
+            "!span": "4989[168:47]-4999[168:57]"
+          }
+        },
+        "headers": {
+          "<i>": {
+            "name": {
+              "!type": "string",
+              "!span": "3797[143:22]-3801[143:26]"
+            },
+            "values": "pem.decode.!ret.<i>.headers.<i>.values"
+          }
+        },
+        "body": {
+          "!type": "string",
+          "!span": "3123[114:6]-3127[114:10]"
+        }
+      }
+    },
+    "forge.pki.privateKeyFromPem.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "19652[656:10]-19656[656:14]"
+      },
+      "e": "+BigInteger",
+      "d": "+BigInteger",
+      "p": "+BigInteger",
+      "q": "+BigInteger",
+      "dP": "+BigInteger",
+      "dQ": "+BigInteger",
+      "qInv": "+BigInteger",
+      "n": "+BigInteger",
+      "decrypt": "_modPow.!1.decrypt",
+      "sign": "_modPow.!1.sign"
+    },
+    "forge.pki.rsa.createKeyPairGenerationState.!ret": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "18660[622:6]-18669[622:15]"
+      },
+      "state": {
+        "!type": "number",
+        "!span": "18688[623:6]-18693[623:11]"
+      },
+      "bits": {
+        "!type": "number",
+        "!span": "18704[624:6]-18708[624:10]"
+      },
+      "eInt": {
+        "!type": "number",
+        "!span": "18738[626:6]-18742[626:10]"
+      },
+      "qBits": {
+        "!type": "number",
+        "!span": "18823[630:6]-18828[630:11]"
+      },
+      "pBits": {
+        "!type": "number",
+        "!span": "18847[631:6]-18852[631:11]"
+      },
+      "pqState": {
+        "!type": "number",
+        "!span": "18880[632:6]-18887[632:13]",
+        "!doc": "store p or q"
+      },
+      "e": "+BigInteger",
+      "p": "+BigInteger",
+      "q": "+BigInteger",
+      "num": "+BigInteger",
+      "keys": {
+        "privateKey": "_modPow.!1",
+        "publicKey": "_publicKeyFromJwk.!ret"
+      },
+      "p1": "+BigInteger",
+      "q1": "+BigInteger",
+      "phi": "+BigInteger",
+      "n": "+BigInteger",
+      "rng": {
+        "nextBytes": "_generateKeyPair.!0.rng.nextBytes"
+      }
+    },
+    "forge.pki.RDNAttributesAsArray.!1": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "753[36:4]-762[36:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "776[37:4]-787[37:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "797[38:4]-809[38:16]"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "1004[44:4]-1021[44:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "messageLength64": "rsa_mgf1.!2.fullMessageLength",
+      "fullMessageLength": "rsa_mgf1.!2.fullMessageLength",
+      "start": "rsa_mgf1.!2.start",
+      "update": "rsa_mgf1.!2.update",
+      "digest": "rsa_mgf1.!2.digest"
+    },
+    "forge.pki.RDNAttributesAsArray.!ret": {
+      "<i>": {
+        "type": {
+          "!type": "string",
+          "!span": "15894[517:10]-15898[517:14]"
+        },
+        "name": {
+          "!type": "string",
+          "!span": "16121[522:12]-16125[522:16]"
+        }
+      }
+    },
+    "forge.pki.CRIAttributesAsArray.!ret": {
+      "<i>": {
+        "type": {
+          "!type": "string",
+          "!span": "17085[558:10]-17089[558:14]"
+        },
+        "name": {
+          "!type": "string",
+          "!span": "17276[563:12]-17280[563:16]"
+        },
+        "extensions": {
+          "<i>": {
+            "id": {
+              "!type": "string",
+              "!span": "45973[1496:4]-45975[1496:6]"
+            },
+            "critical": {
+              "!type": "bool",
+              "!span": "46017[1497:4]-46025[1497:12]"
+            },
+            "name": {
+              "!type": "string",
+              "!span": "46294[1506:6]-46298[1506:10]"
+            },
+            "digitalSignature": {
+              "!type": "bool",
+              "!span": "46788[1522:8]-46804[1522:24]",
+              "!doc": "set flags"
+            },
+            "nonRepudiation": {
+              "!type": "bool",
+              "!span": "46837[1523:8]-46851[1523:22]"
+            },
+            "keyEncipherment": {
+              "!type": "bool",
+              "!span": "46884[1524:8]-46899[1524:23]"
+            },
+            "dataEncipherment": {
+              "!type": "bool",
+              "!span": "46932[1525:8]-46948[1525:24]"
+            },
+            "keyAgreement": {
+              "!type": "bool",
+              "!span": "46981[1526:8]-46993[1526:20]"
+            },
+            "keyCertSign": {
+              "!type": "bool",
+              "!span": "47026[1527:8]-47037[1527:19]"
+            },
+            "cRLSign": {
+              "!type": "bool",
+              "!span": "47070[1528:8]-47077[1528:15]"
+            },
+            "encipherOnly": {
+              "!type": "bool",
+              "!span": "47110[1529:8]-47122[1529:20]"
+            },
+            "decipherOnly": {
+              "!type": "bool",
+              "!span": "47155[1530:8]-47167[1530:20]"
+            },
+            "cA": {
+              "!type": "bool",
+              "!span": "47475[1537:10]-47477[1537:12]"
+            },
+            "pathLenConstraint": {
+              "!type": "number",
+              "!span": "47857[1549:10]-47874[1549:27]"
+            },
+            "<i>": {
+              "!type": "bool",
+              "!span": "48199[1558:12]-48208[1558:21]"
+            },
+            "client": {
+              "!type": "bool",
+              "!span": "48680[1575:8]-48686[1575:14]",
+              "!doc": "set flags"
+            },
+            "server": {
+              "!type": "bool",
+              "!span": "48719[1576:8]-48725[1576:14]"
+            },
+            "email": {
+              "!type": "bool",
+              "!span": "48758[1577:8]-48763[1577:13]"
+            },
+            "objsign": {
+              "!type": "bool",
+              "!span": "48796[1578:8]-48803[1578:15]"
+            },
+            "reserved": {
+              "!type": "bool",
+              "!span": "48836[1579:8]-48844[1579:16]"
+            },
+            "sslCA": {
+              "!type": "bool",
+              "!span": "48877[1580:8]-48882[1580:13]"
+            },
+            "emailCA": {
+              "!type": "bool",
+              "!span": "48915[1581:8]-48922[1581:15]"
+            },
+            "objCA": {
+              "!type": "bool",
+              "!span": "48955[1582:8]-48960[1582:13]"
+            },
+            "altNames": {
+              "<i>": {
+                "type": {
+                  "!type": "number",
+                  "!span": "49364[1597:10]-49368[1597:14]"
+                },
+                "ip": {
+                  "!type": "string",
+                  "!span": "49804[1614:20]-49806[1614:22]",
+                  "!doc": "convert to IPv4/IPv6 string representation"
+                },
+                "oid": {
+                  "!type": "string",
+                  "!span": "49924[1618:20]-49927[1618:23]"
+                }
+              }
+            },
+            "subjectKeyIdentifier": {
+              "!type": "string",
+              "!span": "50253[1628:8]-50273[1628:28]"
+            }
+          }
+        }
+      }
+    },
+    "forge.pki.certificateFromPem.!ret": {
+      "version": {
+        "!type": "number",
+        "!span": "27761[914:7]-27768[914:14]"
+      },
+      "serialNumber": {
+        "!type": "string",
+        "!span": "27784[915:7]-27796[915:19]"
+      },
+      "signatureOid": {
+        "!type": "string",
+        "!span": "27812[916:7]-27824[916:19]"
+      },
+      "siginfo": {
+        "algorithmOid": {
+          "!type": "string",
+          "!span": "27894[919:15]-27906[919:27]"
+        },
+        "parameters": {
+          "hash": {
+            "algorithmOid": {
+              "!type": "string",
+              "!span": "19751[652:8]-19763[652:20]"
+            }
+          },
+          "mgf": {
+            "algorithmOid": {
+              "!type": "string",
+              "!span": "19808[655:8]-19820[655:20]"
+            },
+            "hash": {
+              "algorithmOid": {
+                "!type": "string",
+                "!span": "19862[657:10]-19874[657:22]"
+              }
+            }
+          },
+          "saltLength": {
+            "!type": "number",
+            "!span": "19914[660:6]-19924[660:16]"
+          }
+        }
+      },
+      "issuer": {
+        "hash": {
+          "!type": "string",
+          "!span": "28288[933:14]-28292[933:18]"
+        },
+        "getField": {},
+        "attributes": "pki.RDNAttributesAsArray.!ret",
+        "addField": "pki.certificateFromPem.!ret.issuer.addField"
+      },
+      "subject": {
+        "hash": {
+          "!type": "string",
+          "!span": "28580[944:15]-28584[944:19]"
+        },
+        "attributes": "pki.RDNAttributesAsArray.!ret",
+        "getField": "pki.certificateFromPem.!ret.subject.getField",
+        "addField": "pki.certificateFromPem.!ret.subject.addField"
+      },
+      "extensions": {
+        "<i>": {
+          "id": {
+            "!type": "string",
+            "!span": "45973[1496:4]-45975[1496:6]"
+          },
+          "critical": {
+            "!type": "bool",
+            "!span": "46017[1497:4]-46025[1497:12]"
+          },
+          "name": {
+            "!type": "string",
+            "!span": "46294[1506:6]-46298[1506:10]"
+          },
+          "digitalSignature": {
+            "!type": "bool",
+            "!span": "46788[1522:8]-46804[1522:24]",
+            "!doc": "set flags"
+          },
+          "nonRepudiation": {
+            "!type": "bool",
+            "!span": "46837[1523:8]-46851[1523:22]"
+          },
+          "keyEncipherment": {
+            "!type": "bool",
+            "!span": "46884[1524:8]-46899[1524:23]"
+          },
+          "dataEncipherment": {
+            "!type": "bool",
+            "!span": "46932[1525:8]-46948[1525:24]"
+          },
+          "keyAgreement": {
+            "!type": "bool",
+            "!span": "46981[1526:8]-46993[1526:20]"
+          },
+          "keyCertSign": {
+            "!type": "bool",
+            "!span": "47026[1527:8]-47037[1527:19]"
+          },
+          "cRLSign": {
+            "!type": "bool",
+            "!span": "47070[1528:8]-47077[1528:15]"
+          },
+          "encipherOnly": {
+            "!type": "bool",
+            "!span": "47110[1529:8]-47122[1529:20]"
+          },
+          "decipherOnly": {
+            "!type": "bool",
+            "!span": "47155[1530:8]-47167[1530:20]"
+          },
+          "cA": {
+            "!type": "bool",
+            "!span": "47475[1537:10]-47477[1537:12]"
+          },
+          "pathLenConstraint": {
+            "!type": "number",
+            "!span": "47857[1549:10]-47874[1549:27]"
+          },
+          "<i>": {
+            "!type": "bool",
+            "!span": "48199[1558:12]-48208[1558:21]"
+          },
+          "client": {
+            "!type": "bool",
+            "!span": "48680[1575:8]-48686[1575:14]",
+            "!doc": "set flags"
+          },
+          "server": {
+            "!type": "bool",
+            "!span": "48719[1576:8]-48725[1576:14]"
+          },
+          "email": {
+            "!type": "bool",
+            "!span": "48758[1577:8]-48763[1577:13]"
+          },
+          "objsign": {
+            "!type": "bool",
+            "!span": "48796[1578:8]-48803[1578:15]"
+          },
+          "reserved": {
+            "!type": "bool",
+            "!span": "48836[1579:8]-48844[1579:16]"
+          },
+          "sslCA": {
+            "!type": "bool",
+            "!span": "48877[1580:8]-48882[1580:13]"
+          },
+          "emailCA": {
+            "!type": "bool",
+            "!span": "48915[1581:8]-48922[1581:15]"
+          },
+          "objCA": {
+            "!type": "bool",
+            "!span": "48955[1582:8]-48960[1582:13]"
+          },
+          "altNames": {
+            "<i>": {
+              "type": {
+                "!type": "number",
+                "!span": "49364[1597:10]-49368[1597:14]"
+              },
+              "ip": {
+                "!type": "string",
+                "!span": "49804[1614:20]-49806[1614:22]",
+                "!doc": "convert to IPv4/IPv6 string representation"
+              },
+              "oid": {
+                "!type": "string",
+                "!span": "49924[1618:20]-49927[1618:23]"
+              }
+            }
+          },
+          "subjectKeyIdentifier": {
+            "!type": "string",
+            "!span": "50253[1628:8]-50273[1628:28]"
+          }
+        }
+      },
+      "sign": {},
+      "signatureParameters": {
+        "hash": {
+          "algorithmOid": {
+            "!type": "string",
+            "!span": "19751[652:8]-19763[652:20]"
+          }
+        },
+        "mgf": {
+          "algorithmOid": {
+            "!type": "string",
+            "!span": "19808[655:8]-19820[655:20]"
+          },
+          "hash": {
+            "algorithmOid": {
+              "!type": "string",
+              "!span": "19862[657:10]-19874[657:22]"
+            }
+          }
+        },
+        "saltLength": {
+          "!type": "number",
+          "!span": "19914[660:6]-19924[660:16]"
+        }
+      },
+      "read": {
+        "!type": "number",
+        "!span": "19652[645:18]-19656[645:22]"
+      },
+      "validity": {
+        "notBefore": "+Date",
+        "notAfter": "+Date"
+      },
+      "publicKey": "_publicKeyFromJwk.!ret",
+      "md": "_createKDF.!1",
+      "tbsCertificate": "_fromDer.!ret",
+      "setSubject": "pki.certificateFromPem.!ret.setSubject",
+      "setIssuer": "pki.certificateFromPem.!ret.setIssuer",
+      "setExtensions": "pki.certificateFromPem.!ret.setExtensions",
+      "getExtension": "pki.certificateFromPem.!ret.getExtension",
+      "verify": "pki.certificateFromPem.!ret.verify",
+      "isIssuer": "pki.certificateFromPem.!ret.isIssuer",
+      "issued": "pki.certificateFromPem.!ret.issued",
+      "generateSubjectKeyIdentifier": "pki.certificateFromPem.!ret.generateSubjectKeyIdentifier",
+      "verifySubjectKeyIdentifier": "pki.certificateFromPem.!ret.verifySubjectKeyIdentifier"
+    },
+    "forge.pki.certificateFromPem.!ret.sign.!0": {
+      "version": {
+        "!type": "number",
+        "!span": "54558[1755:6]-54565[1755:13]"
+      },
+      "signatureOid": {
+        "!type": "string",
+        "!span": "54580[1756:6]-54592[1756:18]"
+      },
+      "siginfo": {
+        "algorithmOid": {
+          "!type": "string",
+          "!span": "54659[1759:14]-54671[1759:26]"
+        },
+        "parameters": "_readSignatureParameters.!ret"
+      },
+      "subject": {
+        "hash": {
+          "!type": "string",
+          "!span": "54952[1770:14]-54956[1770:18]"
+        },
+        "attributes": "pki.RDNAttributesAsArray.!ret",
+        "getField": "_dnToAsn1.!0.getField",
+        "addField": "_dnToAsn1.!0.addField"
+      },
+      "publicKey": "_publicKeyFromJwk.!ret",
+      "attributes": "pki.CRIAttributesAsArray.!ret",
+      "md": "_createKDF.!1",
+      "certificationRequestInfo": "_fromDer.!ret",
+      "signatureParameters": "_readSignatureParameters.!ret",
+      "getAttribute": "_getAttribute.!0.getAttribute",
+      "addAttribute": "_getAttribute.!0.addAttribute",
+      "setSubject": "_getAttribute.!0.setSubject",
+      "setAttributes": "_getAttribute.!0.setAttributes",
+      "sign": "_getAttribute.!0.sign",
+      "verify": "_getAttribute.!0.verify"
+    },
+    "forge.pki.getPublicKeyFingerprint.!1": {
+      "type": {
+        "!type": "string",
+        "!span": "37654[1236:56]-37658[1236:60]"
+      }
+    },
+    "forge.pki.certificationRequestFromPem.!ret": {
+      "version": {
+        "!type": "number",
+        "!span": "54558[1755:6]-54565[1755:13]"
+      },
+      "signatureOid": {
+        "!type": "string",
+        "!span": "54580[1756:6]-54592[1756:18]"
+      },
+      "siginfo": {
+        "algorithmOid": {
+          "!type": "string",
+          "!span": "54659[1759:14]-54671[1759:26]"
+        },
+        "parameters": "_readSignatureParameters.!ret"
+      },
+      "subject": {
+        "hash": {
+          "!type": "string",
+          "!span": "54952[1770:14]-54956[1770:18]"
+        },
+        "attributes": "pki.RDNAttributesAsArray.!ret",
+        "getField": "_dnToAsn1.!0.getField",
+        "addField": "_dnToAsn1.!0.addField"
+      },
+      "publicKey": "_publicKeyFromJwk.!ret",
+      "attributes": "pki.CRIAttributesAsArray.!ret",
+      "getAttribute": {},
+      "md": "_createKDF.!1",
+      "certificationRequestInfo": "_fromDer.!ret",
+      "signatureParameters": "_readSignatureParameters.!ret",
+      "addAttribute": "_getAttribute.!0.addAttribute",
+      "setSubject": "_getAttribute.!0.setSubject",
+      "setAttributes": "_getAttribute.!0.setAttributes",
+      "sign": "_getAttribute.!0.sign",
+      "verify": "_getAttribute.!0.verify"
+    },
+    "forge.pki.certificateExtensionsFromAsn1.!0": {
+      "type": {
+        "!type": "number",
+        "!span": "49364[1597:10]-49368[1597:14]"
+      },
+      "ip": {
+        "!type": "string",
+        "!span": "49804[1614:20]-49806[1614:22]",
+        "!doc": "convert to IPv4/IPv6 string representation"
+      },
+      "oid": {
+        "!type": "string",
+        "!span": "49924[1618:20]-49927[1618:23]"
+      }
+    },
+    "forge.pki.certificateExtensionsFromAsn1.!ret": {
+      "<i>": {
+        "id": {
+          "!type": "string",
+          "!span": "45973[1496:4]-45975[1496:6]"
+        },
+        "critical": {
+          "!type": "bool",
+          "!span": "46017[1497:4]-46025[1497:12]"
+        },
+        "name": {
+          "!type": "string",
+          "!span": "46294[1506:6]-46298[1506:10]"
+        },
+        "digitalSignature": {
+          "!type": "bool",
+          "!span": "46788[1522:8]-46804[1522:24]",
+          "!doc": "set flags"
+        },
+        "nonRepudiation": {
+          "!type": "bool",
+          "!span": "46837[1523:8]-46851[1523:22]"
+        },
+        "keyEncipherment": {
+          "!type": "bool",
+          "!span": "46884[1524:8]-46899[1524:23]"
+        },
+        "dataEncipherment": {
+          "!type": "bool",
+          "!span": "46932[1525:8]-46948[1525:24]"
+        },
+        "keyAgreement": {
+          "!type": "bool",
+          "!span": "46981[1526:8]-46993[1526:20]"
+        },
+        "keyCertSign": {
+          "!type": "bool",
+          "!span": "47026[1527:8]-47037[1527:19]"
+        },
+        "cRLSign": {
+          "!type": "bool",
+          "!span": "47070[1528:8]-47077[1528:15]"
+        },
+        "encipherOnly": {
+          "!type": "bool",
+          "!span": "47110[1529:8]-47122[1529:20]"
+        },
+        "decipherOnly": {
+          "!type": "bool",
+          "!span": "47155[1530:8]-47167[1530:20]"
+        },
+        "cA": {
+          "!type": "bool",
+          "!span": "47475[1537:10]-47477[1537:12]"
+        },
+        "pathLenConstraint": {
+          "!type": "number",
+          "!span": "47857[1549:10]-47874[1549:27]"
+        },
+        "<i>": {
+          "!type": "bool",
+          "!span": "48199[1558:12]-48208[1558:21]"
+        },
+        "client": {
+          "!type": "bool",
+          "!span": "48680[1575:8]-48686[1575:14]",
+          "!doc": "set flags"
+        },
+        "server": {
+          "!type": "bool",
+          "!span": "48719[1576:8]-48725[1576:14]"
+        },
+        "email": {
+          "!type": "bool",
+          "!span": "48758[1577:8]-48763[1577:13]"
+        },
+        "objsign": {
+          "!type": "bool",
+          "!span": "48796[1578:8]-48803[1578:15]"
+        },
+        "reserved": {
+          "!type": "bool",
+          "!span": "48836[1579:8]-48844[1579:16]"
+        },
+        "sslCA": {
+          "!type": "bool",
+          "!span": "48877[1580:8]-48882[1580:13]"
+        },
+        "emailCA": {
+          "!type": "bool",
+          "!span": "48915[1581:8]-48922[1581:15]"
+        },
+        "objCA": {
+          "!type": "bool",
+          "!span": "48955[1582:8]-48960[1582:13]"
+        },
+        "subjectKeyIdentifier": {
+          "!type": "string",
+          "!span": "50253[1628:8]-50273[1628:28]"
+        },
+        "altNames": {
+          "<i>": "pki.certificateExtensionsFromAsn1.!0"
+        }
+      }
+    },
+    "forge.pki.certificateExtensionFromAsn1.!ret": {
+      "id": {
+        "!type": "string",
+        "!span": "45973[1496:4]-45975[1496:6]"
+      },
+      "critical": {
+        "!type": "bool",
+        "!span": "46017[1497:4]-46025[1497:12]"
+      },
+      "name": {
+        "!type": "string",
+        "!span": "46294[1506:6]-46298[1506:10]"
+      },
+      "digitalSignature": {
+        "!type": "bool",
+        "!span": "46788[1522:8]-46804[1522:24]",
+        "!doc": "set flags"
+      },
+      "nonRepudiation": {
+        "!type": "bool",
+        "!span": "46837[1523:8]-46851[1523:22]"
+      },
+      "keyEncipherment": {
+        "!type": "bool",
+        "!span": "46884[1524:8]-46899[1524:23]"
+      },
+      "dataEncipherment": {
+        "!type": "bool",
+        "!span": "46932[1525:8]-46948[1525:24]"
+      },
+      "keyAgreement": {
+        "!type": "bool",
+        "!span": "46981[1526:8]-46993[1526:20]"
+      },
+      "keyCertSign": {
+        "!type": "bool",
+        "!span": "47026[1527:8]-47037[1527:19]"
+      },
+      "cRLSign": {
+        "!type": "bool",
+        "!span": "47070[1528:8]-47077[1528:15]"
+      },
+      "encipherOnly": {
+        "!type": "bool",
+        "!span": "47110[1529:8]-47122[1529:20]"
+      },
+      "decipherOnly": {
+        "!type": "bool",
+        "!span": "47155[1530:8]-47167[1530:20]"
+      },
+      "cA": {
+        "!type": "bool",
+        "!span": "47475[1537:10]-47477[1537:12]"
+      },
+      "pathLenConstraint": {
+        "!type": "number",
+        "!span": "47857[1549:10]-47874[1549:27]"
+      },
+      "<i>": {
+        "!type": "bool",
+        "!span": "48199[1558:12]-48208[1558:21]"
+      },
+      "client": {
+        "!type": "bool",
+        "!span": "48680[1575:8]-48686[1575:14]",
+        "!doc": "set flags"
+      },
+      "server": {
+        "!type": "bool",
+        "!span": "48719[1576:8]-48725[1576:14]"
+      },
+      "email": {
+        "!type": "bool",
+        "!span": "48758[1577:8]-48763[1577:13]"
+      },
+      "objsign": {
+        "!type": "bool",
+        "!span": "48796[1578:8]-48803[1578:15]"
+      },
+      "reserved": {
+        "!type": "bool",
+        "!span": "48836[1579:8]-48844[1579:16]"
+      },
+      "sslCA": {
+        "!type": "bool",
+        "!span": "48877[1580:8]-48882[1580:13]"
+      },
+      "emailCA": {
+        "!type": "bool",
+        "!span": "48915[1581:8]-48922[1581:15]"
+      },
+      "objCA": {
+        "!type": "bool",
+        "!span": "48955[1582:8]-48960[1582:13]"
+      },
+      "subjectKeyIdentifier": {
+        "!type": "string",
+        "!span": "50253[1628:8]-50273[1628:28]"
+      },
+      "altNames": {
+        "<i>": "pki.certificateExtensionsFromAsn1.!0"
+      }
+    },
+    "forge.http.createClient.!0": {
+      "url": {
+        "!type": "string",
+        "!span": "12551[397:8]-12554[397:11]"
+      },
+      "socketPool": {
+        "sockets": {
+          "<i>": {
+            "connected": {},
+            "closed": {},
+            "data": {},
+            "error": {},
+            "connect": {},
+            "options": {
+              "request": {
+                "version": {
+                  "!type": "string",
+                  "!span": "25249[872:10]-25256[872:17]"
+                },
+                "body": {
+                  "!type": "string",
+                  "!span": "25382[875:10]-25386[875:14]",
+                  "!doc": "inflate using flash api"
+                },
+                "bodyDeflated": {
+                  "!type": "bool",
+                  "!span": "25421[876:10]-25433[876:22]"
+                },
+                "addCookie": {},
+                "code": {
+                  "!type": "number",
+                  "!span": "28698[994:11]-28702[994:15]"
+                },
+                "message": {
+                  "!type": "string",
+                  "!span": "28719[995:11]-28726[995:18]"
+                },
+                "headerReceived": {
+                  "!type": "bool",
+                  "!span": "28770[997:11]-28784[997:25]",
+                  "!doc": "handle final line, end of header"
+                },
+                "bodyReceived": {
+                  "!type": "bool",
+                  "!span": "28805[998:11]-28817[998:23]",
+                  "!doc": "body received"
+                },
+                "readBodyUntilClose": {
+                  "!type": "bool",
+                  "!span": "34861[1193:15]-34879[1193:33]"
+                },
+                "time": {
+                  "!type": "number",
+                  "!span": "35036[1201:15]-35040[1201:19]"
+                },
+                "aborted": {
+                  "!type": "bool",
+                  "!span": "17397[562:23]-17404[562:30]"
+                },
+                "connectTime": {
+                  "!type": "number",
+                  "!span": "3048[106:13]-3059[106:24]"
+                },
+                "getCookies": {},
+                "fields": {
+                  "<i>": "net.socketPools.<i>.sockets.<i>.options.request.fields.<i>"
+                },
+                "setField": "net.socketPools.<i>.sockets.<i>.options.request.setField",
+                "appendField": "net.socketPools.<i>.sockets.<i>.options.request.appendField",
+                "getField": "net.socketPools.<i>.sockets.<i>.options.request.getField",
+                "toString": "net.socketPools.<i>.sockets.<i>.options.request.toString",
+                "readHeader": "net.socketPools.<i>.sockets.<i>.options.request.readHeader",
+                "readBody": "net.socketPools.<i>.sockets.<i>.options.request.readBody",
+                "abort": "net.socketPools.<i>.sockets.<i>.options.request.abort"
+              },
+              "error": {},
+              "headerReady": {},
+              "bodyReady": {},
+              "response": "net.socketPools.<i>.sockets.<i>.options.request",
+              "connected": "net.socketPools.<i>.sockets.<i>.options.connected",
+              "closed": "net.socketPools.<i>.sockets.<i>.options.closed"
+            },
+            "sending": {
+              "!type": "bool",
+              "!span": "5219[171:3]-5226[171:10]"
+            },
+            "retries": {
+              "!type": "number",
+              "!span": "4067[126:57]-4074[128:3]"
+            },
+            "buffer": "+ByteBuffer",
+            "destroy": "net.socketPools.<i>.sockets.<i>.destroy",
+            "close": "net.socketPools.<i>.sockets.<i>.close",
+            "isConnected": "net.socketPools.<i>.sockets.<i>.isConnected",
+            "send": "net.socketPools.<i>.sockets.<i>.send",
+            "receive": "net.socketPools.<i>.sockets.<i>.receive",
+            "bytesAvailable": "net.socketPools.<i>.sockets.<i>.bytesAvailable"
+          }
+        },
+        "policyPort": {
+          "!type": "number",
+          "!span": "1268[47:4]-1278[47:14]",
+          "!doc": "default policy port"
+        },
+        "handler": "net.socketPools.<i>.handler",
+        "destroy": "net.socketPools.<i>.destroy",
+        "createSocket": "net.socketPools.<i>.createSocket"
+      },
+      "policyPort": {
+        "!type": "number",
+        "!span": "12602[399:8]-12612[399:18]"
+      },
+      "connections": {
+        "!type": "number",
+        "!span": "12709[401:8]-12720[401:19]"
+      },
+      "persistCookies": {
+        "!type": "bool",
+        "!span": "12848[404:8]-12862[404:22]"
+      },
+      "primeTlsSockets": {
+        "!type": "bool",
+        "!span": "12904[405:8]-12919[405:23]"
+      }
+    },
+    "forge.http.createClient.!0.socketPool.sockets.<i>.connected.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "2282[66:10]-2286[66:14]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "2309[67:10]-2323[67:24]"
+      },
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.http.createClient.!0.socketPool.sockets.<i>.closed.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "5447[189:9]-5451[189:13]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "5471[190:9]-5485[190:23]"
+      }
+    },
+    "forge.http.createClient.!0.socketPool.sockets.<i>.data.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "2617[79:8]-2621[79:12]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "2645[80:8]-2659[80:22]"
+      }
+    },
+    "forge.http.createClient.!0.socketPool.sockets.<i>.error.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "3698[131:6]-3702[131:10]"
+      },
+      "message": {
+        "!type": "string",
+        "!span": "3718[132:6]-3725[132:13]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "3744[133:6]-3758[133:20]"
+      }
+    },
+    "forge.http.createClient.!0.socketPool.sockets.<i>.connect.!0": {
+      "host": {
+        "!type": "string",
+        "!span": "3256[129:6]-3260[129:10]"
+      },
+      "policyPort": {
+        "!type": "number",
+        "!span": "3314[131:6]-3324[131:16]"
+      }
+    },
+    "forge.http.createClient.!0.socketPool.sockets.<i>.options.request.addCookie.!0": {
+      "name": {
+        "!type": "string",
+        "!span": "36485[1250:22]-36489[1250:26]"
+      },
+      "value": {
+        "!type": "string",
+        "!span": "36520[1251:22]-36525[1251:27]"
+      },
+      "maxAge": {
+        "!type": "number",
+        "!span": "36921[1261:24]-36927[1261:30]"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "37142[1267:24]-37148[1267:30]"
+      },
+      "httpOnly": {
+        "!type": "bool",
+        "!span": "37237[1270:24]-37245[1270:32]"
+      },
+      "<i>": {
+        "!type": "string",
+        "!span": "37363[1274:26]-37367[1274:30]"
+      },
+      "comment": {
+        "!type": "string",
+        "!span": "20205[673:15]-20212[673:22]",
+        "!doc": "set cookie defaults"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "20445[678:15]-20449[678:19]"
+      },
+      "created": {
+        "!type": "number",
+        "!span": "20583[681:15]-20590[681:22]"
+      }
+    },
+    "forge.http.createClient.!0.socketPool.sockets.<i>.options.error.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "7702[285:6]-7706[285:10]"
+      },
+      "message": {
+        "!type": "string",
+        "!span": "7722[286:6]-7729[286:13]"
+      },
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.http.createClient.!ret": {
+      "url": {
+        "scheme": {
+          "!type": "string",
+          "!span": "59506[2274:4]-59512[2274:10]"
+        },
+        "host": {
+          "!type": "string",
+          "!span": "59524[2275:4]-59528[2275:8]"
+        },
+        "path": {
+          "!type": "string",
+          "!span": "59556[2277:4]-59560[2277:8]"
+        },
+        "fullHost": {
+          "!type": "string",
+          "!span": "59592[2280:8]-59600[2280:16]"
+        }
+      },
+      "policyPort": {
+        "!type": "number",
+        "!span": "13207[467:4]-13217[467:14]",
+        "!doc": "the policy port to use"
+      },
+      "requests": {
+        "<i>": {
+          "request": {
+            "version": {
+              "!type": "string",
+              "!span": "25249[872:10]-25256[872:17]"
+            },
+            "body": {
+              "!type": "string",
+              "!span": "25382[875:10]-25386[875:14]",
+              "!doc": "inflate using flash api"
+            },
+            "bodyDeflated": {
+              "!type": "bool",
+              "!span": "25421[876:10]-25433[876:22]"
+            },
+            "addCookie": {},
+            "code": {
+              "!type": "number",
+              "!span": "28698[994:11]-28702[994:15]"
+            },
+            "message": {
+              "!type": "string",
+              "!span": "28719[995:11]-28726[995:18]"
+            },
+            "headerReceived": {
+              "!type": "bool",
+              "!span": "28770[997:11]-28784[997:25]",
+              "!doc": "handle final line, end of header"
+            },
+            "bodyReceived": {
+              "!type": "bool",
+              "!span": "28805[998:11]-28817[998:23]",
+              "!doc": "body received"
+            },
+            "readBodyUntilClose": {
+              "!type": "bool",
+              "!span": "34861[1193:15]-34879[1193:33]"
+            },
+            "time": {
+              "!type": "number",
+              "!span": "35036[1201:15]-35040[1201:19]"
+            },
+            "aborted": {
+              "!type": "bool",
+              "!span": "17397[562:23]-17404[562:30]"
+            },
+            "connectTime": {
+              "!type": "number",
+              "!span": "3048[106:13]-3059[106:24]"
+            },
+            "getCookies": {},
+            "fields": {
+              "<i>": "net.socketPools.<i>.sockets.<i>.options.request.fields.<i>"
+            },
+            "setField": "net.socketPools.<i>.sockets.<i>.options.request.setField",
+            "appendField": "net.socketPools.<i>.sockets.<i>.options.request.appendField",
+            "getField": "net.socketPools.<i>.sockets.<i>.options.request.getField",
+            "toString": "net.socketPools.<i>.sockets.<i>.options.request.toString",
+            "readHeader": "net.socketPools.<i>.sockets.<i>.options.request.readHeader",
+            "readBody": "net.socketPools.<i>.sockets.<i>.options.request.readBody",
+            "abort": "net.socketPools.<i>.sockets.<i>.options.request.abort"
+          },
+          "error": {},
+          "headerReady": {},
+          "bodyReady": {},
+          "response": "net.socketPools.<i>.sockets.<i>.options.request",
+          "connected": "net.socketPools.<i>.sockets.<i>.options.connected",
+          "closed": "net.socketPools.<i>.sockets.<i>.options.closed"
+        }
+      },
+      "sockets": {
+        "<i>": {
+          "connected": {},
+          "closed": {},
+          "data": {},
+          "error": {},
+          "connect": {},
+          "sending": {
+            "!type": "bool",
+            "!span": "5219[171:3]-5226[171:10]"
+          },
+          "retries": {
+            "!type": "number",
+            "!span": "4067[126:57]-4074[128:3]"
+          },
+          "options": "net.socketPools.<i>.sockets.<i>.options",
+          "buffer": "+ByteBuffer",
+          "destroy": "net.socketPools.<i>.sockets.<i>.destroy",
+          "close": "net.socketPools.<i>.sockets.<i>.close",
+          "isConnected": "net.socketPools.<i>.sockets.<i>.isConnected",
+          "send": "net.socketPools.<i>.sockets.<i>.send",
+          "receive": "net.socketPools.<i>.sockets.<i>.receive",
+          "bytesAvailable": "net.socketPools.<i>.sockets.<i>.bytesAvailable"
+        }
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "13475[477:4]-13481[477:10]",
+        "!doc": "whether or not the connections are secure"
+      },
+      "cookies": {
+        "<i>": {
+          "<i>": {
+            "name": {
+              "!type": "string",
+              "!span": "36485[1250:22]-36489[1250:26]"
+            },
+            "value": {
+              "!type": "string",
+              "!span": "36520[1251:22]-36525[1251:27]"
+            },
+            "maxAge": {
+              "!type": "number",
+              "!span": "36921[1261:24]-36927[1261:30]"
+            },
+            "secure": {
+              "!type": "bool",
+              "!span": "37142[1267:24]-37148[1267:30]"
+            },
+            "httpOnly": {
+              "!type": "bool",
+              "!span": "37237[1270:24]-37245[1270:32]"
+            },
+            "<i>": {
+              "!type": "string",
+              "!span": "37363[1274:26]-37367[1274:30]"
+            },
+            "comment": {
+              "!type": "string",
+              "!span": "20205[673:15]-20212[673:22]",
+              "!doc": "set cookie defaults"
+            },
+            "path": {
+              "!type": "string",
+              "!span": "20445[678:15]-20449[678:19]"
+            },
+            "created": {
+              "!type": "number",
+              "!span": "20583[681:15]-20590[681:22]"
+            }
+          }
+        }
+      },
+      "persistCookies": {
+        "!type": "bool",
+        "!span": "13717[482:4]-13731[482:18]",
+        "!doc": "default to flash storage of cookies"
+      },
+      "getCookie": {},
+      "socketPool": "net.socketPools.<i>",
+      "idle": {
+        "<i>": "net.socketPools.<i>.sockets.<i>"
+      },
+      "send": {},
+      "destroy": "_getStorageId.!0.destroy",
+      "setCookie": "_getStorageId.!0.setCookie",
+      "removeCookie": "_getStorageId.!0.removeCookie",
+      "clearCookies": "_getStorageId.!0.clearCookies"
+    },
+    "forge.http.createClient.!ret.requests.<i>.request.addCookie.!0": {
+      "name": {
+        "!type": "string",
+        "!span": "36485[1250:22]-36489[1250:26]"
+      },
+      "value": {
+        "!type": "string",
+        "!span": "36520[1251:22]-36525[1251:27]"
+      },
+      "maxAge": {
+        "!type": "number",
+        "!span": "36921[1261:24]-36927[1261:30]"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "37142[1267:24]-37148[1267:30]"
+      },
+      "httpOnly": {
+        "!type": "bool",
+        "!span": "37237[1270:24]-37245[1270:32]"
+      },
+      "<i>": {
+        "!type": "string",
+        "!span": "37363[1274:26]-37367[1274:30]"
+      },
+      "comment": {
+        "!type": "string",
+        "!span": "20205[673:15]-20212[673:22]",
+        "!doc": "set cookie defaults"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "20445[678:15]-20449[678:19]"
+      },
+      "created": {
+        "!type": "number",
+        "!span": "20583[681:15]-20590[681:22]"
+      }
+    },
+    "forge.http.createClient.!ret.requests.<i>.error.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "7702[285:6]-7706[285:10]"
+      },
+      "message": {
+        "!type": "string",
+        "!span": "7722[286:6]-7729[286:13]"
+      },
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.http.createClient.!ret.sockets.<i>.connected.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "2282[66:10]-2286[66:14]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "2309[67:10]-2323[67:24]"
+      },
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.http.createClient.!ret.sockets.<i>.closed.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "5447[189:9]-5451[189:13]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "5471[190:9]-5485[190:23]"
+      }
+    },
+    "forge.http.createClient.!ret.sockets.<i>.data.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "2617[79:8]-2621[79:12]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "2645[80:8]-2659[80:22]"
+      }
+    },
+    "forge.http.createClient.!ret.sockets.<i>.error.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "3698[131:6]-3702[131:10]"
+      },
+      "message": {
+        "!type": "string",
+        "!span": "3718[132:6]-3725[132:13]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "3744[133:6]-3758[133:20]"
+      }
+    },
+    "forge.http.createClient.!ret.sockets.<i>.connect.!0": {
+      "host": {
+        "!type": "string",
+        "!span": "3256[129:6]-3260[129:10]"
+      },
+      "policyPort": {
+        "!type": "number",
+        "!span": "3314[131:6]-3324[131:16]"
+      }
+    },
+    "forge.http.createClient.!ret.getCookie.!ret": {
+      "comment": {
+        "!type": "string",
+        "!span": "20205[673:15]-20212[673:22]"
+      },
+      "maxAge": {
+        "!type": "number",
+        "!span": "20252[674:15]-20258[674:21]"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "20296[675:15]-20302[675:21]"
+      },
+      "httpOnly": {
+        "!type": "bool",
+        "!span": "20394[677:15]-20402[677:23]"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "20445[678:15]-20449[678:19]"
+      },
+      "created": {
+        "!type": "number",
+        "!span": "20583[681:15]-20590[681:22]"
+      }
+    },
+    "forge.http.createRequest.!ret": {
+      "version": {
+        "!type": "string",
+        "!span": "25249[872:10]-25256[872:17]"
+      },
+      "body": {
+        "!type": "string",
+        "!span": "25382[875:10]-25386[875:14]",
+        "!doc": "inflate using flash api"
+      },
+      "bodyDeflated": {
+        "!type": "bool",
+        "!span": "25421[876:10]-25433[876:22]"
+      },
+      "code": {
+        "!type": "number",
+        "!span": "28698[994:11]-28702[994:15]"
+      },
+      "message": {
+        "!type": "string",
+        "!span": "28719[995:11]-28726[995:18]"
+      },
+      "headerReceived": {
+        "!type": "bool",
+        "!span": "28770[997:11]-28784[997:25]",
+        "!doc": "handle final line, end of header"
+      },
+      "bodyReceived": {
+        "!type": "bool",
+        "!span": "28805[998:11]-28817[998:23]",
+        "!doc": "body received"
+      },
+      "readBodyUntilClose": {
+        "!type": "bool",
+        "!span": "34861[1193:15]-34879[1193:33]"
+      },
+      "time": {
+        "!type": "number",
+        "!span": "35036[1201:15]-35040[1201:19]"
+      },
+      "aborted": {
+        "!type": "bool",
+        "!span": "17397[562:23]-17404[562:30]"
+      },
+      "connectTime": {
+        "!type": "number",
+        "!span": "3048[106:13]-3059[106:24]"
+      },
+      "getCookies": {},
+      "fields": {
+        "<i>": "net.socketPools.<i>.sockets.<i>.options.request.fields.<i>"
+      },
+      "setField": "net.socketPools.<i>.sockets.<i>.options.request.setField",
+      "appendField": "net.socketPools.<i>.sockets.<i>.options.request.appendField",
+      "getField": "net.socketPools.<i>.sockets.<i>.options.request.getField",
+      "addCookie": "net.socketPools.<i>.sockets.<i>.options.request.addCookie",
+      "toString": "net.socketPools.<i>.sockets.<i>.options.request.toString",
+      "readHeader": "net.socketPools.<i>.sockets.<i>.options.request.readHeader",
+      "readBody": "net.socketPools.<i>.sockets.<i>.options.request.readBody",
+      "abort": "net.socketPools.<i>.sockets.<i>.options.request.abort"
+    },
+    "forge.http.parseUrl.!ret": {
+      "scheme": {
+        "!type": "string",
+        "!span": "59506[2274:4]-59512[2274:10]"
+      },
+      "host": {
+        "!type": "string",
+        "!span": "59524[2275:4]-59528[2275:8]"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "59556[2277:4]-59560[2277:8]"
+      },
+      "fullHost": {
+        "!type": "string",
+        "!span": "59592[2280:8]-59600[2280:16]"
+      }
+    },
+    "forge.http.withinCookieDomain.!1": {
+      "name": {
+        "!type": "string",
+        "!span": "36485[1250:22]-36489[1250:26]"
+      },
+      "value": {
+        "!type": "string",
+        "!span": "36520[1251:22]-36525[1251:27]"
+      },
+      "maxAge": {
+        "!type": "number",
+        "!span": "36921[1261:24]-36927[1261:30]"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "37142[1267:24]-37148[1267:30]"
+      },
+      "httpOnly": {
+        "!type": "bool",
+        "!span": "37237[1270:24]-37245[1270:32]"
+      },
+      "<i>": {
+        "!type": "string",
+        "!span": "37363[1274:26]-37367[1274:30]"
+      },
+      "comment": {
+        "!type": "string",
+        "!span": "20205[673:15]-20212[673:22]",
+        "!doc": "set cookie defaults"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "20445[678:15]-20449[678:19]"
+      },
+      "created": {
+        "!type": "number",
+        "!span": "20583[681:15]-20590[681:22]"
+      }
+    },
+    "forge.kem.rsa.create.!0": {
+      "reseeds": {
+        "!type": "number",
+        "!span": "1481[48:4]-1488[48:11]",
+        "!doc": "update reseed count"
+      },
+      "generated": {
+        "!type": "number",
+        "!span": "1536[50:4]-1545[50:13]",
+        "!doc": "amount of data generated so far"
+      },
+      "keyBytes": {
+        "!type": "string",
+        "!span": "1582[52:4]-1590[52:12]",
+        "!doc": "get digest for key bytes"
+      },
+      "pools": {
+        "<i>": {
+          "algorithm": {
+            "!type": "string",
+            "!span": "808[38:4]-817[38:13]"
+          },
+          "blockLength": {
+            "!type": "number",
+            "!span": "833[39:4]-844[39:15]"
+          },
+          "digestLength": {
+            "!type": "number",
+            "!span": "854[40:4]-866[40:16]"
+          },
+          "messageLengthSize": {
+            "!type": "number",
+            "!span": "1061[46:4]-1078[46:21]",
+            "!doc": "size of message length in bytes"
+          },
+          "messageLength64": "forge.random.pools.<i>.fullMessageLength",
+          "fullMessageLength": "forge.random.pools.<i>.fullMessageLength",
+          "start": "forge.random.pools.<i>.start",
+          "update": "forge.random.pools.<i>.update",
+          "digest": "forge.random.pools.<i>.digest"
+        }
+      },
+      "pool": {
+        "!type": "number",
+        "!span": "1866[64:6]-1870[64:10]",
+        "!doc": "entropy pools are written to cyclically, starting at index 0"
+      },
+      "seed": "forge.random.seed",
+      "plugin": {
+        "md": {
+          "create": "sha256.create"
+        },
+        "formatKey": "forge.random.plugin.formatKey",
+        "formatSeed": "forge.random.plugin.formatSeed",
+        "cipher": "forge.random.plugin.cipher",
+        "increment": "forge.random.plugin.increment"
+      },
+      "generate": "forge.random.generate",
+      "generateSync": "forge.random.generateSync",
+      "seedFile": "forge.random.seedFile",
+      "seedFileSync": "forge.random.seedFileSync",
+      "collect": "forge.random.collect",
+      "collectInt": "forge.random.collectInt",
+      "registerWorker": "forge.random.registerWorker",
+      "getBytes": "forge.random.getBytes",
+      "getBytesSync": "forge.random.getBytesSync",
+      "createInstance": "forge.random.createInstance"
+    },
+    "forge.kem.rsa.create.!ret": {
+      "encrypt": {
+        "!type": "fn(publicKey: ?, keyLength: ?) -> forge.kem.rsa.create.!ret.encrypt.!ret",
+        "!span": "1730[54:6]-1737[54:13]",
+        "!doc": "Generates a secret key and its encapsulation.\n\n@param publicKey the RSA public key to encrypt with.\n@param keyLength the length, in bytes, of the secret key to generate.\n\n@return an object with:\n  encapsulation: the ciphertext for generating the secret key, as a\n    binary-encoded string of bytes.\n  key: the secret key to use for encrypting a message."
+      },
+      "decrypt": {
+        "!type": "fn(privateKey: ?, encapsulation: ?, keyLength: ?)",
+        "!span": "2879[90:6]-2886[90:13]",
+        "!doc": "Decrypts an encapsulated secret key.\n\n@param privateKey the RSA private key to decrypt with.\n@param encapsulation the ciphertext for generating the secret key, as\n         a binary-encoded string of bytes.\n@param keyLength the length, in bytes, of the secret key to generate.\n\n@return the secret key as a binary-encoded string of bytes."
+      },
+      "!span": "1310[41:12]-1312[41:14]"
+    },
+    "forge.kem.rsa.create.!ret.encrypt.!ret": {
+      "!span": "2438[77:11]-2478[77:51]"
+    },
+    "forge.kem.kdf1.!0": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "2315[98:4]-2324[98:13]",
+        "!doc": "SHA-512 => sha512"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "2372[99:4]-2383[99:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "2394[100:4]-2406[100:16]"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "2611[106:4]-2628[106:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "messageLength128": "_createKDF.!1.fullMessageLength",
+      "fullMessageLength": "_createKDF.!1.fullMessageLength",
+      "start": "_createKDF.!1.start",
+      "update": "_createKDF.!1.update",
+      "digest": "_createKDF.!1.digest"
+    },
+    "forge.log.logMessage.!0": {
+      "level": {
+        "!type": "string",
+        "!span": "4854[155:10]-4859[155:15]"
+      },
+      "standard": {
+        "!type": "string",
+        "!span": "3143[102:12]-3151[102:20]"
+      },
+      "standardFull": {
+        "!type": "string",
+        "!span": "4125[136:12]-4137[136:24]"
+      },
+      "timestamp": "+Date",
+      "arguments": "f.!1.arguments"
+    },
+    "forge.log.prepareFull.!0": {
+      "full": {
+        "!type": "string",
+        "!span": "3723[122:12]-3727[122:16]",
+        "!doc": "format the message"
+      }
+    },
+    "forge.log.makeLogger.!0": {},
+    "forge.log.makeLogger.!0.!0": {
+      "flags": {
+        "!type": "number",
+        "!span": "5727[190:4]-5732[190:9]"
+      },
+      "level": {
+        "!type": "string",
+        "!span": "6301[212:15]-6306[212:20]",
+        "!doc": "set level"
+      },
+      "f": "f"
+    },
+    "forge.log.makeLogger.!ret": {
+      "flags": {
+        "!type": "number",
+        "!span": "5727[190:4]-5732[190:9]"
+      },
+      "level": {
+        "!type": "string",
+        "!span": "6301[212:15]-6306[212:20]",
+        "!doc": "set level"
+      },
+      "f": "f"
+    },
+    "forge.md.algorithms.sha256.create.!ret": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "808[38:4]-817[38:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "833[39:4]-844[39:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "854[40:4]-866[40:16]"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "1061[46:4]-1078[46:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "messageLength64": "forge.random.pools.<i>.fullMessageLength",
+      "fullMessageLength": "forge.random.pools.<i>.fullMessageLength",
+      "start": "forge.random.pools.<i>.start",
+      "update": "forge.random.pools.<i>.update",
+      "digest": "forge.random.pools.<i>.digest"
+    },
+    "forge.md.sha256.create.!ret": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "808[38:4]-817[38:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "833[39:4]-844[39:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "854[40:4]-866[40:16]"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "1061[46:4]-1078[46:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "messageLength64": "forge.random.pools.<i>.fullMessageLength",
+      "fullMessageLength": "forge.random.pools.<i>.fullMessageLength",
+      "start": "forge.random.pools.<i>.start",
+      "update": "forge.random.pools.<i>.update",
+      "digest": "forge.random.pools.<i>.digest"
+    },
+    "forge.md5.create.!ret": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "746[36:4]-755[36:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "768[37:4]-779[37:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "789[38:4]-801[38:16]"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "996[44:4]-1013[44:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "messageLength64": "hash.!0.fullMessageLength",
+      "fullMessageLength": "hash.!0.fullMessageLength",
+      "start": "hash.!0.start",
+      "update": "hash.!0.update",
+      "digest": "hash.!0.digest"
+    },
+    "forge.pem.encode.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "27457[901:4]-27461[901:8]"
+      }
+    },
+    "forge.pem.decode.!ret": {
+      "<i>": {
+        "type": {
+          "!type": "string",
+          "!span": "3012[109:6]-3016[109:10]"
+        },
+        "procType": {
+          "version": {
+            "!type": "string",
+            "!span": "4449[158:26]-4456[158:33]"
+          },
+          "type": {
+            "!type": "string",
+            "!span": "4469[158:46]-4473[158:50]"
+          }
+        },
+        "contentDomain": {
+          "!type": "string",
+          "!span": "3056[111:6]-3069[111:19]",
+          "!doc": "special-case Content-Domain"
+        },
+        "dekInfo": {
+          "algorithm": {
+            "!type": "string",
+            "!span": "4967[168:25]-4976[168:34]"
+          },
+          "parameters": {
+            "!type": "string",
+            "!span": "4989[168:47]-4999[168:57]"
+          }
+        },
+        "headers": {
+          "<i>": {
+            "name": {
+              "!type": "string",
+              "!span": "3797[143:22]-3801[143:26]"
+            },
+            "values": "pem.decode.!ret.<i>.headers.<i>.values"
+          }
+        },
+        "body": {
+          "!type": "string",
+          "!span": "3123[114:6]-3127[114:10]"
+        }
+      }
+    },
+    "forge.pkcs12.pkcs12FromAsn1.!ret": {
+      "safeContents": {
+        "<i>": {
+          "encrypted": {
+            "!type": "bool",
+            "!span": "15681[541:6]-15690[541:15]"
+          },
+          "safeBags": {
+            "<i>": {
+              "type": {
+                "!type": "string",
+                "!span": "19026[652:6]-19030[652:10]"
+              },
+              "key": "_modPow.!1",
+              "asn1": "_fromDer.!ret",
+              "cert": "pki.certificateFromPem.!ret",
+              "attributes": {
+                "<i>": "_decodeBagAttributes.!ret.<i>"
+              }
+            }
+          }
+        }
+      },
+      "getBags": {},
+      "getBagsByFriendlyName": {},
+      "getBagsByLocalKeyId": "_decodeAuthenticatedSafe.!0.getBagsByLocalKeyId"
+    },
+    "forge.pkcs12.toPkcs12Asn1.!3": {
+      "saltSize": {
+        "!type": "number",
+        "!span": "24053[798:10]-24061[798:18]"
+      },
+      "count": {
+        "!type": "number",
+        "!span": "24097[799:10]-24102[799:15]"
+      },
+      "algorithm": {
+        "!type": "string",
+        "!span": "24138[800:10]-24147[800:19]"
+      },
+      "useMac": {
+        "!type": "bool",
+        "!span": "24248[802:12]-24254[802:18]"
+      },
+      "generateLocalKeyId": {
+        "!type": "bool",
+        "!span": "24392[808:12]-24410[808:30]"
+      },
+      "prfAlgorithm": {
+        "!type": "string",
+        "!span": "6433[245:5]-6445[245:17]"
+      }
+    },
+    "forge.pkcs7.messageFromPem.!ret": {
+      "version": {
+        "!type": "number",
+        "!span": "18359[589:4]-18366[589:11]"
+      },
+      "recipients": {
+        "<i>": {
+          "version": {
+            "!type": "number",
+            "!span": "21713[700:8]-21720[700:15]"
+          },
+          "encryptedContent": "_recipientsFromAsn1.!ret.<i>.encryptedContent"
+        }
+      },
+      "encryptedContent": {
+        "algorithm": {
+          "!type": "string",
+          "!span": "37653[1185:6]-37662[1185:15]",
+          "!doc": "Keep a copy of the key & IV in the object, so the caller can\nuse it for whatever reason."
+        },
+        "parameter": "+ByteBuffer",
+        "content": "+ByteBuffer",
+        "key": "+ByteBuffer"
+      },
+      "findRecipient": {},
+      "decrypt": {},
+      "content": "+ByteBuffer",
+      "fromAsn1": "_fromAsn1.!0.fromAsn1",
+      "toAsn1": "_fromAsn1.!0.toAsn1",
+      "addRecipient": "_fromAsn1.!0.addRecipient",
+      "encrypt": "_fromAsn1.!0.encrypt",
+      "rawCapture": "_fromAsn1.!ret"
+    },
+    "forge.pkcs7.messageFromPem.!ret.findRecipient.!ret": {
+      "serialNumber": {
+        "!type": "string",
+        "!span": "26217[836:4]-26229[836:16]"
+      },
+      "encryptedContent": {
+        "algorithm": {
+          "!type": "string",
+          "!span": "26310[838:6]-26319[838:15]"
+        }
+      },
+      "issuer": "pki.RDNAttributesAsArray.!ret"
+    },
+    "forge.pkcs7.messageFromPem.!ret.decrypt.!0": {
+      "version": {
+        "!type": "number",
+        "!span": "3313[125:4]-3320[125:11]"
+      },
+      "signers": {
+        "<i>": {
+          "version": {
+            "!type": "number",
+            "!span": "9954[317:8]-9961[317:15]"
+          },
+          "serialNumber": {
+            "!type": "string",
+            "!span": "9998[319:8]-10010[319:20]"
+          },
+          "key": "_modPow.!1",
+          "issuer": "pki.RDNAttributesAsArray.!ret",
+          "authenticatedAttributesAsn1": "_fromDer.!ret",
+          "authenticatedAttributes": "_signerToAsn1.!0.authenticatedAttributes",
+          "unauthenticatedAttributes": "_signerToAsn1.!0.unauthenticatedAttributes"
+        }
+      },
+      "certificates": {
+        "<i>": "pki.certificateFromPem.!ret"
+      },
+      "digestAlgorithmIdentifiers": {
+        "<i>": "_fromDer.!ret"
+      },
+      "contentInfo": "_fromDer.!ret",
+      "signerInfos": {
+        "<i>": "_fromDer.!ret"
+      },
+      "detachedContent": "_fromDer.!ret",
+      "encryptedContent": "_encryptedContentToAsn1.!0",
+      "content": "+ByteBuffer",
+      "rawCapture": "_fromAsn1.!ret",
+      "crls": "p7.createSignedData.!ret.crls",
+      "fromAsn1": "p7.createSignedData.!ret.fromAsn1",
+      "toAsn1": "p7.createSignedData.!ret.toAsn1",
+      "addSigner": "p7.createSignedData.!ret.addSigner",
+      "sign": "p7.createSignedData.!ret.sign",
+      "verify": "p7.createSignedData.!ret.verify",
+      "addCertificate": "p7.createSignedData.!ret.addCertificate",
+      "addCertificateRevokationList": "p7.createSignedData.!ret.addCertificateRevokationList"
+    },
+    "forge.pkcs7.createSignedData.!ret": {
+      "version": {
+        "!type": "number",
+        "!span": "3313[125:4]-3320[125:11]"
+      },
+      "signers": {
+        "<i>": {
+          "version": {
+            "!type": "number",
+            "!span": "9954[317:8]-9961[317:15]"
+          },
+          "serialNumber": {
+            "!type": "string",
+            "!span": "9998[319:8]-10010[319:20]"
+          },
+          "key": "_modPow.!1",
+          "issuer": "pki.RDNAttributesAsArray.!ret",
+          "authenticatedAttributesAsn1": "_fromDer.!ret",
+          "authenticatedAttributes": "_signerToAsn1.!0.authenticatedAttributes",
+          "unauthenticatedAttributes": "_signerToAsn1.!0.unauthenticatedAttributes"
+        }
+      },
+      "certificates": {
+        "<i>": "pki.certificateFromPem.!ret"
+      },
+      "digestAlgorithmIdentifiers": {
+        "<i>": "_fromDer.!ret"
+      },
+      "contentInfo": "_fromDer.!ret",
+      "signerInfos": {
+        "<i>": "_fromDer.!ret"
+      },
+      "detachedContent": "_fromDer.!ret",
+      "encryptedContent": "_encryptedContentToAsn1.!0",
+      "content": "+ByteBuffer",
+      "rawCapture": "_fromAsn1.!ret",
+      "crls": "p7.createSignedData.!ret.crls",
+      "fromAsn1": "p7.createSignedData.!ret.fromAsn1",
+      "toAsn1": "p7.createSignedData.!ret.toAsn1",
+      "addSigner": "p7.createSignedData.!ret.addSigner",
+      "sign": "p7.createSignedData.!ret.sign",
+      "verify": "p7.createSignedData.!ret.verify",
+      "addCertificate": "p7.createSignedData.!ret.addCertificate",
+      "addCertificateRevokationList": "p7.createSignedData.!ret.addCertificateRevokationList"
+    },
+    "forge.pkcs7.createEncryptedData.!ret": {
+      "version": {
+        "!type": "number",
+        "!span": "17467[550:4]-17474[550:11]"
+      },
+      "encryptedContent": "_encryptedContentToAsn1.!0",
+      "content": "+ByteBuffer",
+      "rawCapture": "_fromAsn1.!ret",
+      "fromAsn1": "p7.createEncryptedData.!ret.fromAsn1",
+      "decrypt": "p7.createEncryptedData.!ret.decrypt"
+    },
+    "forge.prime.generateProbablePrime.!1": {
+      "algorithm": {
+        "name": {
+          "!type": "string",
+          "!span": "50978[1628:6]-50982[1628:10]"
+        },
+        "options": {
+          "workers": {
+            "!type": "number",
+            "!span": "51042[1630:8]-51049[1630:15]"
+          },
+          "workLoad": {
+            "!type": "number",
+            "!span": "51081[1631:8]-51089[1631:16]"
+          },
+          "!span": "51023[1629:6]-51030[1629:13]"
+        },
+        "!span": "50959[1627:4]-50968[1627:13]"
+      },
+      "!span": "50953[1626:13]-51176[1635:3]"
+    },
+    "forge.prng.create.!ret": {
+      "reseeds": {
+        "!type": "number",
+        "!span": "1481[48:4]-1488[48:11]",
+        "!doc": "update reseed count"
+      },
+      "generated": {
+        "!type": "number",
+        "!span": "1536[50:4]-1545[50:13]",
+        "!doc": "amount of data generated so far"
+      },
+      "keyBytes": {
+        "!type": "string",
+        "!span": "1582[52:4]-1590[52:12]",
+        "!doc": "get digest for key bytes"
+      },
+      "pool": {
+        "!type": "number",
+        "!span": "1866[64:6]-1870[64:10]",
+        "!doc": "entropy pools are written to cyclically, starting at index 0"
+      },
+      "plugin": "forge.random.plugin",
+      "seed": "forge.random.seed",
+      "pools": {
+        "<i>": "forge.random.pools.<i>"
+      },
+      "generate": "forge.random.generate",
+      "generateSync": "forge.random.generateSync",
+      "seedFile": "forge.random.seedFile",
+      "seedFileSync": "forge.random.seedFileSync",
+      "collect": "forge.random.collect",
+      "collectInt": "forge.random.collectInt",
+      "registerWorker": "forge.random.registerWorker",
+      "getBytes": "forge.random.getBytes",
+      "getBytesSync": "forge.random.getBytesSync",
+      "createInstance": "forge.random.createInstance"
+    },
+    "forge.random.pools.<i>": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "808[38:4]-817[38:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "833[39:4]-844[39:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "854[40:4]-866[40:16]"
+      },
+      "fullMessageLength": {
+        "!type": "[number]",
+        "!span": "993[44:4]-1010[44:21]",
+        "!doc": "full message length (set md.messageLength64 for backwards-compatibility)"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "1061[46:4]-1078[46:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "start": {
+        "!type": "fn() -> forge.random.pools.<i>",
+        "!span": "1167[54:5]-1172[54:10]",
+        "!doc": "Starts the digest.\n\n@return this digest object."
+      },
+      "update": {
+        "!type": "fn(msg: ?, encoding: ?) -> forge.random.pools.<i>",
+        "!span": "2229[90:5]-2235[90:11]",
+        "!doc": "Updates the digest with the given message input. The given input can\ntreated as raw input (no encoding will be applied) or an encoding of\n'utf8' maybe given to encode the input using UTF-8.\n\n@param msg the message input to update with.\n@param encoding the encoding to use (default: 'raw', other: 'utf8').\n\n@return this digest object."
+      },
+      "digest": {
+        "!type": "fn() -> +ByteBuffer",
+        "!span": "3144[125:5]-3150[125:11]",
+        "!doc": "Produces the digest.\n\n@return a byte buffer containing the digest value."
+      },
+      "!span": "802[37:11]-1085[47:3]",
+      "!doc": "message digest object",
+      "messageLength64": "forge.random.pools.<i>.fullMessageLength"
+    },
+    "forge.random.seedFile.!1": {
+      "!type": "fn(err: ?, bytes: ?)",
+      "!span": "12058[407:47]-12167[409:11]"
+    },
+    "forge.rsa.createKeyPairGenerationState.!ret": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "18660[622:6]-18669[622:15]"
+      },
+      "state": {
+        "!type": "number",
+        "!span": "18688[623:6]-18693[623:11]"
+      },
+      "bits": {
+        "!type": "number",
+        "!span": "18704[624:6]-18708[624:10]"
+      },
+      "eInt": {
+        "!type": "number",
+        "!span": "18738[626:6]-18742[626:10]"
+      },
+      "qBits": {
+        "!type": "number",
+        "!span": "18823[630:6]-18828[630:11]"
+      },
+      "pBits": {
+        "!type": "number",
+        "!span": "18847[631:6]-18852[631:11]"
+      },
+      "pqState": {
+        "!type": "number",
+        "!span": "18880[632:6]-18887[632:13]",
+        "!doc": "store p or q"
+      },
+      "e": "+BigInteger",
+      "p": "+BigInteger",
+      "q": "+BigInteger",
+      "num": "+BigInteger",
+      "keys": "_generateKeyPair.!0.keys",
+      "p1": "+BigInteger",
+      "q1": "+BigInteger",
+      "phi": "+BigInteger",
+      "n": "+BigInteger",
+      "rng": {
+        "nextBytes": "_generateKeyPair.!0.rng.nextBytes"
+      }
+    },
+    "forge.net.socketPools.<i>.sockets.<i>.connected.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "2282[66:10]-2286[66:14]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "2309[67:10]-2323[67:24]"
+      },
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.net.socketPools.<i>.sockets.<i>.closed.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "5447[189:9]-5451[189:13]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "5471[190:9]-5485[190:23]"
+      }
+    },
+    "forge.net.socketPools.<i>.sockets.<i>.data.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "2617[79:8]-2621[79:12]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "2645[80:8]-2659[80:22]"
+      }
+    },
+    "forge.net.socketPools.<i>.sockets.<i>.error.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "3698[131:6]-3702[131:10]"
+      },
+      "message": {
+        "!type": "string",
+        "!span": "3718[132:6]-3725[132:13]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "3744[133:6]-3758[133:20]"
+      }
+    },
+    "forge.net.socketPools.<i>.sockets.<i>.connect.!0": {
+      "host": {
+        "!type": "string",
+        "!span": "3256[129:6]-3260[129:10]"
+      },
+      "policyPort": {
+        "!type": "number",
+        "!span": "3314[131:6]-3324[131:16]"
+      }
+    },
+    "forge.net.socketPools.<i>.sockets.<i>.options.error.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "7702[285:6]-7706[285:10]"
+      },
+      "message": {
+        "!type": "string",
+        "!span": "7722[286:6]-7729[286:13]"
+      },
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.net.createSocketPool.!0": {
+      "policyPort": {
+        "!type": "number",
+        "!span": "4170[131:4]-4180[131:14]"
+      },
+      "msie": {
+        "!type": "bool",
+        "!span": "4226[133:4]-4230[133:8]"
+      }
+    },
+    "forge.task.start.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "7567[280:8]-7571[280:12]"
+      },
+      "!span": "7557[279:23]-7802[290:7]",
+      "run": "Task.!0.run",
+      "success": "Task.successCallback",
+      "failure": "Task.failureCallback"
+    },
+    "forge.task.createCondition.!ret": {
+      "tasks": {
+        "!span": "19063[693:4]-19068[693:9]",
+        "!doc": "all tasks that are blocked"
+      },
+      "wait": {
+        "!type": "fn(task: ?)",
+        "!span": "19283[702:7]-19287[702:11]",
+        "!doc": "Causes the given task to block until notify is called. If the task\nis already waiting on this condition then this is a no-op.\n\n@param task the task to cause to wait."
+      },
+      "notify": {
+        "!type": "fn()",
+        "!span": "19496[713:7]-19502[713:13]",
+        "!doc": "Notifies all waiting tasks to wake up."
+      },
+      "!span": "19023[691:13]-19076[694:3]"
+    },
+    "forge.tls.CipherSuites.TLS_RSA_WITH_AES_128_CBC_SHA.initSecurityParameters.!0": {
+      "bulk_cipher_algorithm": {
+        "!type": "number",
+        "!span": "455[21:7]-476[21:28]"
+      },
+      "cipher_type": {
+        "!type": "number",
+        "!span": "515[22:7]-526[22:18]"
+      },
+      "enc_key_length": {
+        "!type": "number",
+        "!span": "558[23:7]-572[23:21]"
+      },
+      "block_length": {
+        "!type": "number",
+        "!span": "586[24:7]-598[24:19]"
+      },
+      "fixed_iv_length": {
+        "!type": "number",
+        "!span": "612[25:7]-627[25:22]"
+      },
+      "record_iv_length": {
+        "!type": "number",
+        "!span": "641[26:7]-657[26:23]"
+      },
+      "mac_algorithm": {
+        "!type": "number",
+        "!span": "671[27:7]-684[27:20]"
+      },
+      "mac_length": {
+        "!type": "number",
+        "!span": "722[28:7]-732[28:17]"
+      },
+      "mac_key_length": {
+        "!type": "number",
+        "!span": "746[29:7]-760[29:21]"
+      }
+    },
+    "forge.tls.CipherSuites.TLS_RSA_WITH_AES_128_CBC_SHA.initConnectionState.!1": {
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "115468[3775:17]-115473[3775:22]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "115494[3775:43]-115499[3775:48]"
+        }
+      },
+      "entity": {
+        "!type": "number",
+        "!span": "113758[3719:4]-113764[3719:10]"
+      },
+      "sessionCache": {
+        "capacity": {
+          "!type": "number",
+          "!span": "111111[249:104144]-111119[249:104152]"
+        },
+        "getSession": {},
+        "<i>": {
+          "id": {
+            "!type": "string",
+            "!span": "125917[4125:8]-125919[4125:10]"
+          },
+          "sp": {
+            "entity": {
+              "!type": "number",
+              "!span": "28164[939:4]-28170[939:10]"
+            },
+            "prf_algorithm": {
+              "!type": "number",
+              "!span": "28186[940:4]-28199[940:17]"
+            },
+            "compression_algorithm": {
+              "!type": "number",
+              "!span": "28472[950:4]-28493[950:25]"
+            },
+            "keys": "tls.generateKeys.!ret"
+          },
+          "version": "initConnectionState.!1.version"
+        },
+        "cache": "tls.createSessionCache.!0",
+        "order": "tls.createSessionCache.!0.order",
+        "setSession": "tls.createSessionCache.!0.setSession"
+      },
+      "virtualHost": {
+        "!type": "string",
+        "!span": "113932[3725:4]-113943[3725:15]"
+      },
+      "verifyClient": {
+        "!type": "bool",
+        "!span": "113978[3726:4]-113990[3726:16]"
+      },
+      "error": {},
+      "record": {
+        "type": {
+          "!type": "number",
+          "!span": "117286[3841:8]-117290[3841:12]"
+        },
+        "version": {
+          "major": {
+            "!type": "number",
+            "!span": "117334[3843:10]-117339[3843:15]"
+          },
+          "minor": {
+            "!type": "number",
+            "!span": "117364[3844:10]-117369[3844:15]"
+          }
+        },
+        "length": {
+          "!type": "number",
+          "!span": "117402[3846:8]-117408[3846:14]"
+        },
+        "ready": {
+          "!type": "bool",
+          "!span": "117477[3848:8]-117482[3848:13]",
+          "!doc": "record is now ready"
+        },
+        "fragment": "+ByteBuffer"
+      },
+      "session": {
+        "compressionMethod": {
+          "!type": "number",
+          "!span": "59972[2042:8]-59989[2042:25]",
+          "!doc": "no compression"
+        },
+        "resuming": {
+          "!type": "bool",
+          "!span": "30337[1016:14]-30345[1016:22]"
+        },
+        "id": {
+          "!type": "string",
+          "!span": "30684[1030:12]-30686[1030:14]",
+          "!doc": "update session"
+        },
+        "clientHelloVersion": {
+          "major": {
+            "!type": "number",
+            "!span": "82459[2709:4]-82464[2709:9]"
+          },
+          "minor": {
+            "!type": "number",
+            "!span": "82487[2710:4]-82492[2710:9]"
+          }
+        },
+        "sp": {
+          "entity": {
+            "!type": "number",
+            "!span": "28164[939:4]-28170[939:10]"
+          },
+          "prf_algorithm": {
+            "!type": "number",
+            "!span": "28186[940:4]-28199[940:17]"
+          },
+          "compression_algorithm": {
+            "!type": "number",
+            "!span": "28472[950:4]-28493[950:25]"
+          },
+          "keys": "tls.generateKeys.!ret"
+        },
+        "version": "initConnectionState.!1.version",
+        "md5": "hash.!0",
+        "sha1": "rsa_mgf1.!2",
+        "certificateRequest": {
+          "certificate_types": "+ByteBuffer",
+          "certificate_authorities": "+ByteBuffer"
+        },
+        "extensions": {
+          "server_name": {
+            "serverNameList": "initConnectionState.!1.session.extensions.server_name.serverNameList"
+          }
+        }
+      },
+      "state": {
+        "pending": {
+          "read": {
+            "macLength": {
+              "!type": "number",
+              "!span": "75307[2455:6]-75316[2455:15]"
+            },
+            "sequenceNumber": "deflate.!2.sequenceNumber",
+            "cipherFunction": "deflate.!2.cipherFunction",
+            "compressFunction": "deflate",
+            "updateSequenceNumber": "deflate.!2.updateSequenceNumber",
+            "update": "deflate.!2.update"
+          },
+          "write": "deflate.!2"
+        },
+        "current": "tls.createConnectionState.!ret"
+      },
+      "expect": {
+        "!type": "number",
+        "!span": "115664[3783:6]-115670[3783:12]",
+        "!doc": "expect application data next"
+      },
+      "records": {
+        "<i>": {
+          "type": {
+            "!type": "number",
+            "!span": "79837[2609:4]-79841[2609:8]"
+          },
+          "version": {
+            "major": {
+              "!type": "number",
+              "!span": "79878[2611:6]-79883[2611:11]"
+            },
+            "minor": {
+              "!type": "number",
+              "!span": "79908[2612:6]-79913[2612:11]"
+            }
+          },
+          "length": {
+            "!type": "number",
+            "!span": "79942[2614:4]-79948[2614:10]"
+          },
+          "fragment": "+ByteBuffer"
+        }
+      },
+      "open": {
+        "!type": "bool",
+        "!span": "115777[3786:6]-115781[3786:10]",
+        "!doc": "connection no longer open, clear input"
+      },
+      "handshakes": {
+        "!type": "number",
+        "!span": "115797[3787:6]-115807[3787:16]"
+      },
+      "handshaking": {
+        "!type": "bool",
+        "!span": "115819[3788:6]-115830[3788:17]",
+        "!doc": "now handshaking"
+      },
+      "isConnected": {
+        "!type": "bool",
+        "!span": "115846[3789:6]-115857[3789:17]",
+        "!doc": "now connected"
+      },
+      "fail": {
+        "!type": "bool",
+        "!span": "115873[3790:6]-115877[3790:10]",
+        "!doc": "set fail flag"
+      },
+      "input": "+ByteBuffer",
+      "tlsData": "+ByteBuffer",
+      "data": "+ByteBuffer",
+      "fragmented": "hmac_sha1.!2",
+      "cipherSuites": "initConnectionState.!1.cipherSuites",
+      "connected": "initConnectionState.!1.connected",
+      "verify": "initConnectionState.!1.verify",
+      "getSignature": "initConnectionState.!1.getSignature",
+      "tlsDataReady": "initConnectionState.!1.tlsDataReady",
+      "dataReady": "initConnectionState.!1.dataReady",
+      "closed": "initConnectionState.!1.closed",
+      "deflate": "initConnectionState.!1.deflate",
+      "inflate": "initConnectionState.!1.inflate",
+      "reset": "initConnectionState.!1.reset",
+      "handshake": "initConnectionState.!1.handshake",
+      "process": "initConnectionState.!1.process",
+      "prepare": "initConnectionState.!1.prepare",
+      "prepareHeartbeatRequest": "initConnectionState.!1.prepareHeartbeatRequest",
+      "close": "initConnectionState.!1.close"
+    },
+    "forge.tls.CipherSuites.TLS_RSA_WITH_AES_128_CBC_SHA.initConnectionState.!1.sessionCache.getSession.!ret": {
+      "id": {
+        "!type": "string",
+        "!span": "125917[4125:8]-125919[4125:10]"
+      },
+      "sp": {
+        "entity": {
+          "!type": "number",
+          "!span": "28164[939:4]-28170[939:10]"
+        },
+        "prf_algorithm": {
+          "!type": "number",
+          "!span": "28186[940:4]-28199[940:17]"
+        },
+        "compression_algorithm": {
+          "!type": "number",
+          "!span": "28472[950:4]-28493[950:25]"
+        },
+        "keys": "tls.generateKeys.!ret"
+      },
+      "version": "initConnectionState.!1.version"
+    },
+    "forge.tls.CipherSuites.TLS_RSA_WITH_AES_128_CBC_SHA.initConnectionState.!1.error.!1": {
+      "send": {
+        "!type": "bool",
+        "!span": "110177[3577:8]-110181[3577:12]"
+      },
+      "alert": {
+        "level": {
+          "!type": "number",
+          "!span": "110432[3589:8]-110437[3589:13]"
+        }
+      },
+      "origin": {
+        "!type": "string",
+        "!span": "114631[3741:9]-114637[3741:15]",
+        "!doc": "set origin if not set"
+      }
+    },
+    "forge.tls.CipherSuites.TLS_RSA_WITH_AES_128_CBC_SHA.initConnectionState.!2": {
+      "entity": {
+        "!type": "number",
+        "!span": "28164[939:4]-28170[939:10]"
+      },
+      "prf_algorithm": {
+        "!type": "number",
+        "!span": "28186[940:4]-28199[940:17]"
+      },
+      "compression_algorithm": {
+        "!type": "number",
+        "!span": "28472[950:4]-28493[950:25]"
+      },
+      "keys": "tls.generateKeys.!ret"
+    },
+    "forge.tls.CipherSuites.TLS_RSA_WITH_AES_256_CBC_SHA.initSecurityParameters.!0": {
+      "bulk_cipher_algorithm": {
+        "!type": "number",
+        "!span": "979[37:7]-1000[37:28]"
+      },
+      "cipher_type": {
+        "!type": "number",
+        "!span": "1039[38:7]-1050[38:18]"
+      },
+      "enc_key_length": {
+        "!type": "number",
+        "!span": "1082[39:7]-1096[39:21]"
+      },
+      "block_length": {
+        "!type": "number",
+        "!span": "1110[40:7]-1122[40:19]"
+      },
+      "fixed_iv_length": {
+        "!type": "number",
+        "!span": "1136[41:7]-1151[41:22]"
+      },
+      "record_iv_length": {
+        "!type": "number",
+        "!span": "1165[42:7]-1181[42:23]"
+      },
+      "mac_algorithm": {
+        "!type": "number",
+        "!span": "1195[43:7]-1208[43:20]"
+      },
+      "mac_length": {
+        "!type": "number",
+        "!span": "1246[44:7]-1256[44:17]"
+      },
+      "mac_key_length": {
+        "!type": "number",
+        "!span": "1270[45:7]-1284[45:21]"
+      }
+    },
+    "forge.tls.handleUnexpected.!0": {
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "115468[3775:17]-115473[3775:22]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "115494[3775:43]-115499[3775:48]"
+        }
+      },
+      "entity": {
+        "!type": "number",
+        "!span": "113758[3719:4]-113764[3719:10]"
+      },
+      "sessionCache": {
+        "capacity": {
+          "!type": "number",
+          "!span": "111111[249:104144]-111119[249:104152]"
+        },
+        "<i>": {
+          "id": {
+            "!type": "string",
+            "!span": "125917[4125:8]-125919[4125:10]"
+          },
+          "version": "initConnectionState.!1.version",
+          "sp": "initConnectionState.!2"
+        },
+        "cache": "tls.createSessionCache.!0",
+        "order": "tls.createSessionCache.!0.order",
+        "getSession": "tls.createSessionCache.!0.getSession",
+        "setSession": "tls.createSessionCache.!0.setSession"
+      },
+      "virtualHost": {
+        "!type": "string",
+        "!span": "113932[3725:4]-113943[3725:15]"
+      },
+      "verifyClient": {
+        "!type": "bool",
+        "!span": "113978[3726:4]-113990[3726:16]"
+      },
+      "error": {},
+      "record": {
+        "type": {
+          "!type": "number",
+          "!span": "117286[3841:8]-117290[3841:12]"
+        },
+        "version": {
+          "major": {
+            "!type": "number",
+            "!span": "117334[3843:10]-117339[3843:15]"
+          },
+          "minor": {
+            "!type": "number",
+            "!span": "117364[3844:10]-117369[3844:15]"
+          }
+        },
+        "length": {
+          "!type": "number",
+          "!span": "117402[3846:8]-117408[3846:14]"
+        },
+        "ready": {
+          "!type": "bool",
+          "!span": "117477[3848:8]-117482[3848:13]",
+          "!doc": "record is now ready"
+        },
+        "fragment": "+ByteBuffer"
+      },
+      "session": {
+        "compressionMethod": {
+          "!type": "number",
+          "!span": "59972[2042:8]-59989[2042:25]",
+          "!doc": "no compression"
+        },
+        "resuming": {
+          "!type": "bool",
+          "!span": "30337[1016:14]-30345[1016:22]"
+        },
+        "id": {
+          "!type": "string",
+          "!span": "30684[1030:12]-30686[1030:14]",
+          "!doc": "update session"
+        },
+        "clientHelloVersion": {
+          "major": {
+            "!type": "number",
+            "!span": "82459[2709:4]-82464[2709:9]"
+          },
+          "minor": {
+            "!type": "number",
+            "!span": "82487[2710:4]-82492[2710:9]"
+          }
+        },
+        "version": "initConnectionState.!1.version",
+        "md5": "hash.!0",
+        "sha1": "rsa_mgf1.!2",
+        "certificateRequest": {
+          "certificate_types": "+ByteBuffer",
+          "certificate_authorities": "+ByteBuffer"
+        },
+        "sp": "initConnectionState.!2",
+        "extensions": {
+          "server_name": {
+            "serverNameList": "initConnectionState.!1.session.extensions.server_name.serverNameList"
+          }
+        }
+      },
+      "state": {
+        "pending": {
+          "read": {
+            "macLength": {
+              "!type": "number",
+              "!span": "75307[2455:6]-75316[2455:15]"
+            },
+            "sequenceNumber": "deflate.!2.sequenceNumber",
+            "cipherFunction": "deflate.!2.cipherFunction",
+            "compressFunction": "deflate",
+            "updateSequenceNumber": "deflate.!2.updateSequenceNumber",
+            "update": "deflate.!2.update"
+          },
+          "write": "deflate.!2"
+        },
+        "current": "tls.createConnectionState.!ret"
+      },
+      "expect": {
+        "!type": "number",
+        "!span": "115664[3783:6]-115670[3783:12]",
+        "!doc": "expect application data next"
+      },
+      "records": {
+        "<i>": {
+          "type": {
+            "!type": "number",
+            "!span": "79837[2609:4]-79841[2609:8]"
+          },
+          "version": {
+            "major": {
+              "!type": "number",
+              "!span": "79878[2611:6]-79883[2611:11]"
+            },
+            "minor": {
+              "!type": "number",
+              "!span": "79908[2612:6]-79913[2612:11]"
+            }
+          },
+          "length": {
+            "!type": "number",
+            "!span": "79942[2614:4]-79948[2614:10]"
+          },
+          "fragment": "+ByteBuffer"
+        }
+      },
+      "open": {
+        "!type": "bool",
+        "!span": "115777[3786:6]-115781[3786:10]",
+        "!doc": "connection no longer open, clear input"
+      },
+      "handshakes": {
+        "!type": "number",
+        "!span": "115797[3787:6]-115807[3787:16]"
+      },
+      "handshaking": {
+        "!type": "bool",
+        "!span": "115819[3788:6]-115830[3788:17]",
+        "!doc": "now handshaking"
+      },
+      "isConnected": {
+        "!type": "bool",
+        "!span": "115846[3789:6]-115857[3789:17]",
+        "!doc": "now connected"
+      },
+      "fail": {
+        "!type": "bool",
+        "!span": "115873[3790:6]-115877[3790:10]",
+        "!doc": "set fail flag"
+      },
+      "input": "+ByteBuffer",
+      "tlsData": "+ByteBuffer",
+      "data": "+ByteBuffer",
+      "fragmented": "hmac_sha1.!2",
+      "cipherSuites": "initConnectionState.!1.cipherSuites",
+      "connected": "initConnectionState.!1.connected",
+      "verify": "initConnectionState.!1.verify",
+      "getSignature": "initConnectionState.!1.getSignature",
+      "tlsDataReady": "initConnectionState.!1.tlsDataReady",
+      "dataReady": "initConnectionState.!1.dataReady",
+      "closed": "initConnectionState.!1.closed",
+      "deflate": "initConnectionState.!1.deflate",
+      "inflate": "initConnectionState.!1.inflate",
+      "reset": "initConnectionState.!1.reset",
+      "handshake": "initConnectionState.!1.handshake",
+      "process": "initConnectionState.!1.process",
+      "prepare": "initConnectionState.!1.prepare",
+      "prepareHeartbeatRequest": "initConnectionState.!1.prepareHeartbeatRequest",
+      "close": "initConnectionState.!1.close"
+    },
+    "forge.tls.handleUnexpected.!0.error.!1": {
+      "send": {
+        "!type": "bool",
+        "!span": "110177[3577:8]-110181[3577:12]"
+      },
+      "alert": {
+        "level": {
+          "!type": "number",
+          "!span": "110432[3589:8]-110437[3589:13]"
+        }
+      },
+      "origin": {
+        "!type": "string",
+        "!span": "114631[3741:9]-114637[3741:15]",
+        "!doc": "set origin if not set"
+      }
+    },
+    "forge.tls.handleUnexpected.!1": {
+      "type": {
+        "!type": "number",
+        "!span": "117286[3841:8]-117290[3841:12]"
+      },
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "117334[3843:10]-117339[3843:15]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "117364[3844:10]-117369[3844:15]"
+        }
+      },
+      "length": {
+        "!type": "number",
+        "!span": "117402[3846:8]-117408[3846:14]"
+      },
+      "ready": {
+        "!type": "bool",
+        "!span": "117477[3848:8]-117482[3848:13]",
+        "!doc": "record is now ready"
+      },
+      "fragment": "+ByteBuffer"
+    },
+    "forge.tls.parseHelloMessage.!ret": {
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "23963[804:8]-23968[804:13]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "23991[805:8]-23996[805:13]"
+        }
+      },
+      "random": "+ByteBuffer",
+      "session_id": "+ByteBuffer",
+      "extensions": {
+        "<i>": {
+          "data": "+ByteBuffer",
+          "type": "tls.parseHelloMessage.!ret.extensions.<i>.type"
+        }
+      },
+      "cipher_suites": "+ByteBuffer",
+      "compression_methods": "+ByteBuffer"
+    },
+    "forge.tls.handleServerHelloDone.!1": {
+      "type": {
+        "!type": "number",
+        "!span": "79837[2609:4]-79841[2609:8]"
+      },
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "79878[2611:6]-79883[2611:11]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "79908[2612:6]-79913[2612:11]"
+        }
+      },
+      "length": {
+        "!type": "number",
+        "!span": "79942[2614:4]-79948[2614:10]"
+      },
+      "fragment": "+ByteBuffer"
+    },
+    "forge.tls.generateKeys.!1": {
+      "entity": {
+        "!type": "number",
+        "!span": "28164[939:4]-28170[939:10]"
+      },
+      "prf_algorithm": {
+        "!type": "number",
+        "!span": "28186[940:4]-28199[940:17]"
+      },
+      "compression_algorithm": {
+        "!type": "number",
+        "!span": "28472[950:4]-28493[950:25]"
+      },
+      "keys": "tls.generateKeys.!ret"
+    },
+    "forge.tls.createConnectionState.!ret": {
+      "read": {
+        "macLength": {
+          "!type": "number",
+          "!span": "75307[2455:6]-75316[2455:15]"
+        },
+        "sequenceNumber": "deflate.!2.sequenceNumber",
+        "cipherFunction": "deflate.!2.cipherFunction",
+        "compressFunction": "deflate",
+        "updateSequenceNumber": "deflate.!2.updateSequenceNumber",
+        "update": "deflate.!2.update"
+      },
+      "write": "deflate.!2"
+    },
+    "forge.tls.createRecord.!1": {
+      "type": {
+        "!type": "number",
+        "!span": "125363[4108:6]-125367[4108:10]"
+      },
+      "data": "+ByteBuffer"
+    },
+    "forge.tls.createAlert.!1": {
+      "level": {
+        "!type": "number",
+        "!span": "95276[3096:10]-95281[3096:15]"
+      },
+      "description": {
+        "!type": "number",
+        "!span": "95316[3097:10]-95327[3097:21]"
+      }
+    },
+    "forge.tls.createSessionCache.!0": {
+      "capacity": {
+        "!type": "number",
+        "!span": "111111[249:104144]-111119[249:104152]"
+      },
+      "<i>": {
+        "id": {
+          "!type": "string",
+          "!span": "125917[4125:8]-125919[4125:10]"
+        },
+        "version": "initConnectionState.!1.version",
+        "sp": "initConnectionState.!2"
+      },
+      "cache": "tls.createSessionCache.!0",
+      "order": "tls.createSessionCache.!0.order",
+      "getSession": "tls.createSessionCache.!0.getSession",
+      "setSession": "tls.createSessionCache.!0.setSession"
+    },
+    "forge.tls.createConnection.!0": {
+      "server": {
+        "!type": "bool",
+        "!span": "1668[49:4]-1674[49:10]"
+      },
+      "virtualHost": {
+        "!type": "string",
+        "!span": "1861[54:4]-1872[54:15]"
+      },
+      "sessionCache": "tls.createSessionCache.!0",
+      "verify": "initConnectionState.!1.verify",
+      "deflate": "initConnectionState.!1.deflate",
+      "inflate": "initConnectionState.!1.inflate",
+      "connected": "initConnectionState.!1.connected",
+      "tlsDataReady": "initConnectionState.!1.tlsDataReady",
+      "dataReady": "initConnectionState.!1.dataReady",
+      "closed": "initConnectionState.!1.closed",
+      "error": "tls.createConnection.!0.error"
+    },
+    "forge.tls.wrapSocket.!0": {
+      "virtualHost": {
+        "!type": "string",
+        "!span": "8112[302:6]-8123[302:17]"
+      },
+      "!span": "7955[296:34]-8413[309:5]",
+      "sessionCache": "tls.createSessionCache.!0",
+      "caStore": "_initSocket.!2.caStore",
+      "socket": "net.socketPools.<i>.sockets.<i>",
+      "verify": "initConnectionState.!1.verify",
+      "deflate": "initConnectionState.!1.deflate",
+      "inflate": "initConnectionState.!1.inflate"
+    },
+    "forge.tls.wrapSocket.!ret": {
+      "connected": {
+        "!type": "fn(e: net.socketPools.<i>.sockets.<i>.connected.!0)",
+        "!span": "1417[41:4]-1426[41:13]",
+        "!doc": "handle doing handshake after connecting"
+      },
+      "closed": {
+        "!type": "fn(e: net.socketPools.<i>.sockets.<i>.closed.!0)",
+        "!span": "1468[42:4]-1474[42:10]",
+        "!doc": "handle closing TLS connection"
+      },
+      "data": {
+        "!type": "fn(e: net.socketPools.<i>.sockets.<i>.data.!0)",
+        "!span": "1513[43:4]-1517[43:8]"
+      },
+      "error": {
+        "!type": "fn(e: ?)",
+        "!span": "1554[44:4]-1559[44:9]",
+        "!doc": "handle error on socket"
+      },
+      "destroy": {
+        "!type": "fn()",
+        "!span": "4398[160:12]-4405[160:19]",
+        "!doc": "Destroys this socket."
+      },
+      "setSessionCache": {
+        "!type": "fn(cache: ?)",
+        "!span": "4867[174:12]-4882[174:27]",
+        "!doc": "Sets this socket's TLS session cache. This should be called before\nthe socket is connected or after it is closed.\n\nThe cache is an object mapping session IDs to internal opaque state.\nAn application might need to change the cache used by a particular\ntlsSocket between connections if it accesses multiple TLS hosts.\n\n@param cache the session cache to use."
+      },
+      "connect": {
+        "!type": "fn(options: ?)",
+        "!span": "5314[188:12]-5321[188:19]",
+        "!doc": "Connects this socket.\n\n@param options:\n          host: the host to connect to.\n          port: the port to connect to.\n          policyPort: the policy port to use (if non-default), 0 to\n             use the flash default.\n          policyUrl: the policy file URL to use (instead of port)."
+      },
+      "close": {
+        "!type": "fn()",
+        "!span": "5428[195:12]-5433[195:17]",
+        "!doc": "Closes this socket."
+      },
+      "isConnected": {
+        "!type": "fn() -> bool",
+        "!span": "5596[204:12]-5607[204:23]",
+        "!doc": "Determines if the socket is connected or not.\n\n@return true if connected, false if not."
+      },
+      "send": {
+        "!type": "fn(bytes: string)",
+        "!span": "5847[215:12]-5851[215:16]",
+        "!doc": "Writes bytes to this socket.\n\n@param bytes the bytes (as a string) to write.\n\n@return true on success, false on failure."
+      },
+      "receive": {
+        "!type": "fn(count: number) -> ?",
+        "!span": "6655[234:12]-6662[234:19]",
+        "!doc": "Reads bytes from this socket (non-blocking). Fewer than the number of\nbytes requested may be read if enough bytes are not available.\n\nThis method should be called from the data handler if there are enough\nbytes available. To see how many bytes are available, check the\n'bytesAvailable' property on the event in the data handler or call the\nbytesAvailable() function on the socket. If the browser is msie, then the\nbytesAvailable() function should be used to avoid race conditions.\nOtherwise, using the property on the data handler's event may be quicker.\n\n@param count the maximum number of bytes to read.\n\n@return the bytes read (as a string) or null on error."
+      },
+      "bytesAvailable": {
+        "!type": "fn() -> number",
+        "!span": "6880[243:12]-6894[243:26]",
+        "!doc": "Gets the number of bytes available for receiving on the socket.\n\n@return the number of bytes available for receiving."
+      },
+      "sending": {
+        "!type": "bool",
+        "!span": "5219[185:36]-5226[186:2]"
+      },
+      "retries": {
+        "!type": "number",
+        "!span": "4067[146:1]-4074[146:8]"
+      },
+      "!span": "1372[38:18]-1595[45:3]",
+      "!doc": "get raw socket",
+      "options": "net.socketPools.<i>.sockets.<i>.options",
+      "buffer": "+ByteBuffer"
+    },
+    "forge.tls.wrapSocket.!ret.closed.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "3524[121:6]-3528[121:10]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "3545[122:6]-3559[122:20]"
+      },
+      "!span": "3495[119:21]-3568[123:5]"
+    },
+    "forge.util.parseFragment.!ret": {
+      "queryString": {
+        "!type": "string",
+        "!span": "63008[2417:4]-63019[2417:15]"
+      },
+      "query": "?"
+    },
+    "forge.util.makeRequest.!ret": {
+      "query": {
+        "!type": "string",
+        "!span": "64119[2448:4]-64124[2448:9]",
+        "!doc": "full query string"
+      },
+      "getQueryLast": {},
+      "getPath": "util.makeRequest.!ret.getPath",
+      "getQuery": "util.makeRequest.!ret.getQuery"
+    },
+    "forge.xhr.setCookie.!0": {
+      "maxAge": {
+        "!type": "number",
+        "!span": "6000[192:9]-6006[192:15]",
+        "!doc": "default cookie expiration to never"
+      },
+      "comment": {
+        "!type": "string",
+        "!span": "20205[658:0]-20212[659:6]"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "20296[663:3]-20302[663:9]"
+      },
+      "httpOnly": {
+        "!type": "bool",
+        "!span": "20394[666:0]-20402[666:8]"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "20445[668:25]-20449[669:0]"
+      },
+      "created": {
+        "!type": "number",
+        "!span": "20583[673:4]-20590[673:11]"
+      }
+    },
+    "forge.xhr.create.!ret": {
+      "readyState": {
+        "!type": "number",
+        "!span": "11722[366:4]-11732[366:14]",
+        "!doc": "7. set state to UNSENT"
+      },
+      "responseText": {
+        "!type": "string",
+        "!span": "11792[368:4]-11804[368:16]",
+        "!doc": "3. set response to null"
+      },
+      "responseXML": {
+        "async": {
+          "!type": "bool",
+          "!span": "18241[587:16]-18246[587:21]"
+        }
+      },
+      "status": {
+        "!type": "number",
+        "!span": "11952[372:4]-11958[372:10]",
+        "!doc": "custom: reset status and statusText"
+      },
+      "statusText": {
+        "!type": "string",
+        "!span": "12035[374:4]-12045[374:14]",
+        "!doc": "readonly, returns the HTTP status message (i.e. 'Not Found')"
+      },
+      "cookies": "_getStorageId.!0.cookies",
+      "open": "xhrApi.create.!ret.open",
+      "setRequestHeader": "xhrApi.create.!ret.setRequestHeader",
+      "send": "xhrApi.create.!ret.send",
+      "abort": "xhrApi.create.!ret.abort",
+      "getAllResponseHeaders": "xhrApi.create.!ret.getAllResponseHeaders",
+      "getResponseHeader": "xhrApi.create.!ret.getResponseHeader"
+    },
+    "mix.<i>": "[number]",
+    "imix.<i>": "[number]",
+    "_updateBlock.!2": "[number|_fromDer.!ret]",
+    "_createCipher.!0": {
+      "decrypt": {
+        "!type": "bool",
+        "!span": "4357[142:4]-4364[142:11]"
+      },
+      "!span": "4319[139:23]-4390[144:3]"
+    },
+    "_createCipher.!ret": "+BlockCipher",
+    "tls.CipherSuites.TLS_RSA_WITH_AES_128_CBC_SHA.initSecurityParameters.!0": {
+      "bulk_cipher_algorithm": {
+        "!type": "number",
+        "!span": "455[21:7]-476[21:28]"
+      },
+      "cipher_type": {
+        "!type": "number",
+        "!span": "515[22:7]-526[22:18]"
+      },
+      "enc_key_length": {
+        "!type": "number",
+        "!span": "558[23:7]-572[23:21]"
+      },
+      "block_length": {
+        "!type": "number",
+        "!span": "586[24:7]-598[24:19]"
+      },
+      "fixed_iv_length": {
+        "!type": "number",
+        "!span": "612[25:7]-627[25:22]"
+      },
+      "record_iv_length": {
+        "!type": "number",
+        "!span": "641[26:7]-657[26:23]"
+      },
+      "mac_algorithm": {
+        "!type": "number",
+        "!span": "671[27:7]-684[27:20]"
+      },
+      "mac_length": {
+        "!type": "number",
+        "!span": "722[28:7]-732[28:17]"
+      },
+      "mac_key_length": {
+        "!type": "number",
+        "!span": "746[29:7]-760[29:21]"
+      }
+    },
+    "tls.CipherSuites.TLS_RSA_WITH_AES_256_CBC_SHA.initSecurityParameters.!0": {
+      "bulk_cipher_algorithm": {
+        "!type": "number",
+        "!span": "979[37:7]-1000[37:28]"
+      },
+      "cipher_type": {
+        "!type": "number",
+        "!span": "1039[38:7]-1050[38:18]"
+      },
+      "enc_key_length": {
+        "!type": "number",
+        "!span": "1082[39:7]-1096[39:21]"
+      },
+      "block_length": {
+        "!type": "number",
+        "!span": "1110[40:7]-1122[40:19]"
+      },
+      "fixed_iv_length": {
+        "!type": "number",
+        "!span": "1136[41:7]-1151[41:22]"
+      },
+      "record_iv_length": {
+        "!type": "number",
+        "!span": "1165[42:7]-1181[42:23]"
+      },
+      "mac_algorithm": {
+        "!type": "number",
+        "!span": "1195[43:7]-1208[43:20]"
+      },
+      "mac_length": {
+        "!type": "number",
+        "!span": "1246[44:7]-1256[44:17]"
+      },
+      "mac_key_length": {
+        "!type": "number",
+        "!span": "1270[45:7]-1284[45:21]"
+      }
+    },
+    "tls.handleUnexpected.!0": {
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "115468[3775:17]-115473[3775:22]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "115494[3775:43]-115499[3775:48]"
+        }
+      },
+      "entity": {
+        "!type": "number",
+        "!span": "113758[3719:4]-113764[3719:10]"
+      },
+      "virtualHost": {
+        "!type": "string",
+        "!span": "113932[3725:4]-113943[3725:15]"
+      },
+      "verifyClient": {
+        "!type": "bool",
+        "!span": "113978[3726:4]-113990[3726:16]"
+      },
+      "error": {},
+      "session": {
+        "compressionMethod": {
+          "!type": "number",
+          "!span": "59972[2042:8]-59989[2042:25]",
+          "!doc": "no compression"
+        },
+        "resuming": {
+          "!type": "bool",
+          "!span": "30337[1016:14]-30345[1016:22]"
+        },
+        "id": {
+          "!type": "string",
+          "!span": "30684[1030:12]-30686[1030:14]",
+          "!doc": "update session"
+        },
+        "clientHelloVersion": {
+          "major": {
+            "!type": "number",
+            "!span": "82459[2709:4]-82464[2709:9]"
+          },
+          "minor": {
+            "!type": "number",
+            "!span": "82487[2710:4]-82492[2710:9]"
+          }
+        },
+        "version": "initConnectionState.!1.version",
+        "md5": "hash.!0",
+        "sha1": "rsa_mgf1.!2",
+        "certificateRequest": {
+          "certificate_types": "+ByteBuffer",
+          "certificate_authorities": "+ByteBuffer"
+        },
+        "sp": "initConnectionState.!2",
+        "extensions": {
+          "server_name": {
+            "serverNameList": "initConnectionState.!1.session.extensions.server_name.serverNameList"
+          }
+        }
+      },
+      "expect": {
+        "!type": "number",
+        "!span": "115664[3783:6]-115670[3783:12]",
+        "!doc": "expect application data next"
+      },
+      "open": {
+        "!type": "bool",
+        "!span": "115777[3786:6]-115781[3786:10]",
+        "!doc": "connection no longer open, clear input"
+      },
+      "handshakes": {
+        "!type": "number",
+        "!span": "115797[3787:6]-115807[3787:16]"
+      },
+      "handshaking": {
+        "!type": "bool",
+        "!span": "115819[3788:6]-115830[3788:17]",
+        "!doc": "now handshaking"
+      },
+      "isConnected": {
+        "!type": "bool",
+        "!span": "115846[3789:6]-115857[3789:17]",
+        "!doc": "now connected"
+      },
+      "fail": {
+        "!type": "bool",
+        "!span": "115873[3790:6]-115877[3790:10]",
+        "!doc": "set fail flag"
+      },
+      "sessionCache": "tls.createSessionCache.!0",
+      "input": "+ByteBuffer",
+      "tlsData": "+ByteBuffer",
+      "data": "+ByteBuffer",
+      "record": "hmac_sha1.!2",
+      "state": {
+        "pending": "tls.createConnectionState.!ret",
+        "current": "tls.createConnectionState.!ret"
+      },
+      "fragmented": "hmac_sha1.!2",
+      "records": {
+        "<i>": "H5.!1"
+      },
+      "cipherSuites": "initConnectionState.!1.cipherSuites",
+      "connected": "initConnectionState.!1.connected",
+      "verify": "initConnectionState.!1.verify",
+      "getSignature": "initConnectionState.!1.getSignature",
+      "tlsDataReady": "initConnectionState.!1.tlsDataReady",
+      "dataReady": "initConnectionState.!1.dataReady",
+      "closed": "initConnectionState.!1.closed",
+      "deflate": "initConnectionState.!1.deflate",
+      "inflate": "initConnectionState.!1.inflate",
+      "reset": "initConnectionState.!1.reset",
+      "handshake": "initConnectionState.!1.handshake",
+      "process": "initConnectionState.!1.process",
+      "prepare": "initConnectionState.!1.prepare",
+      "prepareHeartbeatRequest": "initConnectionState.!1.prepareHeartbeatRequest",
+      "close": "initConnectionState.!1.close"
+    },
+    "tls.handleUnexpected.!0.error.!1": {
+      "send": {
+        "!type": "bool",
+        "!span": "110177[3577:8]-110181[3577:12]"
+      },
+      "alert": {
+        "level": {
+          "!type": "number",
+          "!span": "110432[3589:8]-110437[3589:13]"
+        }
+      },
+      "origin": {
+        "!type": "string",
+        "!span": "114631[3741:9]-114637[3741:15]",
+        "!doc": "set origin if not set"
+      }
+    },
+    "tls.handleUnexpected.!1": {
+      "type": {
+        "!type": "number",
+        "!span": "117286[3841:8]-117290[3841:12]"
+      },
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "117334[3843:10]-117339[3843:15]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "117364[3844:10]-117369[3844:15]"
+        }
+      },
+      "length": {
+        "!type": "number",
+        "!span": "117402[3846:8]-117408[3846:14]"
+      },
+      "ready": {
+        "!type": "bool",
+        "!span": "117477[3848:8]-117482[3848:13]",
+        "!doc": "record is now ready"
+      },
+      "fragment": "+ByteBuffer"
+    },
+    "tls.parseHelloMessage.!ret": {
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "23963[804:8]-23968[804:13]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "23991[805:8]-23996[805:13]"
+        },
+        "!span": "23944[803:6]-23951[803:13]"
+      },
+      "extensions": {
+        "!type": "[tls.parseHelloMessage.!ret.extensions.<i>]",
+        "!span": "24116[809:6]-24126[809:16]"
+      },
+      "!span": "23936[802:10]-24136[810:5]",
+      "random": "+ByteBuffer",
+      "session_id": "+ByteBuffer",
+      "cipher_suites": "+ByteBuffer",
+      "compression_methods": "+ByteBuffer"
+    },
+    "tls.parseHelloMessage.!ret.extensions.<i>": {
+      "type": {
+        "!type": "[number, number]",
+        "!span": "24628[826:10]-24632[826:14]"
+      },
+      "!span": "24616[825:28]-24713[828:9]",
+      "data": "+ByteBuffer"
+    },
+    "tls.handleServerHelloDone.!1": {
+      "type": {
+        "!type": "number",
+        "!span": "79837[2609:4]-79841[2609:8]"
+      },
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "79878[2611:6]-79883[2611:11]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "79908[2612:6]-79913[2612:11]"
+        }
+      },
+      "length": {
+        "!type": "number",
+        "!span": "79942[2614:4]-79948[2614:10]"
+      },
+      "fragment": "+ByteBuffer"
+    },
+    "tls.generateKeys.!1": {
+      "entity": {
+        "!type": "number",
+        "!span": "28164[939:4]-28170[939:10]"
+      },
+      "prf_algorithm": {
+        "!type": "number",
+        "!span": "28186[940:4]-28199[940:17]"
+      },
+      "compression_algorithm": {
+        "!type": "number",
+        "!span": "28472[950:4]-28493[950:25]"
+      },
+      "keys": "tls.generateKeys.!ret"
+    },
+    "tls.generateKeys.!ret": {
+      "!span": "73404[2401:13]-73632[2406:3]",
+      "!doc": "split the key material into the MAC and encryption keys"
+    },
+    "tls.createConnectionState.!ret": {
+      "read": {
+        "macLength": {
+          "!type": "number",
+          "!span": "75307[2455:6]-75316[2455:15]"
+        },
+        "sequenceNumber": "deflate.!2.sequenceNumber",
+        "cipherFunction": "deflate.!2.cipherFunction",
+        "updateSequenceNumber": "deflate.!2.updateSequenceNumber",
+        "update": "deflate.!2.update",
+        "compressFunction": "deflate"
+      },
+      "!span": "75794[2472:14]-75847[2475:3]",
+      "!doc": "create pending state",
+      "write": "deflate.!2"
+    },
+    "tls.createRecord.!1": {
+      "type": {
+        "!type": "number",
+        "!span": "125363[4108:6]-125367[4108:10]"
+      },
+      "!span": "125355[4107:37]-125510[4111:5]",
+      "data": "+ByteBuffer"
+    },
+    "tls.createAlert.!1": {
+      "level": {
+        "!type": "number",
+        "!span": "95276[3096:10]-95281[3096:15]"
+      },
+      "description": {
+        "!type": "number",
+        "!span": "95316[3097:10]-95327[3097:21]"
+      },
+      "!span": "95264[3095:15]-95375[3098:9]"
+    },
+    "tls.getClientSignature.!1": {
+      "!type": "fn(c: ?, signature: +ByteBuffer)",
+      "!span": "49436[1670:17]-50425[1706:3]",
+      "!doc": "create callback to handle client signature (for client-certs)"
+    },
+    "tls.verifyCertificateChain.!1": "[+ByteBuffer|pki.certificateFromPem.!ret]",
+    "tls.createSessionCache.!0": {
+      "capacity": {
+        "!type": "number",
+        "!span": "111111[249:104144]-111119[249:104152]"
+      },
+      "order": {
+        "!type": "[tls.createSessionCache.!0.<i>|string]",
+        "!span": "111161[249:104194]-111166[249:104199]"
+      },
+      "getSession": {
+        "!type": "fn(sessionId: string) -> tls.createSessionCache.!0.<i>",
+        "!span": "111457[249:104490]-111467[249:104500]",
+        "!doc": "get a session from a session ID (or get any session)"
+      },
+      "setSession": {
+        "!type": "fn(sessionId: string, session: tls.createSessionCache.!0.<i>)",
+        "!span": "112168[249:105201]-112178[249:105211]",
+        "!doc": "set a session in the cache"
+      },
+      "<i>": {
+        "id": {
+          "!type": "string",
+          "!span": "125917[4125:8]-125919[4125:10]"
+        },
+        "!span": "112513[249:105546]-112516[249:105549]",
+        "!doc": "only need to preserve session ID, version, and security params",
+        "version": "initConnectionState.!1.version",
+        "sp": "initConnectionState.!2"
+      },
+      "!span": "8000[298:20]-8002[298:22]",
+      "cache": "tls.createSessionCache.!0"
+    },
+    "tls.createConnection.!0": {
+      "server": {
+        "!type": "bool",
+        "!span": "1668[49:4]-1674[49:10]"
+      },
+      "virtualHost": {
+        "!type": "string",
+        "!span": "1861[54:4]-1872[54:15]"
+      },
+      "error": {
+        "!type": "fn(c: ?, e: ?)",
+        "!span": "2775[87:4]-2780[87:9]"
+      },
+      "!span": "1662[48:37]-3019[98:3]",
+      "sessionCache": "tls.createSessionCache.!0",
+      "verify": "initConnectionState.!1.verify",
+      "deflate": "initConnectionState.!1.deflate",
+      "inflate": "initConnectionState.!1.inflate",
+      "connected": "initConnectionState.!1.connected",
+      "tlsDataReady": "initConnectionState.!1.tlsDataReady",
+      "dataReady": "initConnectionState.!1.dataReady",
+      "closed": "initConnectionState.!1.closed"
+    },
+    "initConnectionState.!0": "+DataBuffer",
+    "initConnectionState.!1": {
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "115468[3775:17]-115473[3775:22]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "115494[3775:43]-115499[3775:48]"
+        },
+        "!span": "113691[3718:4]-113698[3718:11]",
+        "!doc": "only update version on connection, session version not yet set"
+      },
+      "entity": {
+        "!type": "number",
+        "!span": "113758[3719:4]-113764[3719:10]"
+      },
+      "cipherSuites": {
+        "!type": "[?]",
+        "!span": "113866[3723:4]-113878[3723:16]",
+        "!doc": "setup default cipher suites"
+      },
+      "connected": {
+        "!type": "fn(c: ?|initConnectionState.!1)",
+        "!span": "113898[3724:4]-113907[3724:13]"
+      },
+      "virtualHost": {
+        "!type": "string",
+        "!span": "113932[3725:4]-113943[3725:15]"
+      },
+      "verifyClient": {
+        "!type": "bool",
+        "!span": "113978[3726:4]-113990[3726:16]"
+      },
+      "verify": {
+        "!type": "fn(c: ?|initConnectionState.!1, verified: ?, depth: number, certs: [+ByteBuffer|pki.certificateFromPem.!ret]) -> !1",
+        "!span": "114027[3727:4]-114033[3727:10]",
+        "!doc": "A default certificate verify function that checks a certificate common\nname against the client's URL host.\n\n@param c the TLS connection.\n@param verified true if cert is verified, otherwise alert number.\n@param depth the chain depth.\n@param certs the cert chain.\n\n@return true if verified and the common name matches the host, error\n        otherwise."
+      },
+      "getSignature": {
+        "!type": "fn(c: ?, b: ?, callback: fn(c: ?, signature: +ByteBuffer))",
+        "!span": "114251[3731:4]-114263[3731:16]",
+        "!doc": "create default signing function as necessary"
+      },
+      "tlsDataReady": {
+        "!type": "fn(c: ?)",
+        "!span": "114414[3735:4]-114426[3735:16]"
+      },
+      "dataReady": {
+        "!type": "fn(c: initConnectionState.!1)",
+        "!span": "114454[3736:4]-114463[3736:13]"
+      },
+      "closed": {
+        "!type": "fn(c: initConnectionState.!1)",
+        "!span": "114538[3738:4]-114544[3738:10]"
+      },
+      "error": {
+        "!type": "fn(c: ?, ex: ?)",
+        "!span": "114566[3739:4]-114571[3739:9]"
+      },
+      "deflate": {
+        "!type": "fn(bytes: ?)",
+        "!span": "115188[3765:4]-115195[3765:11]"
+      },
+      "inflate": {
+        "!type": "fn(bytes: ?) -> string",
+        "!span": "115226[3766:4]-115233[3766:11]"
+      },
+      "session": {
+        "extensions": {
+          "server_name": {
+            "serverNameList": {
+              "!type": "[?]",
+              "!span": "59895[2038:12]-59909[2038:26]"
+            },
+            "!span": "59868[2037:10]-59879[2037:21]"
+          },
+          "!span": "59844[2036:8]-59854[2036:18]"
+        },
+        "compressionMethod": {
+          "!type": "number",
+          "!span": "59972[2042:8]-59989[2042:25]",
+          "!doc": "no compression"
+        },
+        "resuming": {
+          "!type": "bool",
+          "!span": "30337[1016:14]-30345[1016:22]"
+        },
+        "id": {
+          "!type": "string",
+          "!span": "30684[1030:12]-30686[1030:14]",
+          "!doc": "update session"
+        },
+        "certificateRequest": {
+          "!span": "44644[1500:12]-44662[1500:30]",
+          "!doc": "save certificate request in session",
+          "certificate_types": "+ByteBuffer",
+          "certificate_authorities": "+ByteBuffer"
+        },
+        "clientHelloVersion": {
+          "major": {
+            "!type": "number",
+            "!span": "82459[2709:4]-82464[2709:9]"
+          },
+          "minor": {
+            "!type": "number",
+            "!span": "82487[2710:4]-82492[2710:9]"
+          },
+          "!span": "32145[1080:12]-32163[1080:30]",
+          "!doc": "save hello version"
+        },
+        "!span": "115548[3777:6]-115555[3777:13]",
+        "!doc": "set up session",
+        "version": "initConnectionState.!1.version",
+        "md5": "hash.!0",
+        "sha1": "rsa_mgf1.!2",
+        "sp": "initConnectionState.!2"
+      },
+      "state": {
+        "!span": "115600[3779:6]-115605[3779:11]",
+        "pending": "tls.createConnectionState.!ret",
+        "current": "tls.createConnectionState.!ret"
+      },
+      "expect": {
+        "!type": "number",
+        "!span": "115664[3783:6]-115670[3783:12]",
+        "!doc": "expect application data next"
+      },
+      "records": {
+        "!type": "[H5.!1]",
+        "!span": "115757[3785:6]-115764[3785:13]"
+      },
+      "open": {
+        "!type": "bool",
+        "!span": "115777[3786:6]-115781[3786:10]",
+        "!doc": "connection no longer open, clear input"
+      },
+      "handshakes": {
+        "!type": "number",
+        "!span": "115797[3787:6]-115807[3787:16]"
+      },
+      "handshaking": {
+        "!type": "bool",
+        "!span": "115819[3788:6]-115830[3788:17]",
+        "!doc": "now handshaking"
+      },
+      "isConnected": {
+        "!type": "bool",
+        "!span": "115846[3789:6]-115857[3789:17]",
+        "!doc": "now connected"
+      },
+      "fail": {
+        "!type": "bool",
+        "!span": "115873[3790:6]-115877[3790:10]",
+        "!doc": "set fail flag"
+      },
+      "reset": {
+        "!type": "fn(clearFail: bool)",
+        "!span": "115421[3774:4]-115426[3774:9]",
+        "!doc": "Resets a closed TLS connection for reuse. Called in c.close().\n\n@param clearFail true to clear the fail flag (default: true)."
+      },
+      "handshake": {
+        "!type": "fn(sessionId: string)",
+        "!span": "120270[3937:4]-120279[3937:13]",
+        "!doc": "Performs a handshake using the TLS Handshake Protocol, as a client.\n\nThis method should only be called if the connection is in client mode.\n\n@param sessionId the session ID to use, null to start a new one."
+      },
+      "process": {
+        "!type": "fn(data: string) -> number",
+        "!span": "122850[4029:4]-122857[4029:11]",
+        "!doc": "Called when TLS protocol data has been received from somewhere and should\nbe processed by the TLS engine.\n\n@param data the TLS protocol data, as a string, to process.\n\n@return 0 if the data could be processed, otherwise the number of bytes\n        required for data to be processed."
+      },
+      "prepare": {
+        "!type": "fn(data: string)",
+        "!span": "124204[4076:4]-124211[4076:11]",
+        "!doc": "Requests that application data be packaged into a TLS record. The\ntlsDataReady handler will be called when the TLS record(s) have been\nprepared.\n\n@param data the application data, as a raw 'binary' encoded string, to\n         be sent; to send utf-16/utf-8 string data, use the return value\n         of util.encodeUtf8(str).\n\n@return true on success, false on failure."
+      },
+      "prepareHeartbeatRequest": {
+        "!type": "fn(payload: ?, payloadLength: ?)",
+        "!span": "125034[4099:4]-125057[4099:27]",
+        "!doc": "Requests that a heartbeat request be packaged into a TLS record for\ntransmission. The tlsDataReady handler will be called when TLS record(s)\nhave been prepared.\n\nWhen a heartbeat response has been received, the heartbeatReceived\nhandler will be called with the matching payload. This handler can\nbe used to clear a retransmission timer, etc.\n\n@param payload the heartbeat data to send as the payload in the message.\n@param [payloadLength] the payload length to use, defaults to the\n         actual payload length.\n\n@return true on success, false on failure."
+      },
+      "close": {
+        "!type": "fn(clearFail: bool)",
+        "!span": "125690[4120:4]-125695[4120:9]",
+        "!doc": "Closes the connection (sends a close_notify alert).\n\n@param clearFail true to clear the fail flag (default: true)."
+      },
+      "!span": "113685[3717:10]-115262[3767:3]",
+      "!doc": "create TLS connection",
+      "sessionCache": "tls.createSessionCache.!0",
+      "input": "+ByteBuffer",
+      "tlsData": "+ByteBuffer",
+      "data": "+ByteBuffer",
+      "record": "hmac_sha1.!2",
+      "fragmented": "hmac_sha1.!2"
+    },
+    "initConnectionState.!1.error.!1": {
+      "send": {
+        "!type": "bool",
+        "!span": "110177[3577:8]-110181[3577:12]"
+      },
+      "alert": {
+        "level": {
+          "!type": "number",
+          "!span": "110432[3589:8]-110437[3589:13]"
+        },
+        "!span": "110197[3578:8]-110202[3578:13]"
+      },
+      "origin": {
+        "!type": "string",
+        "!span": "114631[3741:9]-114637[3741:15]",
+        "!doc": "set origin if not set"
+      },
+      "!span": "110167[3576:12]-110312[3582:7]",
+      "!doc": "build tls error if not already customized"
+    },
+    "initConnectionState.!2": {
+      "entity": {
+        "!type": "number",
+        "!span": "28164[939:4]-28170[939:10]"
+      },
+      "prf_algorithm": {
+        "!type": "number",
+        "!span": "28186[940:4]-28199[940:17]"
+      },
+      "compression_algorithm": {
+        "!type": "number",
+        "!span": "28472[950:4]-28493[950:25]"
+      },
+      "!span": "28158[938:17]-28636[955:3]",
+      "!doc": "create new security parameters",
+      "keys": "tls.generateKeys.!ret"
+    },
+    "encrypt_aes_cbc_sha1.!0": {},
+    "decrypt_aes_cbc_sha1.!0": {
+      "fragment": "+ByteBuffer"
+    },
+    "asn1.create.!4": {
+      "!span": "20489[621:61]-20535[623:3]",
+      "!doc": "add BIT STRING contents if available"
+    },
+    "asn1.create.!ret": {
+      "tagClass": {
+        "!type": "number",
+        "!span": "8212[212:4]-8220[212:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "8236[213:4]-8240[213:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "8252[214:4]-8263[214:15]"
+      },
+      "composed": {
+        "!type": "bool",
+        "!span": "8282[215:4]-8290[215:12]"
+      },
+      "read": {
+        "!type": "number",
+        "!span": "19652[653:42]-19656[655:1]"
+      },
+      "original": "_fromDer.!ret"
+    },
+    "asn1.validate.!1": {
+      "name": {
+        "!type": "string",
+        "!span": "12601[409:2]-12605[409:6]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "12637[410:2]-12645[410:10]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "12671[411:2]-12675[411:6]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "12699[412:2]-12710[412:13]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "12720[413:2]-12731[413:13]"
+      },
+      "value": {
+        "0": {
+          "name": {
+            "!type": "string",
+            "!span": "12777[415:4]-12781[415:8]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "12823[416:4]-12831[416:12]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "12859[417:4]-12863[417:8]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "12888[418:4]-12899[418:15]"
+          },
+          "capture": {
+            "!type": "string",
+            "!span": "12912[419:4]-12919[419:11]"
+          }
+        },
+        "1": {
+          "name": {
+            "!type": "string",
+            "!span": "13002[422:4]-13006[422:8]",
+            "!doc": "Name (subject) (RDNSequence)"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "13048[423:4]-13056[423:12]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "13084[424:4]-13088[424:8]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "13114[425:4]-13125[425:15]"
+          },
+          "captureAsn1": {
+            "!type": "string",
+            "!span": "13137[426:4]-13148[426:15]"
+          }
+        },
+        "2": "publicKeyValidator",
+        "3": {
+          "name": {
+            "!type": "string",
+            "!span": "13245[431:4]-13249[431:8]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "13294[432:4]-13302[432:12]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "13337[433:4]-13341[433:8]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "13350[434:4]-13361[434:15]"
+          },
+          "optional": {
+            "!type": "bool",
+            "!span": "13373[435:4]-13381[435:12]"
+          },
+          "capture": {
+            "!type": "string",
+            "!span": "13393[436:4]-13400[436:11]"
+          },
+          "value": {
+            "<i>": {
+              "name": {
+                "!type": "string",
+                "!span": "13460[438:6]-13464[438:10]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "13511[439:6]-13519[439:14]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "13549[440:6]-13553[440:10]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "13581[441:6]-13592[441:17]"
+              },
+              "value": {
+                "0": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "13624[443:8]-13628[443:12]"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "13682[444:8]-13690[444:16]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "13722[445:8]-13726[445:12]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "13751[446:8]-13762[446:19]"
+                  }
+                },
+                "1": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "13789[448:8]-13793[448:12]"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "13848[449:8]-13856[449:16]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "13888[450:8]-13892[450:12]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "13917[451:8]-13928[451:19]"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "asn1.validate.!2": {
+      "!span": "51043[1649:16]-51045[1649:18]",
+      "!doc": "validate certification request and capture data"
+    },
+    "asn1.validate.!3": "[string]",
+    "asn1.prettyPrint.!0": {
+      "tagClass": {
+        "!type": "number",
+        "!span": "9228[254:4]-9236[254:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "9256[255:4]-9260[255:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "9276[256:4]-9287[256:15]"
+      },
+      "composed": {
+        "!type": "bool",
+        "!span": "9310[257:4]-9318[257:12]"
+      },
+      "!span": "9222[253:9]-9378[259:3]"
+    },
+    "_fromDer.!ret": {
+      "tagClass": {
+        "!type": "number",
+        "!span": "8212[212:4]-8220[212:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "8236[213:4]-8240[213:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "8252[214:4]-8263[214:15]"
+      },
+      "composed": {
+        "!type": "bool",
+        "!span": "8282[215:4]-8290[215:12]"
+      },
+      "read": {
+        "!type": "number",
+        "!span": "19652[653:42]-19656[655:1]"
+      },
+      "!span": "8206[211:12]-8354[217:3]",
+      "!doc": "TODO: add readonly flag to avoid this overhead\nsave copy to detect changes",
+      "original": "_fromDer.!ret"
+    },
+    "BlockCipher.!0": {
+      "key": {
+        "!type": "string",
+        "!span": "2009[76:4]-2012[76:7]"
+      },
+      "decrypt": {
+        "!type": "bool",
+        "!span": "2023[77:4]-2030[77:11]"
+      },
+      "!span": "1983[74:38]-2040[78:3]"
+    },
+    "modes.ecb.prototype.unpad.!1": {
+      "decrypt": {
+        "!type": "bool",
+        "!span": "6102[201:10]-6109[201:17]"
+      },
+      "overflow": {
+        "!type": "number",
+        "!span": "6182[204:10]-6190[204:18]",
+        "!doc": "get # of bytes that won't fill a block"
+      },
+      "!span": "6088[200:16]-6090[200:18]",
+      "!doc": "build options for padding and afterFinish functions"
+    },
+    "modes.ecb.!0": {
+      "blockSize": {
+        "!type": "number",
+        "!span": "4691[159:4]-4700[159:13]"
+      },
+      "!span": "4685[158:23]-4968[168:3]",
+      "cipher": {
+        "encrypt": "modes.gcm.cipher.encrypt",
+        "decrypt": "modes.gcm.cipher.decrypt"
+      }
+    },
+    "modes.cfb.prototype.encrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "6987[257:10]-6991[257:14]"
+      }
+    },
+    "modes.cfb.prototype.decrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "8719[317:10]-8723[317:14]"
+      }
+    },
+    "modes.ofb.prototype.encrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "11014[400:10]-11018[400:14]"
+      }
+    },
+    "modes.ctr.prototype.encrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "13308[482:12]-13312[482:16]"
+      }
+    },
+    "modes.gcm.prototype.encrypt.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "19360[681:12]-19364[681:16]"
+      }
+    },
+    "modes.gcm.prototype.multiply.!0": "[number]",
+    "modes.gcm.prototype.multiply.!ret": "[number]",
+    "modes.gcm.prototype.pow.!1": "[number]",
+    "modes.gcm.prototype.ghash.!1": "[number]",
+    "publicKeyValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "6363[237:4]-6367[237:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6417[238:4]-6425[238:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "6453[239:4]-6457[239:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "6483[240:4]-6494[240:15]"
+      },
+      "value": {
+        "!type": "[publicKeyValidator.value.0.value.<i>]",
+        "!span": "6506[241:4]-6511[241:9]"
+      },
+      "!span": "6357[236:10]-6692[248:3]"
+    },
+    "publicKeyValidator.value.0.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "6522[242:6]-6526[242:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6567[243:6]-6575[243:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "6605[244:6]-6609[244:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "6632[245:6]-6643[245:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "6658[246:6]-6665[246:13]"
+      },
+      "!span": "6514[241:12]-6687[247:5]"
+    },
+    "publicKeyValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "6724[250:4]-6728[250:8]",
+        "!doc": "subjectPublicKey"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6775[251:4]-6783[251:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "6811[252:4]-6815[252:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "6842[253:4]-6853[253:15]"
+      },
+      "value": {
+        "!type": "[publicKeyValidator.value.1.value.<i>]",
+        "!span": "6866[254:4]-6871[254:9]"
+      },
+      "!span": "6694[248:5]-7125[263:3]"
+    },
+    "publicKeyValidator.value.1.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "6904[256:6]-6908[256:10]",
+        "!doc": "RSAPublicKey"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6970[257:6]-6978[257:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "7008[258:6]-7012[258:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "7040[259:6]-7051[259:17]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "7065[260:6]-7073[260:14]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "7087[261:6]-7098[261:17]"
+      },
+      "!span": "6874[254:12]-7120[262:5]"
+    },
+    "privateKeyValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "2795[103:4]-2799[103:8]",
+        "!doc": "Version (INTEGER)"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "2831[104:4]-2839[104:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "2867[105:4]-2871[105:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "2896[106:4]-2907[106:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "2920[107:4]-2927[107:11]"
+      },
+      "!span": "2764[101:10]-2952[108:3]"
+    },
+    "privateKeyValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "2987[110:4]-2991[110:8]",
+        "!doc": "privateKeyAlgorithm"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3035[111:4]-3043[111:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3071[112:4]-3075[112:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3101[113:4]-3112[113:15]"
+      },
+      "value": {
+        "!type": "[privateKeyValidator.value.1.value.<i>]",
+        "!span": "3124[114:4]-3129[114:9]"
+      },
+      "!span": "2954[108:5]-3311[121:3]"
+    },
+    "privateKeyValidator.value.1.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "3140[115:6]-3144[115:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3185[116:6]-3193[116:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3223[117:6]-3227[117:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3250[118:6]-3261[118:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "3276[119:6]-3283[119:13]"
+      },
+      "!span": "3132[114:12]-3306[120:5]"
+    },
+    "privateKeyValidator.value.2": {
+      "name": {
+        "!type": "string",
+        "!span": "3337[123:4]-3341[123:8]",
+        "!doc": "PrivateKey"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3365[124:4]-3373[124:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3401[125:4]-3405[125:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3434[126:4]-3445[126:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "3458[127:4]-3465[127:11]"
+      },
+      "!span": "3313[121:5]-3483[128:3]"
+    },
+    "ed25519.generateKeyPair.!0": {
+      "!span": "5338[164:42]-5356[164:60]",
+      "seed": "+Float32Array"
+    },
+    "ed25519.generateKeyPair.!ret": {
+      "!span": "2129[66:9]-2160[66:40]",
+      "publicKey": "+Float32Array",
+      "privateKey": "+Float32Array"
+    },
+    "ed25519.privateKeyFromAsn1.!ret": {
+      "!span": "3458[102:9]-3492[102:43]"
+    },
+    "add.!0": "[+Float32Array, +Float32Array, +Float32Array, +Float32Array]",
+    "cswap.!0": "[+Float32Array, +Float32Array, +Float32Array, +Float32Array]",
+    "cswap.!1": "[+Float32Array, +Float32Array, +Float32Array, +Float32Array]",
+    "pack.!1": "[+Float32Array, +Float32Array, +Float32Array, +Float32Array]",
+    "gf.!0": "[number]",
+    "form.serialize.!ret": {
+      "!span": "3658[137:13]-3660[137:15]"
+    },
+    "hmac.create.!ret": {
+      "start": {
+        "!type": "fn(md: string|hash.!0, key: ?)",
+        "!span": "1135[45:6]-1140[45:11]",
+        "!doc": "Starts or restarts the HMAC with the given key and message digest.\n\n@param md the message digest to use, null to reuse the previous one,\n          a string to use builtin 'sha1', 'md5', 'sha256'.\n@param key the key to use as a string, array of bytes, byte buffer,\n          or null to reuse the previous key."
+      },
+      "update": {
+        "!type": "fn(bytes: ?)",
+        "!span": "3312[123:6]-3318[123:12]",
+        "!doc": "Updates the HMAC with the given message bytes.\n\n@param bytes the bytes to update with."
+      },
+      "getMac": {
+        "!type": "fn() -> +ByteBuffer",
+        "!span": "3500[132:6]-3506[132:12]",
+        "!doc": "Produces the Message Authentication Code (MAC).\n\n@return a byte buffer containing the digest value."
+      },
+      "!span": "774[35:12]-776[35:14]",
+      "!doc": "hmac context",
+      "digest": "hmac.create.!ret.getMac"
+    },
+    "http.createClient.!0": {
+      "url": {
+        "!type": "string",
+        "!span": "12551[397:8]-12554[397:11]"
+      },
+      "policyPort": {
+        "!type": "number",
+        "!span": "12602[399:8]-12612[399:18]"
+      },
+      "connections": {
+        "!type": "number",
+        "!span": "12709[401:8]-12720[401:19]"
+      },
+      "persistCookies": {
+        "!type": "bool",
+        "!span": "12848[404:8]-12862[404:22]"
+      },
+      "primeTlsSockets": {
+        "!type": "bool",
+        "!span": "12904[405:8]-12919[405:23]"
+      },
+      "!span": "12541[396:40]-13131[410:7]",
+      "socketPool": "net.socketPools.<i>"
+    },
+    "http.createClient.!ret": {
+      "policyPort": {
+        "!type": "number",
+        "!span": "13207[467:4]-13217[467:14]",
+        "!doc": "the policy port to use"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "13475[477:4]-13481[477:10]",
+        "!doc": "whether or not the connections are secure"
+      },
+      "persistCookies": {
+        "!type": "bool",
+        "!span": "13717[482:4]-13731[482:18]",
+        "!doc": "default to flash storage of cookies"
+      },
+      "getCookie": {},
+      "url": "http.parseUrl.!ret",
+      "socketPool": "net.socketPools.<i>",
+      "requests": {
+        "<i>": "net.socketPools.<i>.sockets.<i>.options"
+      },
+      "sockets": {
+        "<i>": "net.socketPools.<i>.sockets.<i>"
+      },
+      "idle": {
+        "<i>": "net.socketPools.<i>.sockets.<i>"
+      },
+      "cookies": "_getStorageId.!0.cookies",
+      "send": {},
+      "destroy": "_getStorageId.!0.destroy",
+      "setCookie": "_getStorageId.!0.setCookie",
+      "removeCookie": "_getStorageId.!0.removeCookie",
+      "clearCookies": "_getStorageId.!0.clearCookies"
+    },
+    "http.createClient.!ret.getCookie.!ret": {
+      "comment": {
+        "!type": "string",
+        "!span": "20205[673:15]-20212[673:22]"
+      },
+      "maxAge": {
+        "!type": "number",
+        "!span": "20252[674:15]-20258[674:21]"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "20296[675:15]-20302[675:21]"
+      },
+      "httpOnly": {
+        "!type": "bool",
+        "!span": "20394[677:15]-20402[677:23]"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "20445[678:15]-20449[678:19]"
+      },
+      "created": {
+        "!type": "number",
+        "!span": "20583[681:15]-20590[681:22]"
+      }
+    },
+    "http.createRequest.!0": {
+      "!span": "14846[469:40]-14891[472:5]"
+    },
+    "http.parseUrl.!ret": {
+      "scheme": {
+        "!type": "string",
+        "!span": "59506[2274:4]-59512[2274:10]"
+      },
+      "host": {
+        "!type": "string",
+        "!span": "59524[2275:4]-59528[2275:8]"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "59556[2277:4]-59560[2277:8]"
+      },
+      "fullHost": {
+        "!type": "string",
+        "!span": "59592[2280:8]-59600[2280:16]"
+      },
+      "!span": "59485[2272:34]-59570[2278:3]",
+      "!doc": "url"
+    },
+    "http.withinCookieDomain.!1": {
+      "name": {
+        "!type": "string",
+        "!span": "36485[1250:22]-36489[1250:26]"
+      },
+      "value": {
+        "!type": "string",
+        "!span": "36520[1251:22]-36525[1251:27]"
+      },
+      "maxAge": {
+        "!type": "number",
+        "!span": "36921[1261:24]-36927[1261:30]"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "37142[1267:24]-37148[1267:30]"
+      },
+      "httpOnly": {
+        "!type": "bool",
+        "!span": "37237[1270:24]-37245[1270:32]"
+      },
+      "<i>": {
+        "!type": "string",
+        "!span": "37363[1274:26]-37367[1274:30]"
+      },
+      "comment": {
+        "!type": "string",
+        "!span": "20205[673:15]-20212[673:22]",
+        "!doc": "set cookie defaults"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "20445[678:15]-20449[678:19]"
+      },
+      "created": {
+        "!type": "number",
+        "!span": "20583[681:15]-20590[681:22]"
+      },
+      "!span": "36239[1241:22]-36241[1241:24]",
+      "!doc": "cookie may be null, a cookie object, or a domain string"
+    },
+    "_getStorageId.!0": {
+      "policyPort": {
+        "!type": "number",
+        "!span": "13207[467:4]-13217[467:14]",
+        "!doc": "the policy port to use"
+      },
+      "requests": {
+        "!type": "[net.socketPools.<i>.sockets.<i>.options]",
+        "!span": "13338[471:4]-13346[471:12]",
+        "!doc": "clear pending requests, close and destroy sockets"
+      },
+      "sockets": {
+        "!type": "[net.socketPools.<i>.sockets.<i>|forge.tls.wrapSocket.!ret]",
+        "!span": "13375[473:4]-13382[473:11]",
+        "!doc": "all sockets"
+      },
+      "idle": {
+        "!type": "[net.socketPools.<i>.sockets.<i>|forge.tls.wrapSocket.!ret]",
+        "!span": "13412[475:4]-13416[475:8]",
+        "!doc": "idle sockets"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "13475[477:4]-13481[477:10]",
+        "!doc": "whether or not the connections are secure"
+      },
+      "cookies": {
+        "<i>": {
+          "!span": "21338[702:25]-21349[702:36]",
+          "!doc": "get cookie paths",
+          "<i>": "http.withinCookieDomain.!1"
+        },
+        "!span": "13657[480:4]-13664[480:11]",
+        "!doc": "cookie jar (key'd off of name and then path, there is only 1 domain\nand one setting for secure per client so name+path is unique)"
+      },
+      "persistCookies": {
+        "!type": "bool",
+        "!span": "13717[482:4]-13731[482:18]",
+        "!doc": "default to flash storage of cookies"
+      },
+      "send": {
+        "!type": "fn(options: _getStorageId.!0.send.!0)",
+        "!span": "16404[562:9]-16408[562:13]",
+        "!doc": "Sends a request. A method 'abort' will be set on the request that\ncan be called to attempt to abort the request.\n\n@param options:\n         request: the request to send.\n         connected: a callback for when the connection is open.\n         closed: a callback for when the connection is closed.\n         headerReady: a callback for when the response header arrives.\n         bodyReady: a callback for when the response body arrives.\n         error: a callback for if an error occurs."
+      },
+      "destroy": {
+        "!type": "fn()",
+        "!span": "18426[630:9]-18433[630:16]",
+        "!doc": "Destroys this client."
+      },
+      "setCookie": {
+        "!type": "fn(cookie: http.withinCookieDomain.!1) -> bool",
+        "!span": "19861[664:9]-19870[664:18]",
+        "!doc": "Sets a cookie for use with all connections made by this client. Any\ncookie with the same name will be replaced. If the cookie's value\nis undefined, null, or the blank string, the cookie will be removed.\n\nIf the cookie's domain doesn't match this client's url host or the\ncookie's secure flag doesn't match this client's url scheme, then\nsetting the cookie will fail with an exception.\n\n@param cookie the cookie with parameters:\n  name: the name of the cookie.\n  value: the value of the cookie.\n  comment: an optional comment string.\n  maxAge: the age of the cookie in seconds relative to created time.\n  secure: true if the cookie must be sent over a secure protocol.\n  httpOnly: true to restrict access to the cookie from javascript\n    (inaffective since the cookies are stored in javascript).\n  path: the path for the cookie.\n  domain: optional domain the cookie belongs to (must start with dot).\n  version: optional version of the cookie.\n  created: creation time, in UTC seconds, of the cookie."
+      },
+      "getCookie": {
+        "!type": "fn(name: ?, path: ?) -> _getStorageId.!0.getCookie.!ret",
+        "!span": "21837[724:9]-21846[724:18]",
+        "!doc": "Gets a cookie by its name.\n\n@param name the name of the cookie to retrieve.\n@param path an optional path for the cookie (if there are multiple\n         cookies with the same name but different paths).\n\n@return the cookie or null if not found."
+      },
+      "removeCookie": {
+        "!type": "fn(name: ?, path: string) -> bool",
+        "!span": "22547[754:9]-22559[754:21]",
+        "!doc": "Removes a cookie.\n\n@param name the name of the cookie to remove.\n@param path an optional path for the cookie (if there are multiple\n         cookies with the same name but different paths).\n\n@return true if a cookie was removed, false if not."
+      },
+      "clearCookies": {
+        "!type": "fn()",
+        "!span": "23383[789:9]-23395[789:21]",
+        "!doc": "Clears all cookies stored in this client."
+      },
+      "!span": "13107[461:15]-13823[484:3]",
+      "url": "http.parseUrl.!ret",
+      "socketPool": "net.socketPools.<i>"
+    },
+    "_getStorageId.!0.send.!0": {
+      "headerReady": {
+        "!type": "fn(e: net.socketPools.<i>.sockets.<i>.options.headerReady.!0)",
+        "!span": "17078[553:12]-17089[553:23]"
+      },
+      "!span": "17024[551:18]-17026[551:20]",
+      "!doc": "create send options",
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "bodyReady": "net.socketPools.<i>.sockets.<i>.options.bodyReady",
+      "error": "net.socketPools.<i>.sockets.<i>.options.error"
+    },
+    "_getStorageId.!0.getCookie.!ret": {
+      "comment": {
+        "!type": "string",
+        "!span": "20205[673:15]-20212[673:22]"
+      },
+      "maxAge": {
+        "!type": "number",
+        "!span": "20252[674:15]-20258[674:21]"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "20296[675:15]-20302[675:21]"
+      },
+      "httpOnly": {
+        "!type": "bool",
+        "!span": "20394[677:15]-20402[677:23]"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "20445[678:15]-20449[678:19]"
+      },
+      "created": {
+        "!type": "number",
+        "!span": "20583[681:15]-20590[681:22]"
+      }
+    },
+    "_initSocket.!2": {
+      "caStore": {
+        "certs": {
+          "!span": "83747[2749:4]-83752[2749:9]",
+          "!doc": "stored certificates"
+        },
+        "getIssuer": {
+          "!type": "fn(cert: +ByteBuffer|pki.certificateFromPem.!ret) -> [?|pki.certificateFromPem.!ret]|pki.certificateFromPem.!ret",
+          "!span": "83997[2760:10]-84006[2760:19]",
+          "!doc": "Gets the certificate that issued the passed certificate or its\n'parent'.\n\n@param cert the certificate to get the parent for.\n\n@return the parent certificate or null if none was found."
+        },
+        "addCertificate": {
+          "!type": "fn(cert: pki.certificateFromPem.!ret)",
+          "!span": "84709[2781:10]-84723[2781:24]",
+          "!doc": "Adds a trusted certificate to the store.\n\n@param cert the certificate to add as a trusted certificate (either a\n         pki.certificate object or a PEM-formatted certificate)."
+        },
+        "hasCertificate": {
+          "!type": "fn(cert: pki.certificateFromPem.!ret|+ByteBuffer) -> bool",
+          "!span": "85652[2812:10]-85666[2812:24]",
+          "!doc": "Checks to see if the given certificate is in the store.\n\n@param cert the certificate to check (either a pki.certificate or a\n         PEM-formatted certificate).\n\n@return true if the certificate is in the store, false if not."
+        },
+        "listAllCertificates": {
+          "!type": "fn() -> [[?|pki.certificateFromPem.!ret]|pki.certificateFromPem.!ret]",
+          "!span": "86435[2841:10]-86454[2841:29]",
+          "!doc": "Lists all of the certificates kept in the store.\n\n@return an array of all of the pki.certificate objects in the store."
+        },
+        "removeCertificate": {
+          "!type": "fn(cert: pki.certificateFromPem.!ret) -> [?|pki.certificateFromPem.!ret]|pki.certificateFromPem.!ret",
+          "!span": "87156[2869:10]-87173[2869:27]",
+          "!doc": "Removes a certificate from the store.\n\n@param cert the certificate to remove (either a pki.certificate or a\n         PEM-formatted certificate).\n\n@return the certificate that was removed or null if the certificate\n          wasn't in store."
+        },
+        "!span": "14916[523:6]-14923[523:13]",
+        "!doc": "create CA store"
+      },
+      "virtualHost": {
+        "!type": "string",
+        "!span": "14990[525:6]-15001[525:17]"
+      },
+      "prime": {
+        "!type": "bool",
+        "!span": "15257[530:6]-15262[530:11]"
+      },
+      "!span": "14908[522:17]-15302[531:5]",
+      "!doc": "determine if TLS is used",
+      "verify": "initConnectionState.!1.verify",
+      "deflate": "initConnectionState.!1.deflate",
+      "inflate": "initConnectionState.!1.inflate"
+    },
+    "_initSocket.!2.caStore.listAllCertificates.!ret": "[[?|pki.certificateFromPem.!ret]|pki.certificateFromPem.!ret]",
+    "_hasCookieExpired.!0": {
+      "maxAge": {
+        "!type": "number",
+        "!span": "6000[192:9]-6006[192:15]",
+        "!doc": "default cookie expiration to never"
+      },
+      "comment": {
+        "!type": "string",
+        "!span": "20205[658:0]-20212[659:6]"
+      },
+      "secure": {
+        "!type": "bool",
+        "!span": "20296[663:3]-20302[663:9]"
+      },
+      "httpOnly": {
+        "!type": "bool",
+        "!span": "20394[666:0]-20402[666:8]"
+      },
+      "path": {
+        "!type": "string",
+        "!span": "20445[668:25]-20449[669:0]"
+      },
+      "created": {
+        "!type": "number",
+        "!span": "20583[673:4]-20590[673:11]"
+      }
+    },
+    "bnpExp.!1": "+NullExp",
+    "bnToByteArray.!ret": "[number]",
+    "bnpBitwiseTo.!1": {
+      "!type": "fn(x: number, y: number) -> number",
+      "!span": "20730[689:14]-20760[689:44]"
+    },
+    "bnDivideAndRemainder.!ret": "[+BigInteger]",
+    "bnGetPrng.!ret": {
+      "nextBytes": {
+        "!type": "fn(x: [number])",
+        "!span": "32791[1198:4]-32800[1198:13]",
+        "!doc": "x is an array to fill with bytes"
+      },
+      "!span": "32745[1196:9]-32926[1203:3]"
+    },
+    "bnGetPrng.!ret.nextBytes.!0": {
+      "!type": "[number]",
+      "!doc": "new BigInteger(int,RNG)"
+    },
+    "_createKDF.!1": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "2315[98:4]-2324[98:13]",
+        "!doc": "SHA-512 => sha512"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "2372[99:4]-2383[99:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "2394[100:4]-2406[100:16]"
+      },
+      "fullMessageLength": {
+        "!type": "[number]",
+        "!span": "2543[104:4]-2560[104:21]",
+        "!doc": "full message length (set md.messageLength128 for backwards-compatibility)"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "2611[106:4]-2628[106:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "start": {
+        "!type": "fn() -> _createKDF.!1",
+        "!span": "2718[114:5]-2723[114:10]",
+        "!doc": "Starts the digest.\n\n@return this digest object."
+      },
+      "update": {
+        "!type": "fn(msg: ?, encoding: string) -> _createKDF.!1",
+        "!span": "3705[144:5]-3711[144:11]",
+        "!doc": "Updates the digest with the given message input. The given input can\ntreated as raw input (no encoding will be applied) or an encoding of\n'utf8' maybe given to encode the input using UTF-8.\n\n@param msg the message input to update with.\n@param encoding the encoding to use (default: 'raw', other: 'utf8').\n\n@return this digest object."
+      },
+      "digest": {
+        "!type": "fn() -> +ByteBuffer",
+        "!span": "4616[179:5]-4622[179:11]",
+        "!doc": "Produces the digest.\n\n@return a byte buffer containing the digest value."
+      },
+      "!span": "2284[96:11]-2636[107:3]",
+      "!doc": "message digest object",
+      "messageLength128": "_createKDF.!1.fullMessageLength"
+    },
+    "sConsoleLogger.f.!1": {
+      "level": {
+        "!type": "string",
+        "!span": "4854[155:10]-4859[155:15]"
+      },
+      "standard": {
+        "!type": "string",
+        "!span": "3143[102:12]-3151[102:20]"
+      },
+      "standardFull": {
+        "!type": "string",
+        "!span": "4125[136:12]-4137[136:24]"
+      },
+      "timestamp": "+Date",
+      "arguments": "f.!1.arguments"
+    },
+    "f.!1": {
+      "level": {
+        "!type": "string",
+        "!span": "4854[155:10]-4859[155:15]"
+      },
+      "arguments": {
+        "!type": "[?]",
+        "!span": "4936[158:10]-4947[158:21]",
+        "!doc": "convert arguments to real array, remove category and message"
+      },
+      "standard": {
+        "!type": "string",
+        "!span": "3143[102:12]-3151[102:20]"
+      },
+      "standardFull": {
+        "!type": "string",
+        "!span": "4125[136:12]-4137[136:24]"
+      },
+      "!span": "4809[153:18]-5031[162:9]",
+      "!doc": "create message object\nNote: interpolation and standard formatting is done lazily",
+      "timestamp": "+Date"
+    },
+    "md5.create.!ret": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "746[36:4]-755[36:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "768[37:4]-779[37:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "789[38:4]-801[38:16]"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "996[44:4]-1013[44:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "messageLength64": "hash.!0.fullMessageLength",
+      "fullMessageLength": "hash.!0.fullMessageLength",
+      "start": "hash.!0.start",
+      "update": "hash.!0.update",
+      "digest": "hash.!0.digest"
+    },
+    "_update.!1": {
+      "!type": "[[number]|number]",
+      "!doc": "used for 64-bit word storage"
+    },
+    "mgf1.create.!ret": {
+      "generate": {
+        "!type": "fn(seed: string, maskLen: ?) -> string",
+        "!span": "833[31:4]-841[31:12]",
+        "!doc": "Generate mask of specified length.\n\n@param {String} seed The seed for mask generation.\n@param maskLen Number of bytes to generate.\n@return {String} The generated mask."
+      },
+      "!span": "609[23:12]-1625[53:3]"
+    },
+    "pki.encryptPrivateKeyInfo.!2": {
+      "legacy": {
+        "!type": "bool",
+        "!span": "4915[152:5]-4921[152:11]"
+      },
+      "algorithm": {
+        "!type": "string",
+        "!span": "4929[152:19]-4938[152:28]"
+      },
+      "saltSize": {
+        "!type": "number",
+        "!span": "6295[196:28]-6303[196:36]"
+      },
+      "count": {
+        "!type": "number",
+        "!span": "6339[198:30]-6344[198:35]"
+      },
+      "prfAlgorithm": {
+        "!type": "string",
+        "!span": "6433[202:5]-6445[202:17]"
+      },
+      "!span": "4914[152:4]-4949[152:39]"
+    },
+    "pki.privateKeyFromPem.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "19652[656:10]-19656[656:14]"
+      },
+      "n": "+BigInteger",
+      "e": "+BigInteger",
+      "d": "+BigInteger",
+      "p": "+BigInteger",
+      "q": "+BigInteger",
+      "dP": "+BigInteger",
+      "dQ": "+BigInteger",
+      "qInv": "+BigInteger",
+      "decrypt": "_modPow.!1.decrypt",
+      "sign": "_modPow.!1.sign"
+    },
+    "pki.RDNAttributesAsArray.!1": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "753[36:4]-762[36:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "776[37:4]-787[37:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "797[38:4]-809[38:16]"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "1004[44:4]-1021[44:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "messageLength64": "rsa_mgf1.!2.fullMessageLength",
+      "fullMessageLength": "rsa_mgf1.!2.fullMessageLength",
+      "start": "rsa_mgf1.!2.start",
+      "update": "rsa_mgf1.!2.update",
+      "digest": "rsa_mgf1.!2.digest"
+    },
+    "pki.RDNAttributesAsArray.!ret": "[pki.RDNAttributesAsArray.!ret.<i>]",
+    "pki.RDNAttributesAsArray.!ret.<i>": {
+      "type": {
+        "!type": "string",
+        "!span": "15894[517:10]-15898[517:14]"
+      },
+      "name": {
+        "!type": "string",
+        "!span": "16121[522:12]-16125[522:16]"
+      },
+      "!span": "15853[515:12]-15855[515:14]",
+      "!doc": "iterate over attributes"
+    },
+    "pki.CRIAttributesAsArray.!0": "[?]",
+    "pki.CRIAttributesAsArray.!ret": {
+      "<i>": {
+        "type": {
+          "!type": "string",
+          "!span": "17085[558:10]-17089[558:14]"
+        },
+        "name": {
+          "!type": "string",
+          "!span": "17276[563:12]-17280[563:16]"
+        },
+        "extensions": {
+          "<i>": "pki.certificateExtensionFromAsn1.!ret"
+        }
+      },
+      "!type": "[_getAttribute.!ret]",
+      "!doc": "each attribute has a sequence with a type and a set of values"
+    },
+    "pki.certificateFromPem.!ret": {
+      "version": {
+        "!type": "number",
+        "!span": "27761[914:7]-27768[914:14]"
+      },
+      "serialNumber": {
+        "!type": "string",
+        "!span": "27784[915:7]-27796[915:19]"
+      },
+      "signatureOid": {
+        "!type": "string",
+        "!span": "27812[916:7]-27824[916:19]"
+      },
+      "siginfo": {
+        "algorithmOid": {
+          "!type": "string",
+          "!span": "27894[919:15]-27906[919:27]"
+        },
+        "!span": "27865[918:7]-27872[918:14]",
+        "parameters": "_readSignatureParameters.!ret"
+      },
+      "validity": {
+        "!span": "27922[920:7]-27930[920:15]",
+        "notBefore": "+Date",
+        "notAfter": "+Date"
+      },
+      "issuer": {
+        "getField": {
+          "!type": "fn(sn: ?) -> _getAttribute.!ret",
+          "!span": "28051[925:14]-28059[925:22]"
+        },
+        "addField": {
+          "!type": "fn(attr: ?)",
+          "!span": "28139[928:14]-28147[928:22]"
+        },
+        "hash": {
+          "!type": "string",
+          "!span": "28288[933:14]-28292[933:18]"
+        },
+        "!span": "28024[924:7]-28030[924:13]",
+        "attributes": "pki.RDNAttributesAsArray.!ret"
+      },
+      "subject": {
+        "getField": {
+          "!type": "fn(sn: string) -> _getAttribute.!ret",
+          "!span": "28338[936:15]-28346[936:23]"
+        },
+        "addField": {
+          "!type": "fn(attr: ?)",
+          "!span": "28428[939:15]-28436[939:23]"
+        },
+        "hash": {
+          "!type": "string",
+          "!span": "28580[944:15]-28584[944:19]"
+        },
+        "!span": "28309[935:7]-28316[935:14]",
+        "attributes": "pki.RDNAttributesAsArray.!ret"
+      },
+      "setSubject": {
+        "!type": "fn(attrs: ?, uniqueId: ?)",
+        "!span": "28840[956:7]-28850[956:17]",
+        "!doc": "Sets the subject of this certificate.\n\n@param attrs the array of subject attributes to use.\n@param uniqueId an optional a unique ID to use."
+      },
+      "setIssuer": {
+        "!type": "fn(attrs: ?, uniqueId: ?)",
+        "!span": "29346[974:7]-29355[974:16]",
+        "!doc": "Sets the issuer of this certificate.\n\n@param attrs the array of issuer attributes to use.\n@param uniqueId an optional a unique ID to use."
+      },
+      "setExtensions": {
+        "!type": "fn(exts: ?)",
+        "!span": "29790[991:7]-29803[991:20]",
+        "!doc": "Sets the extensions of this certificate.\n\n@param exts the array of extensions to use."
+      },
+      "getExtension": {
+        "!type": "fn(options: ?|string) -> pki.certificateExtensionFromAsn1.!ret",
+        "!span": "30233[1008:7]-30245[1008:19]",
+        "!doc": "Gets an extension by its name or id.\n\n@param options the name to use or an object with:\n         name the name to use.\n         id the id to use.\n\n@return the extension or null if not found."
+      },
+      "sign": {
+        "!type": "fn(key: ?, md: ?)",
+        "!span": "30873[1032:7]-30877[1032:11]",
+        "!doc": "Signs this certificate using the given private key.\n\n@param key the private key to sign with.\n@param md the message digest object to use (defaults to forge.md.sha1)."
+      },
+      "verify": {
+        "!type": "fn(child: +ByteBuffer|pki.certificateFromPem.!ret) -> bool",
+        "!span": "31818[1061:7]-31824[1061:13]",
+        "!doc": "Attempts verify the signature on the passed certificate using this\ncertificate's public key.\n\n@param child the certificate to verify.\n\n@return true if verified, false if not."
+      },
+      "isIssuer": {
+        "!type": "fn(parent: ?) -> bool",
+        "!span": "35605[1176:7]-35613[1176:15]",
+        "!doc": "Returns true if this certificate's issuer matches the passed\ncertificate's subject. Note that no signature check is performed.\n\n@param parent the certificate to check.\n\n@return true if this certificate's issuer matches the passed certificate's\n        subject."
+      },
+      "issued": {
+        "!type": "fn(child: +ByteBuffer|pki.certificateFromPem.!ret) -> bool",
+        "!span": "36593[1211:7]-36599[1211:13]",
+        "!doc": "Returns true if this certificate's subject matches the issuer of the\ngiven certificate). Note that not signature check is performed.\n\n@param child the certificate to check.\n\n@return true if this certificate's subject matches the passed\n        certificate's issuer."
+      },
+      "generateSubjectKeyIdentifier": {
+        "!type": "fn() -> ?",
+        "!span": "36835[1220:7]-36863[1220:35]",
+        "!doc": "Generates the subjectKeyIdentifier for this certificate as byte buffer.\n\n@return the subjectKeyIdentifier for this certificate as byte buffer."
+      },
+      "verifySubjectKeyIdentifier": {
+        "!type": "fn() -> bool",
+        "!span": "37913[1246:7]-37939[1246:33]",
+        "!doc": "Verifies the subjectKeyIdentifier extension value for this certificate\nagainst its public key. If no extension is found, false will be\nreturned.\n\n@return true if verified, false if not."
+      },
+      "signatureParameters": {
+        "hash": {
+          "algorithmOid": {
+            "!type": "string",
+            "!span": "19751[652:8]-19763[652:20]"
+          }
+        },
+        "mgf": {
+          "algorithmOid": {
+            "!type": "string",
+            "!span": "19808[655:8]-19820[655:20]"
+          },
+          "hash": {
+            "algorithmOid": {
+              "!type": "string",
+              "!span": "19862[657:10]-19874[657:22]"
+            }
+          }
+        },
+        "saltLength": {
+          "!type": "number",
+          "!span": "19914[660:6]-19924[660:16]"
+        }
+      },
+      "read": {
+        "!type": "number",
+        "!span": "19652[645:18]-19656[645:22]"
+      },
+      "!span": "27750[913:13]-27752[913:15]",
+      "!doc": "create certificate",
+      "extensions": "pki.certificateExtensionsFromAsn1.!ret",
+      "publicKey": "_publicKeyFromJwk.!ret",
+      "md": "_createKDF.!1",
+      "tbsCertificate": "_fromDer.!ret"
+    },
+    "pki.getPublicKeyFingerprint.!1": {
+      "type": {
+        "!type": "string",
+        "!span": "37654[1236:56]-37658[1236:60]"
+      },
+      "!span": "37653[1236:55]-37675[1236:77]"
+    },
+    "pki.certificationRequestFromPem.!ret": {
+      "version": {
+        "!type": "number",
+        "!span": "54558[1755:6]-54565[1755:13]"
+      },
+      "signatureOid": {
+        "!type": "string",
+        "!span": "54580[1756:6]-54592[1756:18]"
+      },
+      "siginfo": {
+        "algorithmOid": {
+          "!type": "string",
+          "!span": "54659[1759:14]-54671[1759:26]"
+        },
+        "parameters": "_readSignatureParameters.!ret"
+      },
+      "subject": {
+        "hash": {
+          "!type": "string",
+          "!span": "54952[1770:14]-54956[1770:18]"
+        },
+        "attributes": "pki.RDNAttributesAsArray.!ret",
+        "getField": "_dnToAsn1.!0.getField",
+        "addField": "_dnToAsn1.!0.addField"
+      },
+      "publicKey": "_publicKeyFromJwk.!ret",
+      "attributes": "pki.CRIAttributesAsArray.!ret",
+      "getAttribute": {},
+      "md": "_createKDF.!1",
+      "certificationRequestInfo": "_fromDer.!ret",
+      "signatureParameters": "_readSignatureParameters.!ret",
+      "addAttribute": "_getAttribute.!0.addAttribute",
+      "setSubject": "_getAttribute.!0.setSubject",
+      "setAttributes": "_getAttribute.!0.setAttributes",
+      "sign": "_getAttribute.!0.sign",
+      "verify": "_getAttribute.!0.verify"
+    },
+    "pki.certificateExtensionsFromAsn1.!0": {
+      "type": {
+        "!type": "number",
+        "!span": "49364[1597:10]-49368[1597:14]"
+      },
+      "ip": {
+        "!type": "string",
+        "!span": "49804[1614:20]-49806[1614:22]",
+        "!doc": "convert to IPv4/IPv6 string representation"
+      },
+      "oid": {
+        "!type": "string",
+        "!span": "49924[1618:20]-49927[1618:23]"
+      },
+      "!span": "49352[1596:22]-49414[1599:9]"
+    },
+    "pki.certificateExtensionsFromAsn1.!ret": {
+      "!type": "[pki.certificateExtensionFromAsn1.!ret]",
+      "!span": "28601[946:7]-28611[946:17]",
+      "!doc": "set new extensions"
+    },
+    "pki.certificateExtensionFromAsn1.!ret": {
+      "id": {
+        "!type": "string",
+        "!span": "45973[1496:4]-45975[1496:6]"
+      },
+      "critical": {
+        "!type": "bool",
+        "!span": "46017[1497:4]-46025[1497:12]"
+      },
+      "name": {
+        "!type": "string",
+        "!span": "46294[1506:6]-46298[1506:10]"
+      },
+      "digitalSignature": {
+        "!type": "bool",
+        "!span": "46788[1522:8]-46804[1522:24]",
+        "!doc": "set flags"
+      },
+      "nonRepudiation": {
+        "!type": "bool",
+        "!span": "46837[1523:8]-46851[1523:22]"
+      },
+      "keyEncipherment": {
+        "!type": "bool",
+        "!span": "46884[1524:8]-46899[1524:23]"
+      },
+      "dataEncipherment": {
+        "!type": "bool",
+        "!span": "46932[1525:8]-46948[1525:24]"
+      },
+      "keyAgreement": {
+        "!type": "bool",
+        "!span": "46981[1526:8]-46993[1526:20]"
+      },
+      "keyCertSign": {
+        "!type": "bool",
+        "!span": "47026[1527:8]-47037[1527:19]"
+      },
+      "cRLSign": {
+        "!type": "bool",
+        "!span": "47070[1528:8]-47077[1528:15]"
+      },
+      "encipherOnly": {
+        "!type": "bool",
+        "!span": "47110[1529:8]-47122[1529:20]"
+      },
+      "decipherOnly": {
+        "!type": "bool",
+        "!span": "47155[1530:8]-47167[1530:20]"
+      },
+      "cA": {
+        "!type": "bool",
+        "!span": "47475[1537:10]-47477[1537:12]"
+      },
+      "pathLenConstraint": {
+        "!type": "number",
+        "!span": "47857[1549:10]-47874[1549:27]"
+      },
+      "<i>": {
+        "!type": "bool",
+        "!span": "48199[1558:12]-48208[1558:21]"
+      },
+      "client": {
+        "!type": "bool",
+        "!span": "48680[1575:8]-48686[1575:14]",
+        "!doc": "set flags"
+      },
+      "server": {
+        "!type": "bool",
+        "!span": "48719[1576:8]-48725[1576:14]"
+      },
+      "email": {
+        "!type": "bool",
+        "!span": "48758[1577:8]-48763[1577:13]"
+      },
+      "objsign": {
+        "!type": "bool",
+        "!span": "48796[1578:8]-48803[1578:15]"
+      },
+      "reserved": {
+        "!type": "bool",
+        "!span": "48836[1579:8]-48844[1579:16]"
+      },
+      "sslCA": {
+        "!type": "bool",
+        "!span": "48877[1580:8]-48882[1580:13]"
+      },
+      "emailCA": {
+        "!type": "bool",
+        "!span": "48915[1581:8]-48922[1581:15]"
+      },
+      "objCA": {
+        "!type": "bool",
+        "!span": "48955[1582:8]-48960[1582:13]"
+      },
+      "altNames": {
+        "!type": "[pki.certificateExtensionsFromAsn1.!0]",
+        "!span": "49126[1587:8]-49134[1587:16]",
+        "!doc": "handle subjectAltName/issuerAltName"
+      },
+      "subjectKeyIdentifier": {
+        "!type": "string",
+        "!span": "50253[1628:8]-50273[1628:28]"
+      },
+      "!span": "45965[1495:10]-45967[1495:12]",
+      "!doc": "an extension has:\n[0] extnID      OBJECT IDENTIFIER\n[1] critical    BOOLEAN DEFAULT FALSE\n[2] extnValue   OCTET STRING"
+    },
+    "pki.distinguishedNameToAsn1.!0": {
+      "!span": "30074[961:40]-30098[961:64]",
+      "attributes": "pki.RDNAttributesAsArray.!ret"
+    },
+    "pki.verifyCertificateChain.!2": {
+      "verify": {
+        "!type": "fn(vfd: bool|string, depth: number, chain: [+ByteBuffer|pki.certificateFromPem.!ret]) -> bool|string",
+        "!span": "108939[3537:12]-108945[3537:18]"
+      },
+      "!span": "108834[3532:18]-108836[3532:20]",
+      "!doc": "Make a copy of c.verifyOptions so that we can modify options.verify\nwithout modifying c.verifyOptions."
+    },
+    "encryptedPrivateKeyValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "1319[52:4]-1323[52:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "1376[53:4]-1384[53:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "1412[54:4]-1416[54:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "1442[55:4]-1453[55:15]"
+      },
+      "value": {
+        "!type": "[encryptedPrivateKeyValidator.value.0.value.0, encryptedPrivateKeyValidator.value.0.value.1]",
+        "!span": "1465[56:4]-1470[56:9]"
+      },
+      "!span": "1313[51:10]-1840[69:3]"
+    },
+    "encryptedPrivateKeyValidator.value.0.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "1481[57:6]-1485[57:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "1526[58:6]-1534[58:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "1564[59:6]-1568[59:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "1591[60:6]-1602[60:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "1617[61:6]-1624[61:13]"
+      },
+      "!span": "1473[56:12]-1647[62:5]"
+    },
+    "encryptedPrivateKeyValidator.value.0.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "1657[63:6]-1661[63:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "1703[64:6]-1711[64:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "1741[65:6]-1745[65:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "1773[66:6]-1784[66:17]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "1798[67:6]-1809[67:17]"
+      },
+      "!span": "1649[62:7]-1835[68:5]"
+    },
+    "encryptedPrivateKeyValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "1869[71:4]-1873[71:8]",
+        "!doc": "encryptedData"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "1920[72:4]-1928[72:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "1956[73:4]-1960[73:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "1989[74:4]-2000[74:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "2013[75:4]-2020[75:11]"
+      },
+      "!span": "1842[69:5]-2041[76:3]"
+    },
+    "PBES2AlgorithmsValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "2315[87:4]-2319[87:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "2362[88:4]-2370[88:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "2398[89:4]-2402[89:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "2428[90:4]-2439[90:15]"
+      },
+      "value": {
+        "!type": "[PBES2AlgorithmsValidator.value.0.value.0, PBES2AlgorithmsValidator.value.0.value.1]",
+        "!span": "2451[91:4]-2456[91:9]"
+      },
+      "!span": "2309[86:10]-3813[137:3]"
+    },
+    "PBES2AlgorithmsValidator.value.0.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "2467[92:6]-2471[92:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "2520[93:6]-2528[93:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "2558[94:6]-2562[94:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "2585[95:6]-2596[95:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "2611[96:6]-2618[96:13]"
+      },
+      "!span": "2459[91:12]-2634[97:5]"
+    },
+    "PBES2AlgorithmsValidator.value.0.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "2644[98:6]-2648[98:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "2682[99:6]-2690[99:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "2720[100:6]-2724[100:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "2752[101:6]-2763[101:17]"
+      },
+      "value": {
+        "!type": "[PBES2AlgorithmsValidator.value.0.value.1.value.0, PBES2AlgorithmsValidator.value.0.value.1.value.1, PBES2AlgorithmsValidator.value.0.value.1.value.2, PBES2AlgorithmsValidator.value.0.value.1.value.3]",
+        "!span": "2777[102:6]-2782[102:11]"
+      },
+      "!span": "2636[97:7]-3808[136:5]"
+    },
+    "PBES2AlgorithmsValidator.value.0.value.1.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "2795[103:8]-2799[103:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "2840[104:8]-2848[104:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "2880[105:8]-2884[105:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "2917[106:8]-2928[106:19]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "2945[107:8]-2952[107:15]"
+      },
+      "!span": "2785[102:14]-2971[108:7]"
+    },
+    "PBES2AlgorithmsValidator.value.0.value.1.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "2983[109:8]-2987[109:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3038[110:8]-3046[110:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3078[111:8]-3082[111:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3111[112:8]-3122[112:19]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "3139[113:8]-3146[113:15]"
+      },
+      "!span": "2973[108:9]-3175[114:7]"
+    },
+    "PBES2AlgorithmsValidator.value.0.value.1.value.2": {
+      "name": {
+        "!type": "string",
+        "!span": "3187[115:8]-3191[115:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3237[116:8]-3245[116:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3277[117:8]-3281[117:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3310[118:8]-3321[118:19]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "3338[119:8]-3346[119:16]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "3362[120:8]-3369[120:15]"
+      },
+      "!span": "3177[114:9]-3390[121:7]"
+    },
+    "PBES2AlgorithmsValidator.value.0.value.1.value.3": {
+      "name": {
+        "!type": "string",
+        "!span": "3417[123:8]-3421[123:12]",
+        "!doc": "prf"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3461[124:8]-3469[124:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3501[125:8]-3505[125:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3535[126:8]-3546[126:19]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "3562[127:8]-3570[127:16]"
+      },
+      "value": {
+        "!type": "[PBES2AlgorithmsValidator.value.0.value.1.value.3.value.<i>]",
+        "!span": "3586[128:8]-3591[128:13]"
+      },
+      "!span": "3392[121:9]-3801[135:7]"
+    },
+    "PBES2AlgorithmsValidator.value.0.value.1.value.3.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "3606[129:10]-3610[129:14]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3662[130:10]-3670[130:18]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3704[131:10]-3708[131:14]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3735[132:10]-3746[132:21]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "3765[133:10]-3772[133:17]"
+      },
+      "!span": "3594[128:16]-3792[134:9]"
+    },
+    "PBES2AlgorithmsValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "3821[138:4]-3825[138:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3867[139:4]-3875[139:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3903[140:4]-3907[140:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3933[141:4]-3944[141:15]"
+      },
+      "value": {
+        "!type": "[PBES2AlgorithmsValidator.value.1.value.0, PBES2AlgorithmsValidator.value.1.value.1]",
+        "!span": "3956[142:4]-3961[142:9]"
+      },
+      "!span": "3815[137:5]-4325[155:3]"
+    },
+    "PBES2AlgorithmsValidator.value.1.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "3972[143:6]-3976[143:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4024[144:6]-4032[144:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4062[145:6]-4066[145:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4089[146:6]-4100[146:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "4115[147:6]-4122[147:13]"
+      },
+      "!span": "3964[142:12]-4138[148:5]"
+    },
+    "PBES2AlgorithmsValidator.value.1.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "4148[149:6]-4152[149:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4199[150:6]-4207[150:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4237[151:6]-4241[151:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4272[152:6]-4283[152:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "4298[153:6]-4305[153:13]"
+      },
+      "!span": "4140[148:7]-4320[154:5]"
+    },
+    "pkcs12PbeParamsValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "4491[164:4]-4495[164:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4526[165:4]-4534[165:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4562[166:4]-4566[166:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4595[167:4]-4606[167:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "4619[168:4]-4626[168:11]"
+      },
+      "!span": "4485[163:10]-4638[169:3]"
+    },
+    "pkcs12PbeParamsValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "4646[170:4]-4650[170:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4687[171:4]-4695[171:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4723[172:4]-4727[172:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4752[173:4]-4763[173:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "4776[174:4]-4783[174:11]"
+      },
+      "!span": "4640[169:5]-4801[175:3]"
+    },
+    "hash.!0": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "746[36:4]-755[36:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "768[37:4]-779[37:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "789[38:4]-801[38:16]"
+      },
+      "fullMessageLength": {
+        "!type": "[number]",
+        "!span": "928[42:4]-945[42:21]",
+        "!doc": "full message length (set md.messageLength64 for backwards-compatibility)"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "996[44:4]-1013[44:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "start": {
+        "!type": "fn() -> hash.!0",
+        "!span": "1102[52:5]-1107[52:10]",
+        "!doc": "Starts the digest.\n\n@return this digest object."
+      },
+      "update": {
+        "!type": "fn(msg: ?, encoding: ?) -> hash.!0",
+        "!span": "2076[84:5]-2082[84:11]",
+        "!doc": "Updates the digest with the given message input. The given input can\ntreated as raw input (no encoding will be applied) or an encoding of\n'utf8' maybe given to encode the input using UTF-8.\n\n@param msg the message input to update with.\n@param encoding the encoding to use (default: 'raw', other: 'utf8').\n\n@return this digest object."
+      },
+      "digest": {
+        "!type": "fn() -> +ByteBuffer",
+        "!span": "2989[119:5]-2995[119:11]",
+        "!doc": "Produces the digest.\n\n@return a byte buffer containing the digest value."
+      },
+      "!span": "740[35:11]-1020[45:3]",
+      "!doc": "message digest object",
+      "messageLength64": "hash.!0.fullMessageLength"
+    },
+    "pem.encode.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "27457[901:4]-27461[901:8]"
+      },
+      "!span": "27451[900:12]-27558[903:3]",
+      "!doc": "convert to ASN.1, then DER, then PEM-encode"
+    },
+    "pem.encode.!1": {
+      "!span": "27591[904:31]-27609[904:49]"
+    },
+    "pem.decode.!ret": "[pem.decode.!ret.<i>]",
+    "pem.decode.!ret.<i>": {
+      "type": {
+        "!type": "string",
+        "!span": "3012[109:6]-3016[109:10]"
+      },
+      "procType": {
+        "version": {
+          "!type": "string",
+          "!span": "4449[158:26]-4456[158:33]"
+        },
+        "type": {
+          "!type": "string",
+          "!span": "4469[158:46]-4473[158:50]"
+        },
+        "!span": "3034[110:6]-3042[110:14]"
+      },
+      "contentDomain": {
+        "!type": "string",
+        "!span": "3056[111:6]-3069[111:19]",
+        "!doc": "special-case Content-Domain"
+      },
+      "dekInfo": {
+        "algorithm": {
+          "!type": "string",
+          "!span": "4967[168:25]-4976[168:34]"
+        },
+        "parameters": {
+          "!type": "string",
+          "!span": "4989[168:47]-4999[168:57]"
+        },
+        "!span": "3083[112:6]-3090[112:13]"
+      },
+      "headers": {
+        "!type": "[pem.decode.!ret.<i>.headers.<i>]",
+        "!span": "3104[113:6]-3111[113:13]"
+      },
+      "body": {
+        "!type": "string",
+        "!span": "3123[114:6]-3127[114:10]"
+      },
+      "!span": "3004[108:14]-3164[115:5]"
+    },
+    "pem.decode.!ret.<i>.headers.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "3797[143:22]-3801[143:26]"
+      },
+      "values": {
+        "!type": "[string]",
+        "!span": "3813[143:38]-3819[143:44]"
+      },
+      "!span": "3796[143:21]-3824[143:49]"
+    },
+    "foldHeader.!0": {
+      "name": {
+        "!type": "string",
+        "!span": "1829[61:14]-1833[61:18]"
+      },
+      "values": {
+        "!type": "[string]",
+        "!span": "1847[61:32]-1853[61:38]"
+      },
+      "!span": "1828[61:13]-1879[61:64]",
+      "!doc": "encode special headers"
+    },
+    "rsa_mgf1.!2": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "753[36:4]-762[36:13]"
+      },
+      "blockLength": {
+        "!type": "number",
+        "!span": "776[37:4]-787[37:15]"
+      },
+      "digestLength": {
+        "!type": "number",
+        "!span": "797[38:4]-809[38:16]"
+      },
+      "fullMessageLength": {
+        "!type": "[number]",
+        "!span": "936[42:4]-953[42:21]",
+        "!doc": "full message length (set md.messageLength64 for backwards-compatibility)"
+      },
+      "messageLengthSize": {
+        "!type": "number",
+        "!span": "1004[44:4]-1021[44:21]",
+        "!doc": "size of message length in bytes"
+      },
+      "start": {
+        "!type": "fn() -> rsa_mgf1.!2",
+        "!span": "1110[52:5]-1115[52:10]",
+        "!doc": "Starts the digest.\n\n@return this digest object."
+      },
+      "update": {
+        "!type": "fn(msg: ?, encoding: string) -> rsa_mgf1.!2",
+        "!span": "2106[85:5]-2112[85:11]",
+        "!doc": "Updates the digest with the given message input. The given input can\ntreated as raw input (no encoding will be applied) or an encoding of\n'utf8' maybe given to encode the input using UTF-8.\n\n@param msg the message input to update with.\n@param encoding the encoding to use (default: 'raw', other: 'utf8').\n\n@return this digest object."
+      },
+      "digest": {
+        "!type": "fn() -> +ByteBuffer",
+        "!span": "3021[120:5]-3027[120:11]",
+        "!doc": "Produces the digest.\n\n@return a byte buffer containing the digest value."
+      },
+      "!span": "747[35:11]-1028[45:3]",
+      "!doc": "message digest object",
+      "messageLength64": "rsa_mgf1.!2.fullMessageLength"
+    },
+    "p12.pkcs12FromAsn1.!ret": {
+      "safeContents": {
+        "<i>": {
+          "encrypted": {
+            "!type": "bool",
+            "!span": "15681[541:6]-15690[541:15]"
+          },
+          "safeBags": {
+            "<i>": {
+              "type": {
+                "!type": "string",
+                "!span": "19026[652:6]-19030[652:10]"
+              },
+              "key": "_modPow.!1",
+              "asn1": "_fromDer.!ret",
+              "cert": "pki.certificateFromPem.!ret",
+              "attributes": {
+                "<i>": "_decodeBagAttributes.!ret.<i>"
+              }
+            }
+          }
+        }
+      },
+      "getBags": {},
+      "getBagsByFriendlyName": {},
+      "getBagsByLocalKeyId": "_decodeAuthenticatedSafe.!0.getBagsByLocalKeyId"
+    },
+    "p12.toPkcs12Asn1.!3": {
+      "saltSize": {
+        "!type": "number",
+        "!span": "24053[798:10]-24061[798:18]"
+      },
+      "count": {
+        "!type": "number",
+        "!span": "24097[799:10]-24102[799:15]"
+      },
+      "algorithm": {
+        "!type": "string",
+        "!span": "24138[800:10]-24147[800:19]"
+      },
+      "useMac": {
+        "!type": "bool",
+        "!span": "24248[802:12]-24254[802:18]"
+      },
+      "generateLocalKeyId": {
+        "!type": "bool",
+        "!span": "24392[808:12]-24410[808:30]"
+      },
+      "prfAlgorithm": {
+        "!type": "string",
+        "!span": "6433[245:5]-6445[245:17]"
+      },
+      "!span": "24039[797:23]-24041[797:25]",
+      "!doc": "set default options"
+    },
+    "contentInfoValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "3818[127:4]-3822[127:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3855[128:4]-3863[128:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3891[129:4]-3895[129:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3916[130:4]-3927[130:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "3940[131:4]-3947[131:11]"
+      },
+      "!span": "3812[126:10]-3966[132:3]"
+    },
+    "contentInfoValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "3974[133:4]-3978[133:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4007[134:4]-4015[134:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4050[135:4]-4054[135:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4063[136:4]-4074[136:15]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "4086[137:4]-4094[137:12]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "4106[138:4]-4117[138:15]"
+      },
+      "!span": "3968[132:5]-4132[139:3]"
+    },
+    "pfxValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "3726[139:4]-3730[139:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3751[140:4]-3759[140:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3787[141:4]-3791[141:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3816[142:4]-3827[142:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "3840[143:4]-3847[143:11]"
+      },
+      "!span": "3720[138:10]-3862[144:3]"
+    },
+    "pfxValidator.value.2": {
+      "name": {
+        "!type": "string",
+        "!span": "3894[146:4]-3898[146:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "3919[147:4]-3927[147:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "3955[148:4]-3959[148:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "3985[149:4]-3996[149:15]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "4008[150:4]-4016[150:12]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "4028[151:4]-4039[151:15]"
+      },
+      "value": {
+        "!type": "[pfxValidator.value.2.value.0, pfxValidator.value.2.value.1, pfxValidator.value.2.value.2]",
+        "!span": "4052[152:4]-4057[152:9]"
+      },
+      "!span": "3888[145:24]-5358[194:3]"
+    },
+    "pfxValidator.value.2.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "4068[153:6]-4072[153:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4099[154:6]-4107[154:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4137[155:6]-4141[155:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4184[156:6]-4195[156:17]"
+      },
+      "value": {
+        "!type": "[pfxValidator.value.2.value.0.value.0, pfxValidator.value.2.value.0.value.1]",
+        "!span": "4209[157:6]-4214[157:11]"
+      },
+      "!span": "4060[152:12]-4990[180:5]"
+    },
+    "pfxValidator.value.2.value.0.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "4227[158:8]-4231[158:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4276[159:8]-4284[159:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4316[160:8]-4320[160:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4380[161:8]-4391[161:19]"
+      },
+      "value": {
+        "!type": "[pfxValidator.value.2.value.0.value.0.value.0, pfxValidator.value.2.value.0.value.0.value.1]",
+        "!span": "4407[162:8]-4412[162:13]"
+      },
+      "!span": "4217[157:14]-4798[173:7]"
+    },
+    "pfxValidator.value.2.value.0.value.0.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "4427[163:10]-4431[163:14]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4488[164:10]-4496[164:18]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4530[165:10]-4534[165:14]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4561[166:10]-4572[166:21]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "4591[167:10]-4598[167:17]"
+      },
+      "!span": "4415[162:16]-4624[168:9]"
+    },
+    "pfxValidator.value.2.value.0.value.0.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "4638[169:10]-4642[169:14]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4700[170:10]-4708[170:18]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "4742[171:10]-4753[171:21]"
+      },
+      "!span": "4626[168:11]-4789[172:9]"
+    },
+    "pfxValidator.value.2.value.0.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "4810[174:8]-4814[174:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4850[175:8]-4858[175:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4890[176:8]-4894[176:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4927[177:8]-4938[177:19]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "4955[178:8]-4962[178:15]"
+      },
+      "!span": "4800[173:9]-4983[179:7]"
+    },
+    "pfxValidator.value.2.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "5000[181:6]-5004[181:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "5035[182:6]-5043[182:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "5073[183:6]-5077[183:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "5108[184:6]-5119[184:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "5134[185:6]-5141[185:13]"
+      },
+      "!span": "4992[180:7]-5158[186:5]"
+    },
+    "pfxValidator.value.2.value.2": {
+      "name": {
+        "!type": "string",
+        "!span": "5168[187:6]-5172[187:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "5206[188:6]-5214[188:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "5244[189:6]-5248[189:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "5275[190:6]-5286[190:17]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "5301[191:6]-5309[191:14]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "5323[192:6]-5330[192:13]"
+      },
+      "!span": "5160[186:7]-5353[193:5]"
+    },
+    "safeBagValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "5507[203:4]-5511[203:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "5534[204:4]-5542[204:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "5570[205:4]-5574[205:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "5595[206:4]-5606[206:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "5619[207:4]-5626[207:11]"
+      },
+      "!span": "5501[202:10]-5639[208:3]"
+    },
+    "safeBagValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "5647[209:4]-5651[209:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "5677[210:4]-5685[210:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "5720[211:4]-5731[211:15]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "5743[212:4]-5754[212:15]"
+      },
+      "!span": "5641[208:5]-5770[213:3]"
+    },
+    "safeBagValidator.value.2": {
+      "name": {
+        "!type": "string",
+        "!span": "5778[214:4]-5782[214:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "5813[215:4]-5821[215:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "5849[216:4]-5853[216:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "5874[217:4]-5885[217:15]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "5897[218:4]-5905[218:12]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "5917[219:4]-5924[219:11]"
+      },
+      "!span": "5772[213:5]-5945[220:3]"
+    },
+    "attributeValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "6098[229:4]-6102[229:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6128[230:4]-6136[230:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "6164[231:4]-6168[231:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "6189[232:4]-6200[232:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "6213[233:4]-6220[233:11]"
+      },
+      "!span": "6092[228:10]-6231[234:3]"
+    },
+    "attributeValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "6239[235:4]-6243[235:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6273[236:4]-6281[236:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "6309[237:4]-6313[237:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "6334[238:4]-6345[238:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "6357[239:4]-6364[239:11]"
+      },
+      "!span": "6233[234:5]-6378[240:3]"
+    },
+    "certBagValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "6527[249:4]-6531[249:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6555[250:4]-6563[250:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "6591[251:4]-6595[251:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "6616[252:4]-6627[252:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "6640[253:4]-6647[253:11]"
+      },
+      "!span": "6521[248:10]-6661[254:3]"
+    },
+    "certBagValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "6669[255:4]-6673[255:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6700[256:4]-6708[256:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "6743[257:4]-6754[257:15]"
+      },
+      "value": {
+        "!type": "[certBagValidator.value.1.value.<i>]",
+        "!span": "6892[260:4]-6897[260:9]",
+        "!doc": "So far we only support X.509 certificates (which are wrapped in\nan OCTET STRING, hence hard code that here)."
+      },
+      "!span": "6663[254:5]-7070[267:3]"
+    },
+    "certBagValidator.value.1.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "6908[261:6]-6912[261:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6944[262:6]-6952[262:14]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "7018[264:6]-7029[264:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "7044[265:6]-7051[265:13]"
+      },
+      "!span": "6900[260:12]-7065[266:5]"
+    },
+    "_getBagsByAttribute.!0": {
+      "!type": "[_getBagsByAttribute.!0.<i>]",
+      "!span": "9004[336:4]-9016[336:16]"
+    },
+    "_getBagsByAttribute.!0.<i>": {
+      "encrypted": {
+        "!type": "bool",
+        "!span": "15681[541:6]-15690[541:15]"
+      },
+      "safeBags": {
+        "<i>": {
+          "type": {
+            "!type": "string",
+            "!span": "19026[652:6]-19030[652:10]"
+          },
+          "key": "_modPow.!1",
+          "asn1": "_fromDer.!ret",
+          "cert": "pki.certificateFromPem.!ret",
+          "attributes": {
+            "<i>": "_decodeBagAttributes.!ret.<i>"
+          }
+        }
+      },
+      "!span": "15673[540:14]-15703[542:5]"
+    },
+    "_getBagsByAttribute.!ret": {
+      "!type": "[_getBagsByAttribute.!ret.<i>]",
+      "!span": "10006[364:13]-10020[364:27]"
+    },
+    "_getBagsByAttribute.!ret.<i>": {
+      "type": {
+        "!type": "string",
+        "!span": "19026[652:6]-19030[652:10]"
+      },
+      "!span": "19018[651:14]-19129[654:5]",
+      "!doc": "Create bag object and push to result array.",
+      "key": "_modPow.!1",
+      "asn1": "_fromDer.!ret",
+      "cert": "pki.certificateFromPem.!ret",
+      "attributes": {
+        "<i>": "_decodeBagAttributes.!ret.<i>"
+      }
+    },
+    "_decodePkcs7Data.!0": {
+      "constructed": {
+        "!type": "bool",
+        "!span": "14440[502:25]-14451[502:36]"
+      },
+      "composed": {
+        "!type": "bool",
+        "!span": "14424[502:9]-14432[502:17]"
+      }
+    },
+    "_decodeAuthenticatedSafe.!0": {
+      "getBags": {
+        "!type": "fn(filter: ?) -> _decodeAuthenticatedSafe.!0.getBags.!ret",
+        "!span": "9595[351:4]-9602[351:11]",
+        "!doc": "Gets bags with matching attributes.\n\n@param filter the attributes to filter by:\n         [localKeyId] the localKeyId to search for.\n         [localKeyIdHex] the localKeyId in hex to search for.\n         [friendlyName] the friendly name to search for.\n         [bagType] bag type to narrow each attribute search by.\n\n@return a map of attribute type to an array of matching bags or, if no\n          attribute was given but a bag type, the map key will be the\n          bag type."
+      },
+      "getBagsByFriendlyName": {
+        "!type": "fn(friendlyName: ?, bagType: ?) -> [_getBagsByAttribute.!ret.<i>]",
+        "!span": "10819[392:4]-10840[392:25]",
+        "!doc": "DEPRECATED: use getBags() instead.\n\nGet bags with matching friendlyName attribute.\n\n@param friendlyName the friendly name to search for.\n@param [bagType] bag type to narrow search by.\n\n@return an array of bags with matching friendlyName attribute."
+      },
+      "getBagsByLocalKeyId": {
+        "!type": "fn(localKeyId: ?, bagType: ?) -> [_getBagsByAttribute.!ret.<i>]",
+        "!span": "11296[407:4]-11315[407:23]",
+        "!doc": "DEPRECATED: use getBags() instead.\n\nGet bags with matching localKeyId attribute.\n\n@param localKeyId the localKeyId to search for.\n@param [bagType] bag type to narrow search by.\n\n@return an array of bags with matching localKeyId attribute."
+      },
+      "!span": "8954[334:12]-11454[411:3]",
+      "safeContents": "_getBagsByAttribute.!0"
+    },
+    "_decodeAuthenticatedSafe.!0.getBags.!ret": {
+      "!span": "9640[352:17]-9642[352:19]",
+      "<i>": "_getBagsByAttribute.!ret",
+      "localKeyId": "_getBagsByAttribute.!ret",
+      "friendlyName": "_getBagsByAttribute.!ret"
+    },
+    "_decodeSafeContents.!ret": {
+      "!type": "[_getBagsByAttribute.!ret.<i>]",
+      "!span": "16404[563:8]-16412[563:16]"
+    },
+    "_decodeBagAttributes.!ret": {
+      "<i>": {
+        "!type": "[?]",
+        "!span": "22423[756:19]-22436[756:32]"
+      },
+      "!span": "21904[738:21]-21906[738:23]"
+    },
+    "p7.messageFromPem.!ret": {
+      "version": {
+        "!type": "number",
+        "!span": "18359[589:4]-18366[589:11]"
+      },
+      "recipients": {
+        "<i>": {
+          "version": {
+            "!type": "number",
+            "!span": "21713[700:8]-21720[700:15]"
+          },
+          "encryptedContent": "_recipientsFromAsn1.!ret.<i>.encryptedContent"
+        }
+      },
+      "encryptedContent": {
+        "algorithm": {
+          "!type": "string",
+          "!span": "37653[1185:6]-37662[1185:15]",
+          "!doc": "Keep a copy of the key & IV in the object, so the caller can\nuse it for whatever reason."
+        },
+        "parameter": "+ByteBuffer",
+        "content": "+ByteBuffer",
+        "key": "+ByteBuffer"
+      },
+      "findRecipient": {},
+      "content": "+ByteBuffer",
+      "fromAsn1": "_fromAsn1.!0.fromAsn1",
+      "toAsn1": "_fromAsn1.!0.toAsn1",
+      "decrypt": "_fromAsn1.!0.decrypt",
+      "addRecipient": "_fromAsn1.!0.addRecipient",
+      "encrypt": "_fromAsn1.!0.encrypt",
+      "rawCapture": "_fromAsn1.!ret"
+    },
+    "p7.messageFromPem.!ret.findRecipient.!ret": {
+      "serialNumber": {
+        "!type": "string",
+        "!span": "26217[836:4]-26229[836:16]"
+      },
+      "encryptedContent": {
+        "algorithm": {
+          "!type": "string",
+          "!span": "26310[838:6]-26319[838:15]"
+        }
+      },
+      "issuer": "pki.RDNAttributesAsArray.!ret"
+    },
+    "p7.createSignedData.!ret": {
+      "version": {
+        "!type": "number",
+        "!span": "3313[125:4]-3320[125:11]"
+      },
+      "certificates": {
+        "!type": "[pki.certificateFromPem.!ret]",
+        "!span": "3329[126:4]-3341[126:16]"
+      },
+      "crls": {
+        "!type": "[?]",
+        "!span": "3351[127:4]-3355[127:8]"
+      },
+      "signers": {
+        "<i>": {
+          "version": {
+            "!type": "number",
+            "!span": "9954[317:8]-9961[317:15]"
+          },
+          "serialNumber": {
+            "!type": "string",
+            "!span": "9998[319:8]-10010[319:20]"
+          },
+          "key": "_modPow.!1",
+          "issuer": "pki.RDNAttributesAsArray.!ret",
+          "authenticatedAttributesAsn1": "_fromDer.!ret",
+          "authenticatedAttributes": "_signerToAsn1.!0.authenticatedAttributes",
+          "unauthenticatedAttributes": "_signerToAsn1.!0.unauthenticatedAttributes"
+        }
+      },
+      "digestAlgorithmIdentifiers": {
+        "!type": "[_fromDer.!ret]",
+        "!span": "3464[131:4]-3490[131:30]",
+        "!doc": "add unique digest algorithm identifiers"
+      },
+      "fromAsn1": {
+        "!type": "fn(obj: ?)",
+        "!span": "3545[135:4]-3553[135:12]"
+      },
+      "toAsn1": {
+        "!type": "fn() -> _fromDer.!ret",
+        "!span": "4114[154:4]-4120[154:10]"
+      },
+      "addSigner": {
+        "!type": "fn(signer: ?)",
+        "!span": "7603[248:4]-7612[248:13]",
+        "!doc": "Add (another) entity to list of signers.\n\nNote: If authenticatedAttributes are provided, then, per RFC 2315,\nthey must include at least two attributes: content type and\nmessage digest. The message digest attribute value will be\nauto-calculated during signing and will be ignored if provided.\n\nHere's an example of providing these two attributes:\n\nforge.pkcs7.createSignedData();\np7.addSigner({\n  issuer: cert.issuer.attributes,\n  serialNumber: cert.serialNumber,\n  key: privateKey,\n  digestAlgorithm: forge.pki.oids.sha1,\n  authenticatedAttributes: [{\n    type: forge.pki.oids.contentType,\n    value: forge.pki.oids.data\n  }, {\n    type: forge.pki.oids.messageDigest\n  }]\n});\n\nTODO: Support [subjectKeyIdentifier] as signer's ID.\n\n@param signer the signer information:\n         key the signer's private key.\n         [certificate] a certificate containing the public key\n           associated with the signer's private key; use this option as\n           an alternative to specifying signer.issuer and\n           signer.serialNumber.\n         [issuer] the issuer attributes (eg: cert.issuer.attributes).\n         [serialNumber] the signer's certificate's serial number in\n          hexadecimal (eg: cert.serialNumber).\n         [digestAlgorithm] the message digest OID, as a string, to use\n           (eg: forge.pki.oids.sha1).\n         [authenticatedAttributes] an optional array of attributes\n           to also sign along with the content."
+      },
+      "sign": {
+        "!type": "fn(options: ?)",
+        "!span": "10457[333:4]-10461[333:8]",
+        "!doc": "Signs the content.\n@param options Options to apply when signing:\n   [detached] boolean. If signing should be done in detached mode. Defaults to false."
+      },
+      "verify": {
+        "!type": "fn()",
+        "!span": "12010[379:4]-12016[379:10]"
+      },
+      "addCertificate": {
+        "!type": "fn(cert: pki.certificateFromPem.!ret)",
+        "!span": "12212[388:4]-12226[388:18]",
+        "!doc": "Add a certificate.\n\n@param cert the certificate to add."
+      },
+      "addCertificateRevokationList": {
+        "!type": "fn(crl: ?)",
+        "!span": "12537[401:4]-12565[401:32]",
+        "!doc": "Add a certificate revokation list.\n\n@param crl the certificate revokation list to add."
+      },
+      "!span": "3270[123:8]-12658[404:3]",
+      "contentInfo": "_fromDer.!ret",
+      "signerInfos": {
+        "<i>": "_fromDer.!ret"
+      },
+      "detachedContent": "_fromDer.!ret",
+      "encryptedContent": "_encryptedContentToAsn1.!0",
+      "content": "+ByteBuffer",
+      "rawCapture": "_fromAsn1.!ret"
+    },
+    "p7.createEncryptedData.!ret": {
+      "version": {
+        "!type": "number",
+        "!span": "17467[550:4]-17474[550:11]"
+      },
+      "fromAsn1": {
+        "!type": "fn(obj: ?)",
+        "!span": "17724[560:4]-17732[560:12]",
+        "!doc": "Reads an EncryptedData content block (in ASN.1 format)\n\n@param obj The ASN.1 representation of the EncryptedData content block"
+      },
+      "decrypt": {
+        "!type": "fn(key: ?)",
+        "!span": "17996[570:4]-18003[570:11]",
+        "!doc": "Decrypt encrypted content\n\n@param key The (symmetric) key as a byte buffer"
+      },
+      "!span": "17421[548:8]-18136[576:3]",
+      "encryptedContent": "_encryptedContentToAsn1.!0",
+      "content": "+ByteBuffer",
+      "rawCapture": "_fromAsn1.!ret"
+    },
+    "_recipientFromAsn1.!ret": {
+      "serialNumber": {
+        "!type": "string",
+        "!span": "26217[836:4]-26229[836:16]"
+      },
+      "encryptedContent": {
+        "algorithm": {
+          "!type": "string",
+          "!span": "26310[838:6]-26319[838:15]"
+        },
+        "!span": "26284[837:4]-26300[837:20]"
+      },
+      "!span": "26107[833:9]-26442[842:3]",
+      "issuer": "pki.RDNAttributesAsArray.!ret"
+    },
+    "_recipientsFromAsn1.!ret": {
+      "!type": "[_recipientFromAsn1.!ret]",
+      "!span": "18375[590:4]-18385[590:14]"
+    },
+    "_recipientsFromAsn1.!ret.<i>": {
+      "version": {
+        "!type": "number",
+        "!span": "21713[700:8]-21720[700:15]"
+      },
+      "encryptedContent": {
+        "!span": "21814[703:8]-21830[703:24]"
+      },
+      "!span": "21703[699:26]-22137[710:7]"
+    },
+    "_recipientsToAsn1.!ret": "[_fromDer.!ret]",
+    "_signerFromAsn1.!ret": {
+      "serialNumber": {
+        "!type": "string",
+        "!span": "29019[930:4]-29031[930:16]"
+      },
+      "digestAlgorithm": {
+        "!type": "string",
+        "!span": "29086[931:4]-29101[931:19]"
+      },
+      "signatureAlgorithm": {
+        "!type": "string",
+        "!span": "29147[932:4]-29165[932:22]"
+      },
+      "authenticatedAttributes": {
+        "!type": "[?]",
+        "!span": "29248[934:4]-29271[934:27]"
+      },
+      "unauthenticatedAttributes": {
+        "!type": "[?]",
+        "!span": "29281[935:4]-29306[935:29]"
+      },
+      "!span": "28909[927:13]-29314[936:3]",
+      "issuer": "pki.RDNAttributesAsArray.!ret"
+    },
+    "_signerToAsn1.!0": {
+      "version": {
+        "!type": "number",
+        "!span": "9954[317:8]-9961[317:15]"
+      },
+      "serialNumber": {
+        "!type": "string",
+        "!span": "9998[319:8]-10010[319:20]"
+      },
+      "authenticatedAttributes": {
+        "!type": "[?]",
+        "!span": "10159[323:8]-10182[323:31]",
+        "!doc": "if authenticatedAttributes is present, then the attributes\nmust contain at least PKCS #9 content-type and message-digest"
+      },
+      "unauthenticatedAttributes": {
+        "!type": "[?]",
+        "!span": "10217[324:8]-10242[324:33]"
+      },
+      "!span": "9926[315:23]-10254[325:7]",
+      "key": "_modPow.!1",
+      "issuer": "pki.RDNAttributesAsArray.!ret",
+      "authenticatedAttributesAsn1": "_fromDer.!ret"
+    },
+    "_signersFromAsn1.!ret": "[_signerFromAsn1.!ret]",
+    "_signersToAsn1.!0": {
+      "!type": "[_signerToAsn1.!0]",
+      "!span": "3416[129:4]-3423[129:11]",
+      "!doc": "TODO: add json-formatted signer stuff here?"
+    },
+    "_signersToAsn1.!ret": {
+      "!type": "[_fromDer.!ret]",
+      "!span": "3523[133:4]-3534[133:15]",
+      "!doc": "add signer info"
+    },
+    "_attributeToAsn1.!0": {
+      "value": "+Date"
+    },
+    "_encryptedContentToAsn1.!0": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "37653[1185:6]-37662[1185:15]",
+        "!doc": "Keep a copy of the key & IV in the object, so the caller can\nuse it for whatever reason."
+      },
+      "!span": "37645[1184:27]-37824[1188:5]",
+      "parameter": "+ByteBuffer",
+      "content": "+ByteBuffer",
+      "key": "+ByteBuffer"
+    },
+    "_encryptedContentToAsn1.!ret": "[_fromDer.!ret, _fromDer.!ret, _fromDer.!ret]",
+    "_fromAsn1.!0": {
+      "version": {
+        "!type": "number",
+        "!span": "18359[589:4]-18366[589:11]"
+      },
+      "fromAsn1": {
+        "!type": "fn(obj: ?)",
+        "!span": "18637[600:4]-18645[600:12]",
+        "!doc": "Reads an EnvelopedData content block (in ASN.1 format)\n\n@param obj the ASN.1 representation of the EnvelopedData content block."
+      },
+      "toAsn1": {
+        "!type": "fn() -> _fromDer.!ret",
+        "!span": "18885[606:4]-18891[606:10]"
+      },
+      "findRecipient": {
+        "!type": "fn(cert: ?) -> _recipientsFromAsn1.!ret.<i>",
+        "!span": "19996[636:4]-20009[636:17]",
+        "!doc": "Find recipient by X.509 certificate's issuer.\n\n@param cert the certificate with the issuer to look for.\n\n@return the recipient object."
+      },
+      "decrypt": {
+        "!type": "fn(recipient: ?, privKey: ?)",
+        "!span": "20858[674:4]-20865[674:11]",
+        "!doc": "Decrypt enveloped content\n\n@param recipient The recipient object related to the private key\n@param privKey The (RSA) private key object"
+      },
+      "addRecipient": {
+        "!type": "fn(cert: ?)",
+        "!span": "21646[698:4]-21658[698:16]",
+        "!doc": "Add (another) entity to list of recipients.\n\n@param cert The certificate of the entity to add."
+      },
+      "encrypt": {
+        "!type": "fn(key: +ByteBuffer, cipher: string)",
+        "!span": "22745[726:4]-22752[726:11]",
+        "!doc": "Encrypt enveloped content.\n\nThis function supports two optional arguments, cipher and key, which\ncan be used to influence symmetric encryption.  Unless cipher is\nprovided, the cipher specified in encryptedContent.algorithm is used\n(defaults to AES-256-CBC).  If no key is provided, encryptedContent.key\nis (re-)used.  If that one's not set, a random key will be generated\nautomatically.\n\n@param [key] The key to be used for symmetric encryption.\n@param [cipher] The OID of the symmetric cipher to use."
+      },
+      "!span": "18313[587:8]-25560[811:3]",
+      "recipients": "_recipientsFromAsn1.!ret",
+      "encryptedContent": "_encryptedContentToAsn1.!0",
+      "content": "+ByteBuffer",
+      "rawCapture": "_fromAsn1.!ret"
+    },
+    "_fromAsn1.!ret": {
+      "!span": "36582[1155:16]-36584[1155:18]",
+      "!doc": "validate EnvelopedData content block and capture data"
+    },
+    "p7v.envelopedDataValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "6217[211:4]-6221[211:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6252[212:4]-6260[212:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "6288[213:4]-6292[213:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "6317[214:4]-6328[214:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "6341[215:4]-6348[215:11]"
+      },
+      "!span": "6211[210:10]-6363[216:3]"
+    },
+    "p7v.envelopedDataValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "6371[217:4]-6375[217:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6413[218:4]-6421[218:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "6449[219:4]-6453[219:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "6474[220:4]-6485[220:15]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "6497[221:4]-6508[221:15]"
+      },
+      "!span": "6365[216:5]-6530[222:3]"
+    },
+    "p7v.encryptedDataValidator.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "6729[231:4]-6733[231:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "6764[232:4]-6772[232:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "6800[233:4]-6804[233:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "6829[234:4]-6840[234:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "6853[235:4]-6860[235:11]"
+      },
+      "!span": "6723[230:10]-6875[236:3]"
+    },
+    "p7v.recipientInfoValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "10109[361:4]-10113[361:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "10144[362:4]-10152[362:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "10180[363:4]-10184[363:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "10209[364:4]-10220[364:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "10233[365:4]-10240[365:11]"
+      },
+      "!span": "10103[360:10]-10255[366:3]"
+    },
+    "p7v.recipientInfoValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "10263[367:4]-10267[367:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "10306[368:4]-10314[368:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "10342[369:4]-10346[369:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "10372[370:4]-10383[370:15]"
+      },
+      "value": {
+        "!type": "[p7v.recipientInfoValidator.value.1.value.0, p7v.recipientInfoValidator.value.1.value.1]",
+        "!span": "10395[371:4]-10400[371:9]"
+      },
+      "!span": "10257[366:5]-10776[384:3]"
+    },
+    "p7v.recipientInfoValidator.value.1.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "10411[372:6]-10415[372:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "10463[373:6]-10471[373:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "10501[374:6]-10505[374:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "10533[375:6]-10544[375:17]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "10558[376:6]-10569[376:17]"
+      },
+      "!span": "10403[371:12]-10585[377:5]"
+    },
+    "p7v.recipientInfoValidator.value.1.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "10595[378:6]-10599[378:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "10653[379:6]-10661[379:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "10691[380:6]-10695[380:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "10722[381:6]-10733[381:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "10748[382:6]-10755[382:13]"
+      },
+      "!span": "10587[377:7]-10771[383:5]"
+    },
+    "p7v.recipientInfoValidator.value.2": {
+      "name": {
+        "!type": "string",
+        "!span": "10784[385:4]-10788[385:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "10834[386:4]-10842[386:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "10870[387:4]-10874[387:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "10900[388:4]-10911[388:15]"
+      },
+      "value": {
+        "!type": "[p7v.recipientInfoValidator.value.2.value.0, p7v.recipientInfoValidator.value.2.value.1]",
+        "!span": "10923[389:4]-10928[389:9]"
+      },
+      "!span": "10778[384:5]-11295[401:3]"
+    },
+    "p7v.recipientInfoValidator.value.2.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "10939[390:6]-10943[390:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "11001[391:6]-11009[391:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "11039[392:6]-11043[392:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "11066[393:6]-11077[393:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "11092[394:6]-11099[394:13]"
+      },
+      "!span": "10931[389:12]-11121[395:5]"
+    },
+    "p7v.recipientInfoValidator.value.2.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "11131[396:6]-11135[396:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "11193[397:6]-11201[397:14]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "11231[398:6]-11242[398:17]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "11257[399:6]-11268[399:17]"
+      },
+      "!span": "11123[395:7]-11290[400:5]"
+    },
+    "p7v.recipientInfoValidator.value.3": {
+      "name": {
+        "!type": "string",
+        "!span": "11303[402:4]-11307[402:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "11343[403:4]-11351[403:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "11379[404:4]-11383[404:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "11412[405:4]-11423[405:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "11436[406:4]-11443[406:11]"
+      },
+      "!span": "11297[401:5]-11457[407:3]"
+    },
+    "encryptedContentInfoValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "4356[149:4]-4360[149:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4402[150:4]-4410[150:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4438[151:4]-4442[151:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4463[152:4]-4474[152:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "4487[153:4]-4494[153:11]"
+      },
+      "!span": "4350[148:10]-4513[154:3]"
+    },
+    "encryptedContentInfoValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "4521[155:4]-4525[155:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4582[156:4]-4590[156:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4618[157:4]-4622[157:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4648[158:4]-4659[158:15]"
+      },
+      "value": {
+        "!type": "[encryptedContentInfoValidator.value.1.value.0, encryptedContentInfoValidator.value.1.value.1]",
+        "!span": "4671[159:4]-4676[159:9]"
+      },
+      "!span": "4515[154:5]-5039[170:3]"
+    },
+    "encryptedContentInfoValidator.value.1.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "4687[160:6]-4691[160:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4760[161:6]-4768[161:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4798[162:6]-4802[162:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4825[163:6]-4836[163:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "4851[164:6]-4858[164:13]"
+      },
+      "!span": "4679[159:12]-4880[165:5]"
+    },
+    "encryptedContentInfoValidator.value.1.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "4890[166:6]-4894[166:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4963[167:6]-4971[167:14]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "5001[168:6]-5012[168:17]"
+      },
+      "!span": "4882[165:7]-5034[169:5]"
+    },
+    "encryptedContentInfoValidator.value.2": {
+      "name": {
+        "!type": "string",
+        "!span": "5047[171:4]-5051[171:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "5098[172:4]-5106[172:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "5141[173:4]-5145[173:8]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "5984[200:4]-5991[200:11]",
+        "!doc": "The PKCS#7 structure output by OpenSSL somewhat differs from what\nother implementations do generate.\n\nOpenSSL generates a structure like this:\nSEQUENCE {\n   ...\n   [0]\n      26 DA 67 D2 17 9C 45 3C B1 2A A8 59 2F 29 33 38\n      C3 C3 DF 86 71 74 7A 19 9F 40 D0 29 BE 85 90 45\n      ...\n}\n\nWhereas other implementations (and this PKCS#7 module) generate:\nSEQUENCE {\n   ...\n   [0] {\n      OCTET STRING\n         26 DA 67 D2 17 9C 45 3C B1 2A A8 59 2F 29 33 38\n         C3 C3 DF 86 71 74 7A 19 9F 40 D0 29 BE 85 90 45\n         ...\n   }\n}\n\nIn order to support both, we just capture the context specific\nfield here.  The OCTET STRING bit is removed below."
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "6017[201:4]-6028[201:15]"
+      },
+      "!span": "5041[170:5]-6056[202:3]"
+    },
+    "signerValidator.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "8776[305:4]-8780[305:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "8826[306:4]-8834[306:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "8869[307:4]-8873[307:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "8882[308:4]-8893[308:15]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "8905[309:4]-8913[309:12]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "8925[310:4]-8932[310:11]"
+      },
+      "!span": "8770[304:5]-8965[311:3]"
+    },
+    "findPrime.!0": {
+      "hex": {
+        "!type": "string",
+        "!span": "7507[242:8]-7510[242:11]"
+      },
+      "workLoad": {
+        "!type": "number",
+        "!span": "7525[243:8]-7533[243:16]"
+      },
+      "!span": "7497[241:27]-7551[244:7]"
+    },
+    "findPrime.!ret": {
+      "found": {
+        "!type": "bool",
+        "!span": "2181[54:10]-2186[54:15]"
+      },
+      "!span": "2180[54:9]-2194[54:23]"
+    },
+    "getPrng.!ret": {
+      "nextBytes": {
+        "!type": "fn(x: [number])",
+        "!span": "4032[136:4]-4041[136:13]",
+        "!doc": "x is an array to fill with bytes"
+      },
+      "!span": "3986[134:9]-4165[141:3]"
+    },
+    "pss.create.!0": {
+      "!span": "1211[36:14]-1298[40:5]"
+    },
+    "pss.create.!ret": {
+      "encode": {
+        "!type": "fn(md: ?, modBits: ?) -> string",
+        "!span": "2345[81:9]-2351[81:15]",
+        "!doc": "Encodes a PSS signature.\n\nThis function implements EMSA-PSS-ENCODE as per RFC 3447, section 9.1.1.\n\n@param md the message digest object with the hash to sign.\n@param modsBits the length of the RSA modulus in bits.\n\n@return the encoded message as a binary-encoded string of length\n          ceil((modBits - 1) / 8)."
+      },
+      "verify": {
+        "!type": "fn(mHash: ?, em: ?, modBits: number) -> bool",
+        "!span": "4914[159:9]-4920[159:15]",
+        "!doc": "Verifies a PSS signature.\n\nThis function implements EMSA-PSS-VERIFY as per RFC 3447, section 9.1.2.\n\n@param mHash the message digest hash, as a binary-encoded string, to\n        compare against the signature.\n@param em the encoded message, as a binary-encoded string\n         (RSA decryption result).\n@param modsBits the length of the RSA modulus in bits.\n\n@return true if the signature was verified, false if not."
+      },
+      "!span": "1962[68:15]-1964[68:17]"
+    },
+    "createCipher.!ret": {
+      "start": {
+        "!type": "fn(iv: +ByteBuffer|string, output: ?)",
+        "!span": "7536[243:4]-7541[243:9]",
+        "!doc": "Starts or restarts the encryption or decryption process, whichever\nwas previously configured.\n\nTo use the cipher in CBC mode, iv may be given either as a string\nof bytes, or as a byte buffer.  For ECB mode, give null as iv.\n\n@param iv the initialization vector to use, null for ECB mode.\n@param output the output the buffer to write to, null to create one."
+      },
+      "update": {
+        "!type": "fn(input: +ByteBuffer)",
+        "!span": "7985[264:4]-7991[264:10]",
+        "!doc": "Updates the next block.\n\n@param input the buffer to read from."
+      },
+      "finish": {
+        "!type": "fn(pad: ?) -> bool",
+        "!span": "8624[289:4]-8630[289:10]",
+        "!doc": "Finishes encrypting or decrypting.\n\n@param pad a padding function to use, null for PKCS#7 padding,\n          signature(blockSize, buffer, decrypt).\n\n@return true if successful, false on error."
+      },
+      "!span": "7103[232:11]-9727[332:3]",
+      "!doc": "Create cipher object",
+      "output": "+ByteBuffer"
+    },
+    "util.nextTick.!0": {
+      "!type": "fn()",
+      "!span": "3394[115:35]-3445[117:9]"
+    },
+    "util.parseFragment.!ret": {
+      "queryString": {
+        "!type": "string",
+        "!span": "63008[2417:4]-63019[2417:15]"
+      },
+      "!span": "62982[2415:9]-63061[2420:3]",
+      "query": "?"
+    },
+    "util.makeRequest.!ret": {
+      "query": {
+        "!type": "string",
+        "!span": "64119[2448:4]-64124[2448:9]",
+        "!doc": "full query string"
+      },
+      "getPath": {
+        "!type": "fn(i: ?)",
+        "!span": "64302[2456:4]-64309[2456:11]",
+        "!doc": "Get path or element in path.\n\n@param i optional path index.\n\n@return path or part of path if i provided."
+      },
+      "getQuery": {
+        "!type": "fn(k: ?, i: ?) -> ?|[?]",
+        "!span": "64641[2467:4]-64649[2467:12]",
+        "!doc": "Get query, values for a key, or value for a key index.\n\n@param k optional query key.\n@param i optional query key index.\n\n@return query, values for a key, or value for a key index."
+      },
+      "getQueryLast": {
+        "!type": "fn(k: ?, _default: ?) -> !1",
+        "!span": "64917[2479:4]-64929[2479:16]"
+      },
+      "!span": "64037[2444:12]-65136[2489:3]"
+    },
+    "util.makeRequest.!ret.getQueryLast.!1": "[?]",
+    "util.estimateCores.!0": {
+      "!type": "fn(err: ?, cores: number)",
+      "!span": "5386[168:36]-5529[175:5]"
+    },
+    "rsaPrivateKeyValidator.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "5282[196:4]-5286[196:8]",
+        "!doc": "coefficient ((inverse of q) mod p)"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "5321[197:4]-5329[197:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "5357[198:4]-5361[198:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "5386[199:4]-5397[199:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "5410[200:4]-5417[200:11]"
+      },
+      "!span": "5234[194:5]-5446[201:3]"
+    },
+    "rsaPublicKeyValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "5677[213:4]-5681[213:8]",
+        "!doc": "modulus (n)"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "5711[214:4]-5719[214:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "5747[215:4]-5751[215:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "5776[216:4]-5787[216:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "5800[217:4]-5807[217:11]"
+      },
+      "!span": "5652[211:10]-5831[218:3]"
+    },
+    "rsaPublicKeyValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "5865[220:4]-5869[220:8]",
+        "!doc": "publicExponent (e)"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "5900[221:4]-5908[221:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "5936[222:4]-5940[222:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "5965[223:4]-5976[223:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "5989[224:4]-5996[224:11]"
+      },
+      "!span": "5833[218:5]-6021[225:3]"
+    },
+    "_modPow.!1": {
+      "decrypt": {
+        "!type": "fn(data: ?, scheme: ?, schemeOptions: ?) -> ?",
+        "!span": "36684[1174:6]-36691[1174:13]",
+        "!doc": "Decrypts the given data with this private key. The decryption scheme\nmust match the one used to encrypt the data.\n\n@param data the byte string to decrypt.\n@param scheme the decryption scheme to use:\n         'RSAES-PKCS1-V1_5' (default),\n         'RSA-OAEP',\n         'RAW', 'NONE', or null to perform raw RSA decryption.\n@param schemeOptions any scheme-specific options.\n\n@return the decrypted byte string."
+      },
+      "sign": {
+        "!type": "fn(md: +ByteBuffer, scheme: ?) -> ?",
+        "!span": "38365[1221:6]-38369[1221:10]",
+        "!doc": "Signs the given digest, producing a signature.\n\nPKCS#1 supports multiple (currently two) signature schemes:\nRSASSA-PKCS1-V1_5 and RSASSA-PSS.\n\nBy default this implementation uses the \"old scheme\", i.e.\nRSASSA-PKCS1-V1_5. In order to generate a PSS signature, provide\nan instance of Forge PSS object as the scheme parameter.\n\n@param md the message digest object with the hash to sign.\n@param scheme the signature scheme to use:\n         'RSASSA-PKCS1-V1_5' or undefined for RSASSA PKCS#1 v1.5,\n         a Forge PSS object for RSASSA-PSS,\n         'NONE' or null for none, DigestInfo will not be used but\n           PKCS#1 v1.5 padding will still be used.\n\n@return the signature as a byte string."
+      },
+      "read": {
+        "!type": "number",
+        "!span": "19652[656:10]-19656[656:14]"
+      },
+      "!span": "36108[1150:12]-36202[1159:3]",
+      "n": "+BigInteger",
+      "e": "+BigInteger",
+      "d": "+BigInteger",
+      "p": "+BigInteger",
+      "q": "+BigInteger",
+      "dP": "+BigInteger",
+      "dQ": "+BigInteger",
+      "qInv": "+BigInteger"
+    },
+    "_generateKeyPair.!0": {
+      "algorithm": {
+        "!type": "string",
+        "!span": "18660[622:6]-18669[622:15]"
+      },
+      "state": {
+        "!type": "number",
+        "!span": "18688[623:6]-18693[623:11]"
+      },
+      "bits": {
+        "!type": "number",
+        "!span": "18704[624:6]-18708[624:10]"
+      },
+      "rng": {
+        "nextBytes": {
+          "!type": "fn(x: [number])",
+          "!span": "18345[608:4]-18354[608:13]",
+          "!doc": "x is an array to fill with bytes"
+        },
+        "!span": "18722[625:6]-18725[625:9]"
+      },
+      "eInt": {
+        "!type": "number",
+        "!span": "18738[626:6]-18742[626:10]"
+      },
+      "qBits": {
+        "!type": "number",
+        "!span": "18823[630:6]-18828[630:11]"
+      },
+      "pBits": {
+        "!type": "number",
+        "!span": "18847[631:6]-18852[631:11]"
+      },
+      "pqState": {
+        "!type": "number",
+        "!span": "18880[632:6]-18887[632:13]",
+        "!doc": "store p or q"
+      },
+      "keys": {
+        "!span": "18915[634:6]-18919[634:10]",
+        "privateKey": "_modPow.!1",
+        "publicKey": "_publicKeyFromJwk.!ret"
+      },
+      "!span": "18652[621:11]-18931[635:5]",
+      "!doc": "create PRIMEINC algorithm state",
+      "e": "+BigInteger",
+      "p": "+BigInteger",
+      "q": "+BigInteger",
+      "num": "+BigInteger",
+      "p1": "+BigInteger",
+      "q1": "+BigInteger",
+      "phi": "+BigInteger",
+      "n": "+BigInteger"
+    },
+    "_publicKeyFromJwk.!ret": {
+      "encrypt": {
+        "!type": "fn(data: ?, scheme: ?, schemeOptions: ?) -> ?",
+        "!span": "32241[1036:6]-32248[1036:13]",
+        "!doc": "Encrypts the given data with this public key. Newer applications\nshould use the 'RSA-OAEP' decryption scheme, 'RSAES-PKCS1-V1_5' is for\nlegacy applications.\n\n@param data the byte string to encrypt.\n@param scheme the encryption scheme to use:\n         'RSAES-PKCS1-V1_5' (default),\n         'RSA-OAEP',\n         'RAW', 'NONE', or null to perform raw RSA encryption,\n         an object with an 'encode' property set to a function\n         with the signature 'function(data, key)' that returns\n         a binary-encoded string representing the encoded data.\n@param schemeOptions any scheme-specific options.\n\n@return the encrypted byte string."
+      },
+      "verify": {
+        "!type": "fn(digest: ?, signature: ?, scheme: ?) -> bool",
+        "!span": "34488[1097:6]-34494[1097:12]",
+        "!doc": "Verifies the given signature against the given digest.\n\nPKCS#1 supports multiple (currently two) signature schemes:\nRSASSA-PKCS1-V1_5 and RSASSA-PSS.\n\nBy default this implementation uses the \"old scheme\", i.e.\nRSASSA-PKCS1-V1_5, in which case once RSA-decrypted, the\nsignature is an OCTET STRING that holds a DigestInfo.\n\nDigestInfo ::= SEQUENCE {\n  digestAlgorithm DigestAlgorithmIdentifier,\n  digest Digest\n}\nDigestAlgorithmIdentifier ::= AlgorithmIdentifier\nDigest ::= OCTET STRING\n\nTo perform PSS signature verification, provide an instance\nof Forge PSS object as the scheme parameter.\n\n@param digest the message digest hash to compare against the signature,\n         as a binary-encoded string.\n@param signature the signature to verify, as a binary-encoded string.\n@param scheme signature verification scheme to use:\n         'RSASSA-PKCS1-V1_5' or undefined for RSASSA PKCS#1 v1.5,\n         a Forge PSS object for RSASSA-PSS,\n         'NONE' or null for none, DigestInfo will not be expected, but\n           PKCS#1 v1.5 padding will still be used.\n\n@return true if the signature was verified, false if not."
+      },
+      "!span": "31482[1014:12]-31506[1017:3]",
+      "n": "+BigInteger",
+      "e": "+BigInteger",
+      "dP": "+BigInteger",
+      "dQ": "+BigInteger",
+      "qInv": "+BigInteger"
+    },
+    "_states.SHA-512.<i>": "[number]",
+    "_states.SHA-384.<i>": "[number]",
+    "_states.SHA-512/256.<i>": "[number]",
+    "_states.SHA-512/224.<i>": "[number]",
+    "net.socketPools.<i>.sockets.<i>.connected.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "2282[66:10]-2286[66:14]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "2309[67:10]-2323[67:24]"
+      },
+      "!span": "2245[64:28]-2350[68:9]",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "net.socketPools.<i>.sockets.<i>.closed.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "5447[189:9]-5451[189:13]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "5471[190:9]-5485[190:23]"
+      },
+      "!span": "5412[187:21]-5497[191:8]"
+    },
+    "net.socketPools.<i>.sockets.<i>.data.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "2617[79:8]-2621[79:12]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "2645[80:8]-2659[80:22]"
+      },
+      "!span": "2584[77:21]-2684[81:7]"
+    },
+    "net.socketPools.<i>.sockets.<i>.error.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "3698[131:6]-3702[131:10]"
+      },
+      "message": {
+        "!type": "string",
+        "!span": "3718[132:6]-3725[132:13]"
+      },
+      "bytesAvailable": {
+        "!type": "number",
+        "!span": "3744[133:6]-3758[133:20]"
+      },
+      "!span": "3669[129:20]-3767[134:5]"
+    },
+    "net.socketPools.<i>.sockets.<i>.connect.!0": {
+      "host": {
+        "!type": "string",
+        "!span": "3256[129:6]-3260[129:10]"
+      },
+      "policyPort": {
+        "!type": "number",
+        "!span": "3314[131:6]-3324[131:16]"
+      },
+      "!span": "3248[128:19]-3384[133:5]"
+    },
+    "net.socketPools.<i>.sockets.<i>.options.request.getCookies.!ret": "[http.withinCookieDomain.!1]",
+    "net.socketPools.<i>.sockets.<i>.options.headerReady.!0": {
+      "!span": "6721[253:39]-6846[257:13]",
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "net.socketPools.<i>.sockets.<i>.options.bodyReady.!0": {
+      "!span": "7060[264:35]-7177[268:11]",
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "net.socketPools.<i>.sockets.<i>.options.error.!0": {
+      "type": {
+        "!type": "string",
+        "!span": "7702[285:6]-7706[285:10]"
+      },
+      "message": {
+        "!type": "string",
+        "!span": "7722[286:6]-7729[286:13]"
+      },
+      "!span": "7694[284:25]-7848[290:5]",
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "net.createSocketPool.!0": {
+      "policyPort": {
+        "!type": "number",
+        "!span": "4170[131:4]-4180[131:14]"
+      },
+      "msie": {
+        "!type": "bool",
+        "!span": "4226[133:4]-4230[133:8]"
+      },
+      "!span": "4134[129:29]-4257[134:3]"
+    },
+    "Task.prototype.fail.!0": {
+      "error": {
+        "!type": "bool",
+        "!span": "11925[445:9]-11930[445:14]",
+        "!doc": "propagate task info"
+      },
+      "swapTime": {
+        "!type": "number",
+        "!span": "11954[446:9]-11962[446:17]"
+      },
+      "state": {
+        "!type": "string",
+        "!span": "14796[557:7]-14801[557:12]"
+      }
+    },
+    "Task.!0": {
+      "run": {
+        "!type": "fn(task: +Task)",
+        "!span": "17750[647:4]-17753[647:7]",
+        "!doc": "save run function"
+      },
+      "name": {
+        "!type": "string",
+        "!span": "17772[648:4]-17776[648:8]"
+      },
+      "!span": "17744[646:22]-17809[649:3]"
+    },
+    "hmac_sha1.!1": {
+      "!type": "[http.withinCookieDomain.!1|hmac_sha1.!1, http.withinCookieDomain.!1]",
+      "!doc": "get cookie from default domain"
+    },
+    "hmac_sha1.!2": {
+      "type": {
+        "!type": "number",
+        "!span": "117286[3841:8]-117290[3841:12]"
+      },
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "117334[3843:10]-117339[3843:15]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "117364[3844:10]-117369[3844:15]"
+        },
+        "!span": "117313[3842:8]-117320[3842:15]"
+      },
+      "length": {
+        "!type": "number",
+        "!span": "117402[3846:8]-117408[3846:14]"
+      },
+      "ready": {
+        "!type": "bool",
+        "!span": "117477[3848:8]-117482[3848:13]",
+        "!doc": "record is now ready"
+      },
+      "!span": "117276[3840:17]-117497[3849:7]",
+      "!doc": "cache the record, clear its fragment, and reset the buffer read\npointer before the type and length were read",
+      "fragment": "+ByteBuffer"
+    },
+    "deflate.!2": {
+      "sequenceNumber": {
+        "!type": "[number]",
+        "!span": "75257[2453:6]-75271[2453:20]",
+        "!doc": "two 32-bit numbers, first is most significant"
+      },
+      "macLength": {
+        "!type": "number",
+        "!span": "75307[2455:6]-75316[2455:15]"
+      },
+      "cipherFunction": {
+        "!type": "fn(record: hmac_sha1.!2) -> bool",
+        "!span": "75377[2458:6]-75391[2458:20]"
+      },
+      "updateSequenceNumber": {
+        "!type": "fn()",
+        "!span": "75519[2461:6]-75539[2461:26]"
+      },
+      "update": {
+        "!type": "fn(c: ?, record: hmac_sha1.!2) -> bool",
+        "!span": "75935[2478:13]-75941[2478:19]",
+        "!doc": "update function in write mode will compress then encrypt a record"
+      },
+      "!span": "75194[2451:15]-75756[2469:5]",
+      "!doc": "change current write state to pending write state",
+      "compressFunction": "deflate"
+    },
+    "ctTable.<i>": {
+      "!type": "[[fn(c: ?|initConnectionState.!1, record: ?|hmac_sha1.!2), fn(c: initConnectionState.!1, record: hmac_sha1.!2), fn(c: initConnectionState.!1, record: hmac_sha1.!2) -> number, fn(c: ?|initConnectionState.!1, record: ?|hmac_sha1.!2), fn(c: initConnectionState.!1, record: hmac_sha1.!2) -> number]]",
+      "!doc": "map server current expect state and content type to function"
+    },
+    "ctTable.<i>.<i>": "[fn(c: ?|initConnectionState.!1, record: ?|hmac_sha1.!2), fn(c: initConnectionState.!1, record: hmac_sha1.!2), fn(c: initConnectionState.!1, record: hmac_sha1.!2) -> number, fn(c: ?|initConnectionState.!1, record: ?|hmac_sha1.!2), fn(c: initConnectionState.!1, record: hmac_sha1.!2) -> number]",
+    "H5.!1": {
+      "type": {
+        "!type": "number",
+        "!span": "79837[2609:4]-79841[2609:8]"
+      },
+      "version": {
+        "major": {
+          "!type": "number",
+          "!span": "79878[2611:6]-79883[2611:11]"
+        },
+        "minor": {
+          "!type": "number",
+          "!span": "79908[2612:6]-79913[2612:11]"
+        },
+        "!span": "79861[2610:4]-79868[2610:11]"
+      },
+      "length": {
+        "!type": "number",
+        "!span": "79942[2614:4]-79948[2614:10]"
+      },
+      "!span": "79831[2608:15]-80003[2616:3]",
+      "!doc": "create client key exchange message",
+      "fragment": "+ByteBuffer"
+    },
+    "hsTable.<i>": "[[fn(c: ?|initConnectionState.!1, record: ?|hmac_sha1.!2)|fn(c: ?|initConnectionState.!1, record: ?|hmac_sha1.!2, length: ?)]|[fn(c: ?|initConnectionState.!1, record: ?|hmac_sha1.!2)]]",
+    "hsTable.<i>.<i>": "[fn(c: ?|initConnectionState.!1, record: ?|hmac_sha1.!2)]",
+    "_getStorageObject.!ret": {
+      "!span": "54204[2065:10]-54206[2065:12]",
+      "!doc": "json-encode and base64-encode object"
+    },
+    "_callStorageFunction.!1": "[string]",
+    "x509CertificateValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "4613[156:4]-4617[156:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "4653[157:4]-4661[157:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "4689[158:4]-4693[158:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "4719[159:4]-4730[159:15]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "4742[160:4]-4753[160:15]"
+      },
+      "value": {
+        "!type": "[?]",
+        "!span": "4777[161:4]-4782[161:9]"
+      },
+      "!span": "4607[155:10]-9333[294:3]"
+    },
+    "x509CertificateValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "9390[296:4]-9394[296:8]",
+        "!doc": "AlgorithmIdentifier (signature algorithm)"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "9434[297:4]-9442[297:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "9470[298:4]-9474[298:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "9500[299:4]-9511[299:15]"
+      },
+      "value": {
+        "!type": "[x509CertificateValidator.value.1.value.0, x509CertificateValidator.value.1.value.1]",
+        "!span": "9523[300:4]-9528[300:9]"
+      },
+      "!span": "9335[294:5]-9916[313:3]"
+    },
+    "x509CertificateValidator.value.1.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "9558[302:6]-9562[302:10]",
+        "!doc": "algorithm"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "9614[303:6]-9622[303:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "9652[304:6]-9656[304:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "9679[305:6]-9690[305:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "9705[306:6]-9712[306:13]"
+      },
+      "!span": "9531[300:12]-9738[307:5]"
+    },
+    "x509CertificateValidator.value.1.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "9748[308:6]-9752[308:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "9811[309:6]-9819[309:14]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "9849[310:6]-9857[310:14]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "9871[311:6]-9882[311:17]"
+      },
+      "!span": "9740[307:7]-9911[312:5]"
+    },
+    "x509CertificateValidator.value.2": {
+      "name": {
+        "!type": "string",
+        "!span": "9946[315:4]-9950[315:8]",
+        "!doc": "SignatureValue"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "9986[316:4]-9994[316:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "10022[317:4]-10026[317:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "10053[318:4]-10064[318:15]"
+      },
+      "captureBitStringValue": {
+        "!type": "string",
+        "!span": "10077[319:4]-10098[319:25]"
+      },
+      "!span": "9918[313:5]-10119[320:3]"
+    },
+    "rsassaPssParameterValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "10278[329:4]-10282[329:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "10312[330:4]-10320[330:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "10355[331:4]-10359[331:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "10368[332:4]-10379[332:15]"
+      },
+      "value": {
+        "!type": "[rsassaPssParameterValidator.value.0.value.<i>]",
+        "!span": "10391[333:4]-10396[333:9]"
+      },
+      "!span": "10272[328:10]-10863[348:3]"
+    },
+    "rsassaPssParameterValidator.value.0.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "10407[334:6]-10411[334:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "10463[335:6]-10471[335:14]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "10534[337:6]-10545[337:17]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "10559[338:6]-10567[338:14]"
+      },
+      "value": {
+        "!type": "[rsassaPssParameterValidator.value.0.value.<i>.value.<i>]",
+        "!span": "10581[339:6]-10586[339:11]"
+      },
+      "!span": "10399[333:12]-10858[347:5]"
+    },
+    "rsassaPssParameterValidator.value.0.value.<i>.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "10599[340:8]-10603[340:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "10667[341:8]-10675[341:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "10707[342:8]-10711[342:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "10736[343:8]-10747[343:19]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "10764[344:8]-10771[344:15]"
+      },
+      "!span": "10589[339:14]-10851[346:7]"
+    },
+    "rsassaPssParameterValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "10871[349:4]-10875[349:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "10908[350:4]-10916[350:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "10951[351:4]-10955[351:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "10964[352:4]-10975[352:15]"
+      },
+      "value": {
+        "!type": "[rsassaPssParameterValidator.value.1.value.<i>]",
+        "!span": "10987[353:4]-10992[353:9]"
+      },
+      "!span": "10865[348:5]-11898[380:3]"
+    },
+    "rsassaPssParameterValidator.value.1.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "11003[354:6]-11007[354:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "11062[355:6]-11070[355:14]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "11133[357:6]-11144[357:17]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "11158[358:6]-11166[358:14]"
+      },
+      "value": {
+        "!type": "[rsassaPssParameterValidator.value.1.value.<i>.value.0, rsassaPssParameterValidator.value.1.value.<i>.value.1]",
+        "!span": "11180[359:6]-11185[359:11]"
+      },
+      "!span": "10995[353:12]-11893[379:5]"
+    },
+    "rsassaPssParameterValidator.value.1.value.<i>.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "11198[360:8]-11202[360:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "11269[361:8]-11277[361:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "11309[362:8]-11313[362:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "11338[363:8]-11349[363:19]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "11366[364:8]-11373[364:15]"
+      },
+      "!span": "11188[359:14]-11395[365:7]"
+    },
+    "rsassaPssParameterValidator.value.1.value.<i>.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "11407[366:8]-11411[366:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "11475[367:8]-11483[367:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "11515[368:8]-11519[368:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "11549[369:8]-11560[369:19]"
+      },
+      "value": {
+        "!type": "[rsassaPssParameterValidator.value.1.value.<i>.value.1.value.<i>]",
+        "!span": "11576[370:8]-11581[370:13]"
+      },
+      "!span": "11397[365:9]-11886[378:7]"
+    },
+    "rsassaPssParameterValidator.value.1.value.<i>.value.1.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "11596[371:10]-11600[371:14]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "11676[372:10]-11684[372:18]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "11718[373:10]-11722[373:14]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "11749[374:10]-11760[374:21]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "11779[375:10]-11786[375:17]"
+      },
+      "!span": "11584[370:16]-11877[377:9]"
+    },
+    "rsassaPssParameterValidator.value.2": {
+      "name": {
+        "!type": "string",
+        "!span": "11906[381:4]-11910[381:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "11937[382:4]-11945[382:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "11980[383:4]-11984[383:8]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "11993[384:4]-12001[384:12]"
+      },
+      "value": {
+        "!type": "[rsassaPssParameterValidator.value.2.value.<i>]",
+        "!span": "12013[385:4]-12018[385:9]"
+      },
+      "!span": "11900[380:5]-12201[392:3]"
+    },
+    "rsassaPssParameterValidator.value.2.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "12029[386:6]-12033[386:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "12073[387:6]-12081[387:14]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "12143[389:6]-12154[389:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "12169[390:6]-12176[390:13]"
+      },
+      "!span": "12021[385:12]-12196[391:5]"
+    },
+    "rsassaPssParameterValidator.value.3": {
+      "name": {
+        "!type": "string",
+        "!span": "12209[393:4]-12213[393:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "12242[394:4]-12250[394:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "12285[395:4]-12289[395:8]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "12298[396:4]-12306[396:12]"
+      },
+      "value": {
+        "!type": "[rsassaPssParameterValidator.value.3.value.<i>]",
+        "!span": "12318[397:4]-12323[397:9]"
+      },
+      "!span": "12203[392:5]-12497[404:3]"
+    },
+    "rsassaPssParameterValidator.value.3.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "12334[398:6]-12338[398:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "12372[399:6]-12380[399:14]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "12442[401:6]-12453[401:17]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "12468[402:6]-12475[402:13]"
+      },
+      "!span": "12326[397:12]-12492[403:5]"
+    },
+    "certificationRequestInfoValidator.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "12777[415:4]-12781[415:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "12823[416:4]-12831[416:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "12859[417:4]-12863[417:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "12888[418:4]-12899[418:15]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "12912[419:4]-12919[419:11]"
+      },
+      "!span": "12771[414:10]-12958[420:3]"
+    },
+    "certificationRequestInfoValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "13002[422:4]-13006[422:8]",
+        "!doc": "Name (subject) (RDNSequence)"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "13048[423:4]-13056[423:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "13084[424:4]-13088[424:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "13114[425:4]-13125[425:15]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "13137[426:4]-13148[426:15]"
+      },
+      "!span": "12960[420:5]-13187[427:3]"
+    },
+    "certificationRequestInfoValidator.value.3": {
+      "name": {
+        "!type": "string",
+        "!span": "13245[431:4]-13249[431:8]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "13294[432:4]-13302[432:12]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "13337[433:4]-13341[433:8]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "13350[434:4]-13361[434:15]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "13373[435:4]-13381[435:12]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "13393[436:4]-13400[436:11]"
+      },
+      "value": {
+        "!type": "[certificationRequestInfoValidator.value.3.value.<i>]",
+        "!span": "13444[437:4]-13449[437:9]"
+      },
+      "!span": "13239[430:2]-13954[454:3]"
+    },
+    "certificationRequestInfoValidator.value.3.value.<i>": {
+      "name": {
+        "!type": "string",
+        "!span": "13460[438:6]-13464[438:10]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "13511[439:6]-13519[439:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "13549[440:6]-13553[440:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "13581[441:6]-13592[441:17]"
+      },
+      "value": {
+        "!type": "[certificationRequestInfoValidator.value.3.value.<i>.value.0, certificationRequestInfoValidator.value.3.value.<i>.value.1]",
+        "!span": "13606[442:6]-13611[442:11]"
+      },
+      "!span": "13452[437:12]-13949[453:5]"
+    },
+    "certificationRequestInfoValidator.value.3.value.<i>.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "13624[443:8]-13628[443:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "13682[444:8]-13690[444:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "13722[445:8]-13726[445:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "13751[446:8]-13762[446:19]"
+      },
+      "!span": "13614[442:14]-13777[447:7]"
+    },
+    "certificationRequestInfoValidator.value.3.value.<i>.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "13789[448:8]-13793[448:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "13848[449:8]-13856[449:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "13888[450:8]-13892[450:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "13917[451:8]-13928[451:19]"
+      },
+      "!span": "13779[447:9]-13942[452:7]"
+    },
+    "certificationRequestValidator.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "14294[467:6]-14298[467:10]",
+        "!doc": "AlgorithmIdentifier (signature algorithm)"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "14349[468:6]-14357[468:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "14387[469:6]-14391[469:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "14419[470:6]-14430[470:17]"
+      },
+      "value": {
+        "!type": "[certificationRequestValidator.value.1.value.0, certificationRequestValidator.value.1.value.1]",
+        "!span": "14444[471:6]-14449[471:11]"
+      },
+      "!span": "14235[465:39]-14873[484:5]"
+    },
+    "certificationRequestValidator.value.1.value.0": {
+      "name": {
+        "!type": "string",
+        "!span": "14483[473:8]-14487[473:12]",
+        "!doc": "algorithm"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "14550[474:8]-14558[474:16]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "14590[475:8]-14594[475:12]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "14619[476:8]-14630[476:19]"
+      },
+      "capture": {
+        "!type": "string",
+        "!span": "14647[477:8]-14654[477:15]"
+      },
+      "!span": "14452[471:14]-14681[478:7]"
+    },
+    "certificationRequestValidator.value.1.value.1": {
+      "name": {
+        "!type": "string",
+        "!span": "14693[479:8]-14697[479:12]"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "14761[480:8]-14769[480:16]"
+      },
+      "optional": {
+        "!type": "bool",
+        "!span": "14801[481:8]-14809[481:16]"
+      },
+      "captureAsn1": {
+        "!type": "string",
+        "!span": "14825[482:8]-14836[482:19]"
+      },
+      "!span": "14683[478:9]-14866[483:7]"
+    },
+    "certificationRequestValidator.value.2": {
+      "name": {
+        "!type": "string",
+        "!span": "14902[486:6]-14906[486:10]",
+        "!doc": "signature"
+      },
+      "tagClass": {
+        "!type": "number",
+        "!span": "14948[487:6]-14956[487:14]"
+      },
+      "type": {
+        "!type": "number",
+        "!span": "14986[488:6]-14990[488:10]"
+      },
+      "constructed": {
+        "!type": "bool",
+        "!span": "15019[489:6]-15030[489:17]"
+      },
+      "captureBitStringValue": {
+        "!type": "string",
+        "!span": "15045[490:6]-15066[490:27]"
+      },
+      "!span": "14875[484:7]-15088[491:5]"
+    },
+    "_getAttribute.!0": {
+      "version": {
+        "!type": "number",
+        "!span": "54558[1755:6]-54565[1755:13]"
+      },
+      "signatureOid": {
+        "!type": "string",
+        "!span": "54580[1756:6]-54592[1756:18]"
+      },
+      "siginfo": {
+        "algorithmOid": {
+          "!type": "string",
+          "!span": "54659[1759:14]-54671[1759:26]"
+        },
+        "!span": "54631[1758:6]-54638[1758:13]",
+        "parameters": "_readSignatureParameters.!ret"
+      },
+      "subject": {
+        "hash": {
+          "!type": "string",
+          "!span": "54952[1770:14]-54956[1770:18]"
+        },
+        "attributes": "pki.RDNAttributesAsArray.!ret",
+        "getField": "_dnToAsn1.!0.getField",
+        "addField": "_dnToAsn1.!0.addField"
+      },
+      "getAttribute": {
+        "!type": "fn(sn: ?) -> _getAttribute.!ret",
+        "!span": "55019[1774:6]-55031[1774:18]",
+        "!doc": "convert attributes from ASN.1"
+      },
+      "addAttribute": {
+        "!type": "fn(attr: ?)",
+        "!span": "55095[1777:6]-55107[1777:18]"
+      },
+      "setSubject": {
+        "!type": "fn(attrs: ?)",
+        "!span": "55347[1788:6]-55357[1788:16]",
+        "!doc": "Sets the subject of this certification request.\n\n@param attrs the array of subject attributes to use."
+      },
+      "setAttributes": {
+        "!type": "fn(attrs: ?)",
+        "!span": "55635[1800:6]-55648[1800:19]",
+        "!doc": "Sets the attributes of this certification request.\n\n@param attrs the array of attributes to use."
+      },
+      "sign": {
+        "!type": "fn(key: ?, md: ?)",
+        "!span": "55973[1812:6]-55977[1812:10]",
+        "!doc": "Signs this certification request using the given private key.\n\n@param key the private key to sign with.\n@param md the message digest object to use (defaults to forge.md.sha1)."
+      },
+      "verify": {
+        "!type": "fn() -> bool",
+        "!span": "57085[1844:6]-57091[1844:12]",
+        "!doc": "Attempts verify the signature on the passed certification request using\nits public key.\n\nA CSR that has been exported to a file in PEM format can be verified using\nOpenSSL using this command:\n\nopenssl req -in <the-csr-pem-file> -verify -noout -text\n\n@return true if verified, false if not."
+      },
+      "signatureParameters": {
+        "hash": {
+          "algorithmOid": {
+            "!type": "string",
+            "!span": "19751[652:8]-19763[652:20]"
+          }
+        },
+        "mgf": {
+          "algorithmOid": {
+            "!type": "string",
+            "!span": "19808[655:8]-19820[655:20]"
+          },
+          "hash": {
+            "algorithmOid": {
+              "!type": "string",
+              "!span": "19862[657:10]-19874[657:22]"
+            }
+          }
+        },
+        "saltLength": {
+          "!type": "number",
+          "!span": "19914[660:6]-19924[660:16]"
+        }
+      },
+      "!span": "54548[1754:12]-54550[1754:14]",
+      "!doc": "create certification request",
+      "publicKey": "_publicKeyFromJwk.!ret",
+      "attributes": "pki.CRIAttributesAsArray.!ret",
+      "md": "_createKDF.!1",
+      "certificationRequestInfo": "_fromDer.!ret"
+    },
+    "_getAttribute.!1": {
+      "!span": "18162[595:14]-18182[595:34]",
+      "shortName": "_getAttribute.!1"
+    },
+    "_getAttribute.!ret": {
+      "type": {
+        "!type": "string",
+        "!span": "17085[558:10]-17089[558:14]"
+      },
+      "name": {
+        "!type": "string",
+        "!span": "17276[563:12]-17280[563:16]"
+      },
+      "extensions": {
+        "!type": "[pki.certificateExtensionFromAsn1.!ret]",
+        "!span": "17489[570:12]-17499[570:22]"
+      },
+      "!span": "17071[557:16]-17073[557:18]"
+    },
+    "_readSignatureParameters.!ret": {
+      "hash": {
+        "algorithmOid": {
+          "!type": "string",
+          "!span": "19751[652:8]-19763[652:20]"
+        },
+        "!span": "19735[651:6]-19739[651:10]"
+      },
+      "mgf": {
+        "algorithmOid": {
+          "!type": "string",
+          "!span": "19808[655:8]-19820[655:20]"
+        },
+        "hash": {
+          "algorithmOid": {
+            "!type": "string",
+            "!span": "19862[657:10]-19874[657:22]"
+          },
+          "!span": "19844[656:8]-19848[656:12]"
+        },
+        "!span": "19793[654:6]-19796[654:9]"
+      },
+      "saltLength": {
+        "!type": "number",
+        "!span": "19914[660:6]-19924[660:16]"
+      },
+      "!span": "19727[650:13]-19934[661:5]"
+    },
+    "_dnToAsn1.!0": {
+      "getField": {
+        "!type": "fn(sn: ?) -> _getAttribute.!ret",
+        "!span": "54715[1762:14]-54723[1762:22]"
+      },
+      "addField": {
+        "!type": "fn(attr: ?)",
+        "!span": "54803[1765:14]-54811[1765:22]"
+      },
+      "hash": {
+        "!type": "string",
+        "!span": "54952[1770:14]-54956[1770:18]"
+      },
+      "!span": "54697[1761:16]-54699[1761:18]",
+      "attributes": "pki.RDNAttributesAsArray.!ret"
+    },
+    "_getAttributesAsJson.!ret": {
+      "<i>": {
+        "!type": "[_getAttributesAsJson.!ret.<i>, ?]",
+        "!span": "62302[2012:13]-62316[2012:27]"
+      },
+      "!span": "61856[2000:13]-61858[2000:15]"
+    },
+    "_fillMissingFields.!0": "[?]",
+    "_fillMissingExtensionFields.!0": {
+      "name": {
+        "!type": "string",
+        "!span": "64592[2096:8]-64596[2096:12]"
+      },
+      "id": {
+        "!type": "string",
+        "!span": "64734[2103:8]-64736[2103:10]"
+      },
+      "subjectKeyIdentifier": {
+        "!type": "string",
+        "!span": "69648[2290:6]-69668[2290:26]"
+      },
+      "value": "_fromDer.!ret"
+    },
+    "_fillMissingExtensionFields.!1": {
+      "!span": "29909[993:43]-29921[993:55]",
+      "cert": "pki.certificateFromPem.!ret"
+    },
+    "xhrApi.create.!ret": {
+      "readyState": {
+        "!type": "number",
+        "!span": "11722[366:4]-11732[366:14]",
+        "!doc": "7. set state to UNSENT"
+      },
+      "responseText": {
+        "!type": "string",
+        "!span": "11792[368:4]-11804[368:16]",
+        "!doc": "3. set response to null"
+      },
+      "responseXML": {
+        "async": {
+          "!type": "bool",
+          "!span": "18241[587:16]-18246[587:21]"
+        },
+        "!span": "11872[370:4]-11883[370:15]",
+        "!doc": "a Document for response entity-bodies that are XML"
+      },
+      "status": {
+        "!type": "number",
+        "!span": "11952[372:4]-11958[372:10]",
+        "!doc": "custom: reset status and statusText"
+      },
+      "statusText": {
+        "!type": "string",
+        "!span": "12035[374:4]-12045[374:14]",
+        "!doc": "readonly, returns the HTTP status message (i.e. 'Not Found')"
+      },
+      "open": {
+        "!type": "fn(method: ?, url: ?, async: ?, user: ?, password: ?)",
+        "!span": "13513[424:6]-13517[424:10]",
+        "!doc": "Opens the request. This method will create the HTTP request to send.\n\n@param method the HTTP method (i.e. 'GET').\n@param url the relative url (the HTTP request path).\n@param async always true, ignored.\n@param user always null, ignored.\n@param password always null, ignored."
+      },
+      "setRequestHeader": {
+        "!type": "fn(header: ?, value: ?)",
+        "!span": "15241[489:6]-15257[489:22]",
+        "!doc": "Adds an HTTP header field to the request.\n\n@param header the name of the header field.\n@param value the value of the header field."
+      },
+      "send": {
+        "!type": "fn(data: ?)",
+        "!span": "15747[506:6]-15751[506:10]",
+        "!doc": "Sends the request and any associated data.\n\n@param data a string or Document object to send, null to send no data."
+      },
+      "abort": {
+        "!type": "fn()",
+        "!span": "20103[654:6]-20108[654:11]",
+        "!doc": "Aborts the request."
+      },
+      "getAllResponseHeaders": {
+        "!type": "fn() -> string",
+        "!span": "21224[699:6]-21245[699:27]",
+        "!doc": "Gets all response headers as a string.\n\n@return the HTTP-encoded response header fields."
+      },
+      "getResponseHeader": {
+        "!type": "fn(header: ?) -> [string]|string",
+        "!span": "21758[719:6]-21775[719:23]",
+        "!doc": "Gets a single header field value or, if there are multiple\nfields with the same name, a comma-separated list of header\nvalues.\n\n@return the header field value(s) or null."
+      },
+      "!span": "11622[362:12]-12053[375:3]",
+      "!doc": "create public xhr interface",
+      "cookies": "_getStorageId.!0.cookies"
+    },
+    "BlockCipher._op.!0": {
+      "read": {
+        "!type": "number",
+        "!span": "19360[681:12]-19364[681:16]"
+      }
+    },
+    "BlockCipher.start.!1": {
+      "!span": "20298[486:16]-20300[486:18]",
+      "output": "BlockCipher.start.!1"
+    },
+    "modes.gcm._m.<i>": "[[number]]",
+    "modes.gcm._m.<i>.<i>": "[number, number, number, number]",
+    "forge.aes.Algorithm.!1.prototype.generateHashTable.!ret": {
+      "<i>": {
+        "<i>": "modes.gcm._m.<i>.<i>"
+      }
+    },
+    "forge.aes.Algorithm.!1.prototype.generateSubHashTable.!ret": {
+      "<i>": "modes.gcm._m.<i>.<i>"
+    },
+    "forge.cipher.modes.cbc.prototype.start.!0": {
+      "output": "BlockCipher.start.!1"
+    },
+    "forge.cipher.modes.gcm.prototype.generateHashTable.!ret": {
+      "<i>": {
+        "<i>": "modes.gcm._m.<i>.<i>"
+      }
+    },
+    "forge.cipher.modes.gcm.prototype.generateSubHashTable.!ret": {
+      "<i>": "modes.gcm._m.<i>.<i>"
+    },
+    "forge.pki.ed25519.generateKeyPair.!ret": {
+      "publicKey": "+Float32Array",
+      "privateKey": "+Float32Array"
+    },
+    "forge.pki.pbe.getCipher.!ret": {
+      "output": "+ByteBuffer",
+      "start": "createCipher.!ret.start",
+      "update": "createCipher.!ret.update",
+      "finish": "createCipher.!ret.finish"
+    },
+    "forge.pki.setRsaPublicKey.!ret": {
+      "n": "+BigInteger",
+      "e": "+BigInteger",
+      "dP": "+BigInteger",
+      "dQ": "+BigInteger",
+      "qInv": "+BigInteger",
+      "encrypt": "_publicKeyFromJwk.!ret.encrypt",
+      "verify": "_publicKeyFromJwk.!ret.verify"
+    },
+    "forge.pki.rsa.generateKeyPair.!ret": {
+      "privateKey": "_modPow.!1",
+      "publicKey": "_publicKeyFromJwk.!ret"
+    },
+    "forge.pki.certificateFromPem.!ret.issuer.getField.!0": {
+      "shortName": "_getAttribute.!1"
+    },
+    "forge.pki.certificationRequestFromPem.!ret.getAttribute.!0": {
+      "shortName": "_getAttribute.!1"
+    },
+    "forge.pki.distinguishedNameToAsn1.!0": {
+      "attributes": "pki.RDNAttributesAsArray.!ret"
+    },
+    "forge.pki.verifyCertificateChain.!1": {
+      "<i>": "pki.certificateFromPem.!ret"
+    },
+    "forge.ed25519.generateKeyPair.!0": {
+      "seed": "+Float32Array"
+    },
+    "forge.ed25519.generateKeyPair.!ret": {
+      "publicKey": "+Float32Array",
+      "privateKey": "+Float32Array"
+    },
+    "forge.hmac.create.!ret": {
+      "digest": "hmac.create.!ret.getMac",
+      "start": "hmac.create.!ret.start",
+      "update": "hmac.create.!ret.update",
+      "getMac": "hmac.create.!ret.getMac"
+    },
+    "forge.http.createClient.!0.socketPool.sockets.<i>.options.request.getCookies.!ret": {
+      "<i>": "http.withinCookieDomain.!1"
+    },
+    "forge.http.createClient.!0.socketPool.sockets.<i>.options.headerReady.!0": {
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.http.createClient.!0.socketPool.sockets.<i>.options.bodyReady.!0": {
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.http.createClient.!ret.requests.<i>.request.getCookies.!ret": {
+      "<i>": "http.withinCookieDomain.!1"
+    },
+    "forge.http.createClient.!ret.requests.<i>.headerReady.!0": {
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.http.createClient.!ret.requests.<i>.bodyReady.!0": {
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.http.createClient.!ret.send.!0": {
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "bodyReady": "net.socketPools.<i>.sockets.<i>.options.bodyReady",
+      "error": "net.socketPools.<i>.sockets.<i>.options.error",
+      "headerReady": "_getStorageId.!0.send.!0.headerReady"
+    },
+    "forge.http.createRequest.!ret.getCookies.!ret": {
+      "<i>": "http.withinCookieDomain.!1"
+    },
+    "forge.jsbn.BigInteger.prototype.divideAndRemainder.!ret": {
+      "<i>": "+BigInteger"
+    },
+    "forge.mgf.mgf1.create.!ret": {
+      "generate": "mgf1.create.!ret.generate"
+    },
+    "forge.pbe.getCipher.!ret": {
+      "output": "+ByteBuffer",
+      "start": "createCipher.!ret.start",
+      "update": "createCipher.!ret.update",
+      "finish": "createCipher.!ret.finish"
+    },
+    "forge.pkcs12.pkcs12FromAsn1.!ret.getBags.!ret": {
+      "<i>": {
+        "<i>": "_getBagsByAttribute.!ret.<i>"
+      },
+      "localKeyId": "_getBagsByAttribute.!ret",
+      "friendlyName": "_getBagsByAttribute.!ret"
+    },
+    "forge.pkcs12.pkcs12FromAsn1.!ret.getBagsByFriendlyName.!ret": {
+      "<i>": "_getBagsByAttribute.!ret.<i>"
+    },
+    "forge.prng.create.!0": {
+      "md": "sha256",
+      "formatKey": "forge.random.plugin.formatKey",
+      "formatSeed": "forge.random.plugin.formatSeed",
+      "cipher": "forge.random.plugin.cipher",
+      "increment": "forge.random.plugin.increment"
+    },
+    "forge.rsa.generateKeyPair.!ret": {
+      "privateKey": "_modPow.!1",
+      "publicKey": "_publicKeyFromJwk.!ret"
+    },
+    "forge.net.socketPools.<i>.sockets.<i>.options.request.getCookies.!ret": {
+      "<i>": "http.withinCookieDomain.!1"
+    },
+    "forge.net.socketPools.<i>.sockets.<i>.options.headerReady.!0": {
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.net.socketPools.<i>.sockets.<i>.options.bodyReady.!0": {
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "response": "net.socketPools.<i>.sockets.<i>.options.request",
+      "socket": "net.socketPools.<i>.sockets.<i>"
+    },
+    "forge.tls.hmac_sha1.!1": {
+      "1": "http.withinCookieDomain.!1"
+    },
+    "forge.util.setItem.!3": {
+      "<i>": {
+        "<i>": "http.withinCookieDomain.!1"
+      }
+    },
+    "forge.util.makeRequest.!ret.getQueryLast.!1": {
+      "<i>": "util.makeRequest.!ret.getQueryLast.!1"
+    },
+    "forge.util.deflate.!0": {
+      "encode": "api.encode",
+      "decode": "api.decode"
+    },
+    "modes.cbc.prototype.start.!0": {
+      "output": "BlockCipher.start.!1"
+    },
+    "modes.gcm.prototype.generateHashTable.!ret": {
+      "<i>": {
+        "<i>": "modes.gcm._m.<i>.<i>"
+      }
+    },
+    "modes.gcm.prototype.generateSubHashTable.!ret": {
+      "<i>": "modes.gcm._m.<i>.<i>"
+    },
+    "BigInteger.prototype.divideAndRemainder.!ret": {
+      "<i>": "+BigInteger"
+    },
+    "http.createClient.!ret.send.!0": {
+      "request": "net.socketPools.<i>.sockets.<i>.options.request",
+      "bodyReady": "net.socketPools.<i>.sockets.<i>.options.bodyReady",
+      "error": "net.socketPools.<i>.sockets.<i>.options.error",
+      "headerReady": "_getStorageId.!0.send.!0.headerReady"
+    },
+    "forge.pki.createCaStore.!ret": {
+      "certs": "_initSocket.!2.caStore.certs",
+      "getIssuer": "_initSocket.!2.caStore.getIssuer",
+      "addCertificate": "_initSocket.!2.caStore.addCertificate",
+      "hasCertificate": "_initSocket.!2.caStore.hasCertificate",
+      "listAllCertificates": "_initSocket.!2.caStore.listAllCertificates",
+      "removeCertificate": "_initSocket.!2.caStore.removeCertificate"
+    },
+    "forge.mgf1.create.!ret": {
+      "generate": "mgf1.create.!ret.generate"
+    },
+    "pki.setRsaPublicKey.!ret": {
+      "n": "+BigInteger",
+      "e": "+BigInteger",
+      "dP": "+BigInteger",
+      "dQ": "+BigInteger",
+      "qInv": "+BigInteger",
+      "encrypt": "_publicKeyFromJwk.!ret.encrypt",
+      "verify": "_publicKeyFromJwk.!ret.verify"
+    },
+    "pki.certificationRequestFromPem.!ret.getAttribute.!0": {
+      "shortName": "_getAttribute.!1"
+    },
+    "forge.pki.verifyCertificateChain.!2": {
+      "verify": "pki.verifyCertificateChain.!2.verify"
+    },
+    "p12.pkcs12FromAsn1.!ret.getBags.!ret": {
+      "<i>": "_getBagsByAttribute.!ret",
+      "localKeyId": "_getBagsByAttribute.!ret",
+      "friendlyName": "_getBagsByAttribute.!ret"
+    },
+    "p12.pkcs12FromAsn1.!ret.getBagsByFriendlyName.!ret": {
+      "<i>": "_getBagsByAttribute.!ret.<i>"
+    },
+    "forge.pss.create.!ret": {
+      "encode": "pss.create.!ret.encode",
+      "verify": "pss.create.!ret.verify"
+    },
+    "_getAttribute.!0.getAttribute.!0": {
+      "shortName": "_getAttribute.!1"
+    }
+  },
+  "forge": {
+    "aes": {
+      "startEncrypting": {
+        "!type": "fn(key: ?, iv: ?, output: ?, mode: ?) -> ?|+BlockCipher",
+        "!span": "1267[44:10]-1282[44:25]",
+        "!doc": "Deprecated. Instead, use:\n\nvar cipher = forge.cipher.createCipher('AES-<mode>', key);\ncipher.start({iv: iv});\n\nCreates an AES cipher object to encrypt data using the given symmetric key.\nThe output will be stored in the 'output' member of the returned cipher.\n\nThe key and iv may be given as a string of bytes, an array of bytes,\na byte buffer, or an array of 32-bit words.\n\n@param key the symmetric key to use.\n@param iv the initialization vector to use.\n@param output the buffer to write to, null to create one.\n@param mode the cipher mode to use (default: 'CBC').\n\n@return the cipher."
+      },
+      "createEncryptionCipher": {
+        "!type": "fn(key: string|+ByteBuffer, mode: string) -> ?|+BlockCipher",
+        "!span": "1900[70:10]-1922[70:32]",
+        "!doc": "Deprecated. Instead, use:\n\nvar cipher = forge.cipher.createCipher('AES-<mode>', key);\n\nCreates an AES cipher object to encrypt data using the given symmetric key.\n\nThe key may be given as a string of bytes, an array of bytes, a\nbyte buffer, or an array of 32-bit words.\n\n@param key the symmetric key to use.\n@param mode the cipher mode to use (default: 'CBC').\n\n@return the cipher."
+      },
+      "startDecrypting": {
+        "!type": "fn(key: ?, iv: ?, output: ?, mode: ?) -> ?|+BlockCipher",
+        "!span": "2707[98:10]-2722[98:25]",
+        "!doc": "Deprecated. Instead, use:\n\nvar decipher = forge.cipher.createDecipher('AES-<mode>', key);\ndecipher.start({iv: iv});\n\nCreates an AES cipher object to decrypt data using the given symmetric key.\nThe output will be stored in the 'output' member of the returned cipher.\n\nThe key and iv may be given as a string of bytes, an array of bytes,\na byte buffer, or an array of 32-bit words.\n\n@param key the symmetric key to use.\n@param iv the initialization vector to use.\n@param output the buffer to write to, null to create one.\n@param mode the cipher mode to use (default: 'CBC').\n\n@return the cipher."
+      },
+      "createDecryptionCipher": {
+        "!type": "fn(key: string|+ByteBuffer, mode: ?) -> ?|+BlockCipher",
+        "!span": "3343[124:10]-3365[124:32]",
+        "!doc": "Deprecated. Instead, use:\n\nvar decipher = forge.cipher.createDecipher('AES-<mode>', key);\n\nCreates an AES cipher object to decrypt data using the given symmetric key.\n\nThe key may be given as a string of bytes, an array of bytes, a\nbyte buffer, or an array of 32-bit words.\n\n@param key the symmetric key to use.\n@param mode the cipher mode to use (default: 'CBC').\n\n@return the cipher."
+      },
+      "Algorithm": {
+        "prototype": {
+          "initialize": {
+            "!type": "fn(options: ?)",
+            "!span": "4425[169:30]-4435[169:40]",
+            "!doc": "Initializes this AES algorithm by expanding its key.\n\n@param options the options to use.\n         key the key to use with this algorithm.\n         decrypt true if the algorithm should be initialized for decryption,\n           false for encryption."
+          }
+        },
+        "!type": "fn(name: string, mode: fn(options: ?))",
+        "!span": "3682[141:10]-3691[141:19]",
+        "!doc": "Creates a new AES cipher algorithm object.\n\n@param name the name of the algorithm.\n@param mode the mode factory function.\n\n@return the AES algorithm object."
+      },
+      "_expandKey": {
+        "!type": "fn(key: [?]|string, decrypt: bool) -> ?",
+        "!span": "6340[234:10]-6350[234:20]",
+        "!doc": "Expands a key. Typically only used for testing.\n\n@param key the symmetric key to expand, as an array of 32-bit words.\n@param decrypt true to expand for decryption, false for encryption.\n\n@return the expanded key."
+      },
+      "!span": "591[23:23]-594[23:26]",
+      "!doc": "AES API",
+      "_updateBlock": "_updateBlock"
+    },
+    "asn1": {
+      "Class": {
+        "UNIVERSAL": {
+          "!type": "number",
+          "!span": "6382[146:2]-6391[146:11]"
+        },
+        "APPLICATION": {
+          "!type": "number",
+          "!span": "6408[147:2]-6419[147:13]"
+        },
+        "CONTEXT_SPECIFIC": {
+          "!type": "number",
+          "!span": "6434[148:2]-6450[148:18]"
+        },
+        "PRIVATE": {
+          "!type": "number",
+          "!span": "6460[149:2]-6467[149:9]"
+        }
+      },
+      "Type": {
+        "NONE": {
+          "!type": "number",
+          "!span": "6646[157:2]-6650[157:6]"
+        },
+        "BOOLEAN": {
+          "!type": "number",
+          "!span": "6669[158:2]-6676[158:9]"
+        },
+        "INTEGER": {
+          "!type": "number",
+          "!span": "6692[159:2]-6699[159:9]"
+        },
+        "BITSTRING": {
+          "!type": "number",
+          "!span": "6715[160:2]-6724[160:11]"
+        },
+        "OCTETSTRING": {
+          "!type": "number",
+          "!span": "6738[161:2]-6749[161:13]"
+        },
+        "NULL": {
+          "!type": "number",
+          "!span": "6761[162:2]-6765[162:6]"
+        },
+        "OID": {
+          "!type": "number",
+          "!span": "6784[163:2]-6787[163:5]"
+        },
+        "ODESC": {
+          "!type": "number",
+          "!span": "6807[164:2]-6812[164:7]"
+        },
+        "EXTERNAL": {
+          "!type": "number",
+          "!span": "6830[165:2]-6838[165:10]"
+        },
+        "REAL": {
+          "!type": "number",
+          "!span": "6853[166:2]-6857[166:6]"
+        },
+        "ENUMERATED": {
+          "!type": "number",
+          "!span": "6876[167:2]-6886[167:12]"
+        },
+        "EMBEDDED": {
+          "!type": "number",
+          "!span": "6899[168:2]-6907[168:10]"
+        },
+        "UTF8": {
+          "!type": "number",
+          "!span": "6922[169:2]-6926[169:6]"
+        },
+        "ROID": {
+          "!type": "number",
+          "!span": "6945[170:2]-6949[170:6]"
+        },
+        "SEQUENCE": {
+          "!type": "number",
+          "!span": "6968[171:2]-6976[171:10]"
+        },
+        "SET": {
+          "!type": "number",
+          "!span": "6991[172:2]-6994[172:5]"
+        },
+        "PRINTABLESTRING": {
+          "!type": "number",
+          "!span": "7014[173:2]-7029[173:17]"
+        },
+        "IA5STRING": {
+          "!type": "number",
+          "!span": "7037[174:2]-7046[174:11]"
+        },
+        "UTCTIME": {
+          "!type": "number",
+          "!span": "7060[175:2]-7067[175:9]"
+        },
+        "GENERALIZEDTIME": {
+          "!type": "number",
+          "!span": "7083[176:2]-7098[176:17]"
+        },
+        "BMPSTRING": {
+          "!type": "number",
+          "!span": "7106[177:2]-7115[177:11]"
+        }
+      },
+      "create": {},
+      "validate": {},
+      "prettyPrint": {},
+      "copy": "asn1.copy",
+      "equals": "asn1.equals",
+      "getBerValueLength": "asn1.getBerValueLength",
+      "fromDer": "asn1.fromDer",
+      "toDer": "asn1.toDer",
+      "oidToDer": "asn1.oidToDer",
+      "derToOid": "asn1.derToOid",
+      "utcTimeToDate": "asn1.utcTimeToDate",
+      "generalizedTimeToDate": "asn1.generalizedTimeToDate",
+      "dateToUtcTime": "asn1.dateToUtcTime",
+      "dateToGeneralizedTime": "asn1.dateToGeneralizedTime",
+      "integerToDer": "asn1.integerToDer",
+      "derToInteger": "asn1.derToInteger"
+    },
+    "cipher": {
+      "algorithms": {
+        "<i>": {
+          "!type": "fn() -> +forge.des.Algorithm",
+          "!span": "2382[90:26]-2386[90:30]"
+        },
+        "!span": "249[13:22]-259[13:32]",
+        "!doc": "registered algorithms"
+      },
+      "createCipher": {
+        "!type": "fn(algorithm: string, key: string) -> +BlockCipher",
+        "!span": "781[30:15]-793[30:27]",
+        "!doc": "Creates a cipher object that can be used to encrypt data using the given\nalgorithm and key. The algorithm may be provided as a string value for a\npreviously registered algorithm or it may be given as a cipher algorithm\nAPI object.\n\n@param algorithm the algorithm to use, either a string or an algorithm API\n         object.\n@param key the key to use, as a binary-encoded string of bytes or a\n         byte buffer.\n\n@return the cipher."
+      },
+      "createDecipher": {
+        "!type": "fn(algorithm: string, key: string) -> +BlockCipher",
+        "!span": "1658[67:0]-1672[69:10]",
+        "!doc": "Creates a decipher object that can be used to decrypt data using the given\nalgorithm and key. The algorithm may be provided as a string value for a\npreviously registered algorithm or it may be given as a cipher algorithm\nAPI object.\n\n@param algorithm the algorithm to use, either a string or an algorithm API\n         object.\n@param key the key to use, as a binary-encoded string of bytes or a\n         byte buffer.\n\n@return the cipher."
+      },
+      "registerAlgorithm": {
+        "!type": "fn(name: string, algorithm: fn() -> +forge.des.Algorithm)",
+        "!span": "2279[87:29]-2296[88:8]",
+        "!doc": "Registers an algorithm by name. If the name was already registered, the\nalgorithm API object will be overwritten.\n\n@param name the name of the algorithm.\n@param algorithm the algorithm API object."
+      },
+      "getAlgorithm": {
+        "!type": "fn(name: ?) -> fn() -> +forge.des.Algorithm",
+        "!span": "2563[102:30]-2575[102:42]",
+        "!doc": "Gets a registered algorithm by name.\n\n@param name the name of the algorithm.\n\n@return the algorithm, if found, null if not."
+      },
+      "BlockCipher": {
+        "prototype": {
+          "start": "BlockCipher.prototype.start",
+          "update": "BlockCipher.prototype.update",
+          "finish": "BlockCipher.prototype.finish"
+        }
+      },
+      "modes": {
+        "ecb": {
+          "prototype": {
+            "unpad": {},
+            "start": "modes.ecb.prototype.start",
+            "encrypt": "modes.ecb.prototype.encrypt",
+            "decrypt": "modes.ecb.prototype.decrypt",
+            "pad": "modes.ecb.prototype.pad"
+          }
+        },
+        "cfb": {
+          "prototype": {
+            "encrypt": {},
+            "decrypt": {},
+            "start": "modes.cfb.prototype.start"
+          }
+        },
+        "ofb": {
+          "prototype": {
+            "encrypt": {},
+            "decrypt": "modes.ofb.prototype.encrypt",
+            "start": "modes.ofb.prototype.start"
+          }
+        },
+        "ctr": {
+          "prototype": {
+            "encrypt": {},
+            "decrypt": "modes.ctr.prototype.encrypt",
+            "start": "modes.ctr.prototype.start"
+          }
+        },
+        "gcm": {
+          "prototype": {
+            "encrypt": {},
+            "generateHashTable": {},
+            "generateSubHashTable": {},
+            "start": "modes.gcm.prototype.start",
+            "decrypt": "modes.gcm.prototype.decrypt",
+            "afterFinish": "modes.gcm.prototype.afterFinish",
+            "multiply": "modes.gcm.prototype.multiply",
+            "pow": "modes.gcm.prototype.pow",
+            "tableMultiply": "modes.gcm.prototype.tableMultiply",
+            "ghash": "modes.gcm.prototype.ghash"
+          }
+        },
+        "cbc": {
+          "prototype": {
+            "start": {},
+            "encrypt": "modes.cbc.prototype.encrypt",
+            "decrypt": "modes.cbc.prototype.decrypt",
+            "pad": "modes.cbc.prototype.pad",
+            "unpad": "modes.cbc.prototype.unpad"
+          }
+        }
+      },
+      "!span": "181[10:23]-187[10:29]"
+    },
+    "des": {
+      "startEncrypting": {
+        "!type": "fn(key: ?, iv: ?, output: ?, mode: ?) -> ?|+BlockCipher",
+        "!span": "2115[59:10]-2130[59:25]",
+        "!doc": "Deprecated. Instead, use:\n\nvar cipher = forge.cipher.createCipher('DES-<mode>', key);\ncipher.start({iv: iv});\n\nCreates an DES cipher object to encrypt data using the given symmetric key.\nThe output will be stored in the 'output' member of the returned cipher.\n\nThe key and iv may be given as binary-encoded strings of bytes or\nbyte buffers.\n\n@param key the symmetric key to use (64 or 192 bits).\n@param iv the initialization vector to use.\n@param output the buffer to write to, null to create one.\n@param mode the cipher mode to use (default: 'CBC' if IV is\n         given, 'ECB' if null).\n\n@return the cipher."
+      },
+      "createEncryptionCipher": {
+        "!type": "fn(key: string|+ByteBuffer, mode: ?) -> ?|+BlockCipher",
+        "!span": "2764[84:10]-2786[84:32]",
+        "!doc": "Deprecated. Instead, use:\n\nvar cipher = forge.cipher.createCipher('DES-<mode>', key);\n\nCreates an DES cipher object to encrypt data using the given symmetric key.\n\nThe key may be given as a binary-encoded string of bytes or a byte buffer.\n\n@param key the symmetric key to use (64 or 192 bits).\n@param mode the cipher mode to use (default: 'CBC').\n\n@return the cipher."
+      },
+      "startDecrypting": {
+        "!type": "fn(key: +ByteBuffer, iv: +ByteBuffer, output: ?, mode: ?) -> ?|+BlockCipher",
+        "!span": "3597[113:10]-3612[113:25]",
+        "!doc": "Deprecated. Instead, use:\n\nvar decipher = forge.cipher.createDecipher('DES-<mode>', key);\ndecipher.start({iv: iv});\n\nCreates an DES cipher object to decrypt data using the given symmetric key.\nThe output will be stored in the 'output' member of the returned cipher.\n\nThe key and iv may be given as binary-encoded strings of bytes or\nbyte buffers.\n\n@param key the symmetric key to use (64 or 192 bits).\n@param iv the initialization vector to use.\n@param output the buffer to write to, null to create one.\n@param mode the cipher mode to use (default: 'CBC' if IV is\n         given, 'ECB' if null).\n\n@return the cipher."
+      },
+      "createDecryptionCipher": {
+        "!type": "fn(key: string|+ByteBuffer, mode: ?) -> ?|+BlockCipher",
+        "!span": "4249[138:10]-4271[138:32]",
+        "!doc": "Deprecated. Instead, use:\n\nvar decipher = forge.cipher.createDecipher('DES-<mode>', key);\n\nCreates an DES cipher object to decrypt data using the given symmetric key.\n\nThe key may be given as a binary-encoded string of bytes or a byte buffer.\n\n@param key the symmetric key to use (64 or 192 bits).\n@param mode the cipher mode to use (default: 'CBC').\n\n@return the cipher."
+      },
+      "Algorithm": {
+        "prototype": {
+          "initialize": {
+            "!type": "fn(options: ?)",
+            "!span": "5300[180:30]-5310[180:40]",
+            "!doc": "Initializes this DES algorithm by expanding its key.\n\n@param options the options to use.\n         key the key to use with this algorithm.\n         decrypt true if the algorithm should be initialized for decryption,\n           false for encryption."
+          }
+        },
+        "!type": "fn(name: string, mode: fn(options: ?))",
+        "!span": "4588[155:10]-4597[155:19]",
+        "!doc": "Creates a new DES cipher algorithm object.\n\n@param name the name of the algorithm.\n@param mode the mode factory function.\n\n@return the DES algorithm object.",
+        "_keys": {
+          "!type": "[number]",
+          "!span": "5647[193:7]-5652[193:12]",
+          "!doc": "do key expansion to 16 or 48 subkeys (single or triple DES)"
+        },
+        "_init": {
+          "!type": "bool",
+          "!span": "5680[194:7]-5685[194:12]"
+        },
+        "name": {
+          "!type": "string",
+          "!span": "4649[157:7]-4653[157:11]"
+        }
+      },
+      "!span": "1413[37:23]-1416[37:26]",
+      "!doc": "DES API"
+    },
+    "pki": {
+      "ed25519": {
+        "constants": {
+          "PUBLIC_KEY_BYTE_LENGTH": {
+            "!type": "number",
+            "!span": "1017[35:18]-1039[35:40]"
+          },
+          "PRIVATE_KEY_BYTE_LENGTH": {
+            "!type": "number",
+            "!span": "1064[36:18]-1087[36:41]"
+          },
+          "SEED_BYTE_LENGTH": {
+            "!type": "number",
+            "!span": "1112[37:18]-1128[37:34]"
+          },
+          "SIGN_BYTE_LENGTH": {
+            "!type": "number",
+            "!span": "1153[38:18]-1169[38:34]"
+          },
+          "HASH_BYTE_LENGTH": {
+            "!type": "number",
+            "!span": "1194[39:18]-1210[39:34]"
+          }
+        },
+        "generateKeyPair": {},
+        "privateKeyFromAsn1": "ed25519.privateKeyFromAsn1",
+        "publicKeyFromAsn1": "ed25519.publicKeyFromAsn1",
+        "publicKeyFromPrivateKey": "ed25519.publicKeyFromPrivateKey",
+        "sign": "ed25519.sign",
+        "verify": "ed25519.verify"
+      },
+      "oids": {
+        "<i>": {
+          "!type": "string",
+          "!span": "331[14:7]-333[14:9]"
+        }
+      },
+      "pbe": {
+        "generatePkcs12Key": {},
+        "opensslDeriveBytes": {},
+        "getCipher": {},
+        "getCipherForPBES2": "forge.pbe.getCipherForPBES2",
+        "getCipherForPKCS12PBE": "forge.pbe.getCipherForPKCS12PBE"
+      },
+      "encryptPrivateKeyInfo": {},
+      "encryptedPrivateKeyFromPem": {},
+      "privateKeyFromPem": {},
+      "rsa": {
+        "publicKeyValidator": {
+          "name": {
+            "!type": "string",
+            "!span": "6195[231:2]-6199[231:6]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "6227[232:2]-6235[232:10]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "6261[233:2]-6265[233:6]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "6289[234:2]-6300[234:13]"
+          },
+          "captureAsn1": {
+            "!type": "string",
+            "!span": "6310[235:2]-6321[235:13]"
+          },
+          "value": {
+            "0": {
+              "name": {
+                "!type": "string",
+                "!span": "6363[237:4]-6367[237:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "6417[238:4]-6425[238:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "6453[239:4]-6457[239:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "6483[240:4]-6494[240:15]"
+              },
+              "value": {
+                "<i>": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "6522[242:6]-6526[242:10]"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "6567[243:6]-6575[243:14]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "6605[244:6]-6609[244:10]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "6632[245:6]-6643[245:17]"
+                  },
+                  "capture": {
+                    "!type": "string",
+                    "!span": "6658[246:6]-6665[246:13]"
+                  }
+                }
+              }
+            },
+            "1": {
+              "name": {
+                "!type": "string",
+                "!span": "6724[250:4]-6728[250:8]",
+                "!doc": "subjectPublicKey"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "6775[251:4]-6783[251:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "6811[252:4]-6815[252:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "6842[253:4]-6853[253:15]"
+              },
+              "value": {
+                "<i>": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "6904[256:6]-6908[256:10]",
+                    "!doc": "RSAPublicKey"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "6970[257:6]-6978[257:14]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "7008[258:6]-7012[258:10]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "7040[259:6]-7051[259:17]"
+                  },
+                  "optional": {
+                    "!type": "bool",
+                    "!span": "7065[260:6]-7073[260:14]"
+                  },
+                  "captureAsn1": {
+                    "!type": "string",
+                    "!span": "7087[261:6]-7098[261:17]"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "createKeyPairGenerationState": {},
+        "generateKeyPair": {},
+        "setPublicKey": "pki.setRsaPublicKey",
+        "setPrivateKey": "pki.setRsaPrivateKey",
+        "encrypt": "forge.rsa.encrypt",
+        "decrypt": "forge.rsa.decrypt",
+        "stepKeyPairGenerationState": "forge.rsa.stepKeyPairGenerationState"
+      },
+      "RDNAttributesAsArray": {},
+      "CRIAttributesAsArray": {},
+      "certificateFromPem": {},
+      "getPublicKeyFingerprint": {},
+      "certificationRequestFromPem": {},
+      "certificateExtensionsFromAsn1": {},
+      "certificateExtensionFromAsn1": {},
+      "certificateError": {
+        "bad_certificate": {
+          "!type": "string",
+          "!span": "88809[2935:2]-88824[2935:17]"
+        },
+        "unsupported_certificate": {
+          "!type": "string",
+          "!span": "88856[2936:2]-88879[2936:25]"
+        },
+        "certificate_revoked": {
+          "!type": "string",
+          "!span": "88919[2937:2]-88938[2937:21]"
+        },
+        "certificate_expired": {
+          "!type": "string",
+          "!span": "88974[2938:2]-88993[2938:21]"
+        },
+        "certificate_unknown": {
+          "!type": "string",
+          "!span": "89029[2939:2]-89048[2939:21]"
+        },
+        "unknown_ca": {
+          "!type": "string",
+          "!span": "89084[2940:2]-89094[2940:12]"
+        }
+      },
+      "setRsaPublicKey": {},
+      "privateKeyToAsn1": "pki.privateKeyToRSAPrivateKey",
+      "publicKeyToAsn1": "pki.publicKeyToSubjectPublicKeyInfo",
+      "distinguishedNameToAsn1": {},
+      "verifyCertificateChain": {},
+      "createCaStore": {},
+      "decryptPrivateKeyInfo": "pki.decryptPrivateKeyInfo",
+      "encryptedPrivateKeyToPem": "pki.encryptedPrivateKeyToPem",
+      "encryptRsaPrivateKey": "pki.encryptRsaPrivateKey",
+      "decryptRsaPrivateKey": "pki.decryptRsaPrivateKey",
+      "pemToDer": "pki.pemToDer",
+      "privateKeyToPem": "pki.privateKeyToPem",
+      "privateKeyInfoToPem": "pki.privateKeyInfoToPem",
+      "setRsaPrivateKey": "pki.setRsaPrivateKey",
+      "wrapRsaPrivateKey": "pki.wrapRsaPrivateKey",
+      "privateKeyFromAsn1": "pki.privateKeyFromAsn1",
+      "privateKeyToRSAPrivateKey": "pki.privateKeyToRSAPrivateKey",
+      "publicKeyFromAsn1": "pki.publicKeyFromAsn1",
+      "publicKeyToSubjectPublicKeyInfo": "pki.publicKeyToSubjectPublicKeyInfo",
+      "publicKeyToRSAPublicKey": "pki.publicKeyToRSAPublicKey",
+      "certificateToPem": "pki.certificateToPem",
+      "publicKeyFromPem": "pki.publicKeyFromPem",
+      "publicKeyToPem": "pki.publicKeyToPem",
+      "publicKeyToRSAPublicKeyPem": "pki.publicKeyToRSAPublicKeyPem",
+      "certificationRequestToPem": "pki.certificationRequestToPem",
+      "createCertificate": "pki.createCertificate",
+      "certificateFromAsn1": "pki.certificateFromAsn1",
+      "certificationRequestFromAsn1": "pki.certificationRequestFromAsn1",
+      "createCertificationRequest": "pki.createCertificationRequest",
+      "getTBSCertificate": "pki.getTBSCertificate",
+      "getCertificationRequestInfo": "pki.getCertificationRequestInfo",
+      "certificateToAsn1": "pki.certificateToAsn1",
+      "certificateExtensionsToAsn1": "pki.certificateExtensionsToAsn1",
+      "certificateExtensionToAsn1": "pki.certificateExtensionToAsn1",
+      "certificationRequestToAsn1": "pki.certificationRequestToAsn1"
+    },
+    "ed25519": {
+      "constants": {
+        "PUBLIC_KEY_BYTE_LENGTH": {
+          "!type": "number",
+          "!span": "1017[35:18]-1039[35:40]"
+        },
+        "PRIVATE_KEY_BYTE_LENGTH": {
+          "!type": "number",
+          "!span": "1064[36:18]-1087[36:41]"
+        },
+        "SEED_BYTE_LENGTH": {
+          "!type": "number",
+          "!span": "1112[37:18]-1128[37:34]"
+        },
+        "SIGN_BYTE_LENGTH": {
+          "!type": "number",
+          "!span": "1153[38:18]-1169[38:34]"
+        },
+        "HASH_BYTE_LENGTH": {
+          "!type": "number",
+          "!span": "1194[39:18]-1210[39:34]"
+        }
+      },
+      "generateKeyPair": {},
+      "privateKeyFromAsn1": "ed25519.privateKeyFromAsn1",
+      "publicKeyFromAsn1": "ed25519.publicKeyFromAsn1",
+      "publicKeyFromPrivateKey": "ed25519.publicKeyFromPrivateKey",
+      "sign": "ed25519.sign",
+      "verify": "ed25519.verify"
+    },
+    "jsbn": {
+      "BigInteger": {
+        "prototype": {
+          "DB": {
+            "!type": "number",
+            "!span": "4167[134:21]-4169[134:23]"
+          },
+          "DM": {
+            "!type": "number",
+            "!span": "4200[135:21]-4202[135:23]"
+          },
+          "DV": {
+            "!type": "number",
+            "!span": "4242[136:21]-4244[136:23]"
+          },
+          "FV": {
+            "!type": "number",
+            "!span": "4297[139:21]-4299[139:23]"
+          },
+          "F1": {
+            "!type": "number",
+            "!span": "4342[140:21]-4344[140:23]"
+          },
+          "F2": {
+            "!type": "number",
+            "!span": "4381[141:21]-4383[141:23]"
+          },
+          "divideAndRemainder": {},
+          "am": "am1",
+          "copyTo": "bnpCopyTo",
+          "fromInt": "bnpFromInt",
+          "fromString": "bnpFromString",
+          "clamp": "bnpClamp",
+          "dlShiftTo": "bnpDLShiftTo",
+          "drShiftTo": "bnpDRShiftTo",
+          "lShiftTo": "bnpLShiftTo",
+          "rShiftTo": "bnpRShiftTo",
+          "subTo": "bnpSubTo",
+          "multiplyTo": "bnpMultiplyTo",
+          "squareTo": "bnpSquareTo",
+          "divRemTo": "bnpDivRemTo",
+          "invDigit": "bnpInvDigit",
+          "isEven": "bnpIsEven",
+          "exp": "bnpExp",
+          "toString": "bnToString",
+          "negate": "bnNegate",
+          "abs": "bnAbs",
+          "compareTo": "bnCompareTo",
+          "bitLength": "bnBitLength",
+          "mod": "bnMod",
+          "modPowInt": "bnModPowInt",
+          "chunkSize": "bnpChunkSize",
+          "toRadix": "bnpToRadix",
+          "fromRadix": "bnpFromRadix",
+          "fromNumber": "bnpFromNumber",
+          "bitwiseTo": "bnpBitwiseTo",
+          "changeBit": "bnpChangeBit",
+          "addTo": "bnpAddTo",
+          "dMultiply": "bnpDMultiply",
+          "dAddOffset": "bnpDAddOffset",
+          "multiplyLowerTo": "bnpMultiplyLowerTo",
+          "multiplyUpperTo": "bnpMultiplyUpperTo",
+          "modInt": "bnpModInt",
+          "millerRabin": "bnpMillerRabin",
+          "clone": "bnClone",
+          "intValue": "bnIntValue",
+          "byteValue": "bnByteValue",
+          "shortValue": "bnShortValue",
+          "signum": "bnSigNum",
+          "toByteArray": "bnToByteArray",
+          "equals": "bnEquals",
+          "min": "bnMin",
+          "max": "bnMax",
+          "and": "bnAnd",
+          "or": "bnOr",
+          "xor": "bnXor",
+          "andNot": "bnAndNot",
+          "not": "bnNot",
+          "shiftLeft": "bnShiftLeft",
+          "shiftRight": "bnShiftRight",
+          "getLowestSetBit": "bnGetLowestSetBit",
+          "bitCount": "bnBitCount",
+          "testBit": "bnTestBit",
+          "setBit": "bnSetBit",
+          "clearBit": "bnClearBit",
+          "flipBit": "bnFlipBit",
+          "add": "bnAdd",
+          "subtract": "bnSubtract",
+          "multiply": "bnMultiply",
+          "divide": "bnDivide",
+          "remainder": "bnRemainder",
+          "modPow": "bnModPow",
+          "modInverse": "bnModInverse",
+          "pow": "bnPow",
+          "gcd": "bnGCD",
+          "isProbablePrime": "bnIsProbablePrime"
+        },
+        "ONE": "+BigInteger",
+        "ZERO": "+BigInteger"
+      },
+      "!span": "1779[50:23]-1783[50:27]"
+    },
+    "kem": {
+      "rsa": {
+        "create": {
+          "!type": "fn(kdf: ?, options: ?) -> forge.kem.rsa.create.!ret",
+          "!span": "1193[37:14]-1199[37:20]",
+          "!doc": "Creates an RSA KEM API object for generating a secret asymmetric key.\n\nThe symmetric key may be generated via a call to 'encrypt', which will\nproduce a ciphertext to be transmitted to the recipient and a key to be\nkept secret. The ciphertext is a parameter to be passed to 'decrypt' which\nwill produce the same secret key for the recipient to use to decrypt a\nmessage that was encrypted with the secret key.\n\n@param kdf the KDF API to use (eg: new forge.kem.kdf1()).\n@param options the options to use.\n         [prng] a custom crypto-secure pseudo-random number generator to use,\n           that must define \"getBytesSync\"."
+        },
+        "!span": "502[21:10]-505[21:13]",
+        "!doc": "The API for the RSA Key Encapsulation Mechanism (RSA-KEM) from ISO 18033-2."
+      },
+      "kdf1": {
+        "!type": "fn(md: ?, digestLength: ?)",
+        "!span": "3474[110:10]-3478[110:14]",
+        "!doc": "Creates a key derivation API object that implements KDF1 per ISO 18033-2.\n\n@param md the hash API to use.\n@param [digestLength] an optional digest length that must be positive and\n         less than or equal to md.digestLength.\n\n@return a KDF1 API object."
+      },
+      "kdf2": {
+        "!type": "fn(md: ?, digestLength: ?)",
+        "!span": "3867[123:10]-3871[123:14]",
+        "!doc": "Creates a key derivation API object that implements KDF2 per ISO 18033-2.\n\n@param md the hash API to use.\n@param [digestLength] an optional digest length that must be positive and\n         less than or equal to md.digestLength.\n\n@return a KDF2 API object."
+      },
+      "generate": {
+        "!type": "fn(x: ?, length: ?) -> ?",
+        "!span": "4516[145:6]-4524[145:14]",
+        "!doc": "Generate a key of the specified length.\n\n@param x the binary-encoded byte string to generate a key from.\n@param length the number of bytes to generate (the size of the key).\n\n@return the key as a binary-encoded string."
+      },
+      "!span": "340[14:23]-343[14:26]"
+    },
+    "md": {
+      "algorithms": {
+        "sha256": {
+          "create": {}
+        },
+        "!span": "213[10:9]-223[10:19]",
+        "md5": {
+          "create": "md5.create"
+        },
+        "sha1": {
+          "create": "sha1.create"
+        },
+        "sha384": {
+          "create": "sha384.create"
+        },
+        "sha512/256": {
+          "create": "forge.md.sha512/256.create"
+        },
+        "sha512/224": {
+          "create": "forge.md.sha512/224.create"
+        }
+      },
+      "sha256": {
+        "create": {}
+      },
+      "sha512/256": {
+        "create": {
+          "!type": "fn() -> _createKDF.!1",
+          "!span": "787[30:2]-793[30:8]"
+        },
+        "!span": "865[34:9]-877[34:21]",
+        "!doc": "SHA-512/256"
+      },
+      "sha512/224": {
+        "create": {
+          "!type": "fn() -> _createKDF.!1",
+          "!span": "1005[39:2]-1011[39:8]"
+        },
+        "!span": "1083[43:9]-1095[43:21]",
+        "!doc": "SHA-512/224"
+      },
+      "!span": "183[9:23]-185[9:25]",
+      "md5": {
+        "create": "md5.create"
+      },
+      "sha1": {
+        "create": "sha1.create"
+      },
+      "sha384": {
+        "create": "sha384.create"
+      }
+    },
+    "md5": {
+      "create": {}
+    },
+    "mgf": {
+      "!span": "222[10:23]-225[10:26]",
+      "mgf1": {
+        "create": {}
+      }
+    },
+    "oids": {
+      "<i>": {
+        "!type": "string",
+        "!span": "331[14:7]-333[14:9]"
+      }
+    },
+    "pbe": {
+      "getCipher": {
+        "!type": "fn(oid: string, params: ?, password: bool|string) -> ?",
+        "!span": "22714[753:8]-22723[753:17]",
+        "!doc": "Get new Forge cipher object instance.\n\n@param oid the OID (in string notation).\n@param params the ASN.1 params object.\n@param password the password to decrypt with.\n\n@return new cipher object instance."
+      },
+      "getCipherForPBES2": {
+        "!type": "fn(oid: string, params: ?, password: bool|string) -> ?|+BlockCipher",
+        "!span": "23692[786:8]-23709[786:25]",
+        "!doc": "Get new Forge cipher object instance according to PBES2 params block.\n\nThe returned cipher instance is already started using the IV\nfrom PBES2 parameter block.\n\n@param oid the PKCS#5 PBKDF2 OID (in string notation).\n@param params the ASN.1 PBES2-params object.\n@param password the password to decrypt with.\n\n@return new cipher object instance."
+      },
+      "getCipherForPKCS12PBE": {
+        "!type": "fn(oid: string, params: ?, password: bool|string) -> ?",
+        "!span": "26289[873:8]-26310[873:29]",
+        "!doc": "Get new Forge cipher object instance for PKCS#12 PBE.\n\nThe returned cipher instance is already started using the key & IV\nderived from the provided password and PKCS#12 PBE salt.\n\n@param oid The PKCS#12 PBE OID (in string notation).\n@param params The ASN.1 PKCS#12 PBE-params object.\n@param password The password to decrypt with.\n\n@return the new cipher object instance."
+      },
+      "opensslDeriveBytes": {
+        "!type": "fn(password: ?, salt: string, dkLen: number, md: hash.!0) -> string",
+        "!span": "28120[932:8]-28138[932:26]",
+        "!doc": "OpenSSL's legacy key derivation function.\n\nSee: http://www.openssl.org/docs/crypto/EVP_BytesToKey.html\n\n@param password the password to derive the key from.\n@param salt the salt to use, null for none.\n@param dkLen the number of bytes needed for the derived key.\n@param [options] the options to use:\n         [md] an optional message digest object to use."
+      },
+      "!span": "1000[41:33]-1003[41:36]",
+      "generatePkcs12Key": "p12.generateKey"
+    },
+    "pbkdf2": {
+      "!type": "fn(p: bool|string, s: ?, c: number|+ByteBuffer, dkLen: number, md: string, callback: string) -> !4.!ret",
+      "!span": "1164[37:23]-1170[37:29]",
+      "!doc": "Derives a key from a password.\n\n@param p the password as a binary-encoded string of bytes.\n@param s the salt as a binary-encoded string of bytes.\n@param c the iteration count, a positive integer.\n@param dkLen the intended length, in bytes, of the derived key,\n         (max: 2^32 - 1) * hash length of the PRF.\n@param [md] the message digest (or algorithm identifier as a string) to use\n         in the PRF, defaults to SHA-1.\n@param [callback(err, key)] presence triggers asynchronous version, called\n         once the operation completes.\n\n@return the derived key, as a binary-encoded string of bytes, for the\n          synchronous version (if no callback is specified)."
+    },
+    "pem": {
+      "encode": {},
+      "decode": {}
+    },
+    "pkcs12": {
+      "pkcs12FromAsn1": {},
+      "toPkcs12Asn1": {},
+      "generateKey": "p12.generateKey"
+    },
+    "pkcs7": {
+      "messageFromPem": {},
+      "createSignedData": {},
+      "createEncryptedData": {},
+      "asn1": {
+        "contentInfoValidator": {
+          "name": {
+            "!type": "string",
+            "!span": "3698[122:2]-3702[122:6]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "3721[123:2]-3729[123:10]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "3755[124:2]-3759[124:6]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "3783[125:2]-3794[125:13]"
+          },
+          "value": {
+            "0": {
+              "name": {
+                "!type": "string",
+                "!span": "3818[127:4]-3822[127:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "3855[128:4]-3863[128:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "3891[129:4]-3895[129:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "3916[130:4]-3927[130:15]"
+              },
+              "capture": {
+                "!type": "string",
+                "!span": "3940[131:4]-3947[131:11]"
+              }
+            },
+            "1": {
+              "name": {
+                "!type": "string",
+                "!span": "3974[133:4]-3978[133:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "4007[134:4]-4015[134:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "4050[135:4]-4054[135:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "4063[136:4]-4074[136:15]"
+              },
+              "optional": {
+                "!type": "bool",
+                "!span": "4086[137:4]-4094[137:12]"
+              },
+              "captureAsn1": {
+                "!type": "string",
+                "!span": "4106[138:4]-4117[138:15]"
+              }
+            }
+          }
+        },
+        "envelopedDataValidator": {
+          "name": {
+            "!type": "string",
+            "!span": "6095[206:2]-6099[206:6]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "6120[207:2]-6128[207:10]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "6154[208:2]-6158[208:6]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "6182[209:2]-6193[209:13]"
+          },
+          "value": {
+            "0": {
+              "name": {
+                "!type": "string",
+                "!span": "6217[211:4]-6221[211:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "6252[212:4]-6260[212:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "6288[213:4]-6292[213:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "6317[214:4]-6328[214:15]"
+              },
+              "capture": {
+                "!type": "string",
+                "!span": "6341[215:4]-6348[215:11]"
+              }
+            },
+            "1": {
+              "name": {
+                "!type": "string",
+                "!span": "6371[217:4]-6375[217:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "6413[218:4]-6421[218:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "6449[219:4]-6453[219:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "6474[220:4]-6485[220:15]"
+              },
+              "captureAsn1": {
+                "!type": "string",
+                "!span": "6497[221:4]-6508[221:15]"
+              }
+            }
+          }
+        },
+        "encryptedDataValidator": {
+          "name": {
+            "!type": "string",
+            "!span": "6607[226:2]-6611[226:6]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "6632[227:2]-6640[227:10]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "6666[228:2]-6670[228:6]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "6694[229:2]-6705[229:13]"
+          },
+          "value": {
+            "<i>": {
+              "name": {
+                "!type": "string",
+                "!span": "6729[231:4]-6733[231:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "6764[232:4]-6772[232:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "6800[233:4]-6804[233:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "6829[234:4]-6840[234:15]"
+              },
+              "capture": {
+                "!type": "string",
+                "!span": "6853[235:4]-6860[235:11]"
+              }
+            }
+          }
+        },
+        "signedDataValidator": {
+          "name": {
+            "!type": "string",
+            "!span": "9001[315:2]-9005[315:6]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "9023[316:2]-9031[316:10]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "9057[317:2]-9061[317:6]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "9085[318:2]-9096[318:13]"
+          },
+          "value": {
+            "<i>": "contentInfoValidator"
+          }
+        },
+        "recipientInfoValidator": {
+          "name": {
+            "!type": "string",
+            "!span": "9987[356:2]-9991[356:6]"
+          },
+          "tagClass": {
+            "!type": "number",
+            "!span": "10012[357:2]-10020[357:10]"
+          },
+          "type": {
+            "!type": "number",
+            "!span": "10046[358:2]-10050[358:6]"
+          },
+          "constructed": {
+            "!type": "bool",
+            "!span": "10074[359:2]-10085[359:13]"
+          },
+          "value": {
+            "0": {
+              "name": {
+                "!type": "string",
+                "!span": "10109[361:4]-10113[361:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "10144[362:4]-10152[362:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "10180[363:4]-10184[363:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "10209[364:4]-10220[364:15]"
+              },
+              "capture": {
+                "!type": "string",
+                "!span": "10233[365:4]-10240[365:11]"
+              }
+            },
+            "1": {
+              "name": {
+                "!type": "string",
+                "!span": "10263[367:4]-10267[367:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "10306[368:4]-10314[368:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "10342[369:4]-10346[369:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "10372[370:4]-10383[370:15]"
+              },
+              "value": {
+                "0": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "10411[372:6]-10415[372:10]"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "10463[373:6]-10471[373:14]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "10501[374:6]-10505[374:10]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "10533[375:6]-10544[375:17]"
+                  },
+                  "captureAsn1": {
+                    "!type": "string",
+                    "!span": "10558[376:6]-10569[376:17]"
+                  }
+                },
+                "1": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "10595[378:6]-10599[378:10]"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "10653[379:6]-10661[379:14]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "10691[380:6]-10695[380:10]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "10722[381:6]-10733[381:17]"
+                  },
+                  "capture": {
+                    "!type": "string",
+                    "!span": "10748[382:6]-10755[382:13]"
+                  }
+                }
+              }
+            },
+            "2": {
+              "name": {
+                "!type": "string",
+                "!span": "10784[385:4]-10788[385:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "10834[386:4]-10842[386:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "10870[387:4]-10874[387:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "10900[388:4]-10911[388:15]"
+              },
+              "value": {
+                "0": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "10939[390:6]-10943[390:10]"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "11001[391:6]-11009[391:14]"
+                  },
+                  "type": {
+                    "!type": "number",
+                    "!span": "11039[392:6]-11043[392:10]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "11066[393:6]-11077[393:17]"
+                  },
+                  "capture": {
+                    "!type": "string",
+                    "!span": "11092[394:6]-11099[394:13]"
+                  }
+                },
+                "1": {
+                  "name": {
+                    "!type": "string",
+                    "!span": "11131[396:6]-11135[396:10]"
+                  },
+                  "tagClass": {
+                    "!type": "number",
+                    "!span": "11193[397:6]-11201[397:14]"
+                  },
+                  "constructed": {
+                    "!type": "bool",
+                    "!span": "11231[398:6]-11242[398:17]"
+                  },
+                  "captureAsn1": {
+                    "!type": "string",
+                    "!span": "11257[399:6]-11268[399:17]"
+                  }
+                }
+              }
+            },
+            "3": {
+              "name": {
+                "!type": "string",
+                "!span": "11303[402:4]-11307[402:8]"
+              },
+              "tagClass": {
+                "!type": "number",
+                "!span": "11343[403:4]-11351[403:12]"
+              },
+              "type": {
+                "!type": "number",
+                "!span": "11379[404:4]-11383[404:8]"
+              },
+              "constructed": {
+                "!type": "bool",
+                "!span": "11412[405:4]-11423[405:15]"
+              },
+              "capture": {
+                "!type": "string",
+                "!span": "11436[406:4]-11443[406:11]"
+              }
+            }
+          }
+        }
+      },
+      "messageToPem": "p7.messageToPem",
+      "messageFromAsn1": "p7.messageFromAsn1",
+      "createEnvelopedData": "p7.createEnvelopedData"
+    },
+    "pkcs7asn1": {
+      "contentInfoValidator": {
+        "name": {
+          "!type": "string",
+          "!span": "3698[122:2]-3702[122:6]"
+        },
+        "tagClass": {
+          "!type": "number",
+          "!span": "3721[123:2]-3729[123:10]"
+        },
+        "type": {
+          "!type": "number",
+          "!span": "3755[124:2]-3759[124:6]"
+        },
+        "constructed": {
+          "!type": "bool",
+          "!span": "3783[125:2]-3794[125:13]"
+        },
+        "value": {
+          "0": {
+            "name": {
+              "!type": "string",
+              "!span": "3818[127:4]-3822[127:8]"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "3855[128:4]-3863[128:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "3891[129:4]-3895[129:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "3916[130:4]-3927[130:15]"
+            },
+            "capture": {
+              "!type": "string",
+              "!span": "3940[131:4]-3947[131:11]"
+            }
+          },
+          "1": {
+            "name": {
+              "!type": "string",
+              "!span": "3974[133:4]-3978[133:8]"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "4007[134:4]-4015[134:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "4050[135:4]-4054[135:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "4063[136:4]-4074[136:15]"
+            },
+            "optional": {
+              "!type": "bool",
+              "!span": "4086[137:4]-4094[137:12]"
+            },
+            "captureAsn1": {
+              "!type": "string",
+              "!span": "4106[138:4]-4117[138:15]"
+            }
+          }
+        }
+      },
+      "envelopedDataValidator": {
+        "name": {
+          "!type": "string",
+          "!span": "6095[206:2]-6099[206:6]"
+        },
+        "tagClass": {
+          "!type": "number",
+          "!span": "6120[207:2]-6128[207:10]"
+        },
+        "type": {
+          "!type": "number",
+          "!span": "6154[208:2]-6158[208:6]"
+        },
+        "constructed": {
+          "!type": "bool",
+          "!span": "6182[209:2]-6193[209:13]"
+        },
+        "value": {
+          "0": {
+            "name": {
+              "!type": "string",
+              "!span": "6217[211:4]-6221[211:8]"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "6252[212:4]-6260[212:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "6288[213:4]-6292[213:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "6317[214:4]-6328[214:15]"
+            },
+            "capture": {
+              "!type": "string",
+              "!span": "6341[215:4]-6348[215:11]"
+            }
+          },
+          "1": {
+            "name": {
+              "!type": "string",
+              "!span": "6371[217:4]-6375[217:8]"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "6413[218:4]-6421[218:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "6449[219:4]-6453[219:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "6474[220:4]-6485[220:15]"
+            },
+            "captureAsn1": {
+              "!type": "string",
+              "!span": "6497[221:4]-6508[221:15]"
+            }
+          }
+        }
+      },
+      "encryptedDataValidator": {
+        "name": {
+          "!type": "string",
+          "!span": "6607[226:2]-6611[226:6]"
+        },
+        "tagClass": {
+          "!type": "number",
+          "!span": "6632[227:2]-6640[227:10]"
+        },
+        "type": {
+          "!type": "number",
+          "!span": "6666[228:2]-6670[228:6]"
+        },
+        "constructed": {
+          "!type": "bool",
+          "!span": "6694[229:2]-6705[229:13]"
+        },
+        "value": {
+          "<i>": {
+            "name": {
+              "!type": "string",
+              "!span": "6729[231:4]-6733[231:8]"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "6764[232:4]-6772[232:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "6800[233:4]-6804[233:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "6829[234:4]-6840[234:15]"
+            },
+            "capture": {
+              "!type": "string",
+              "!span": "6853[235:4]-6860[235:11]"
+            }
+          }
+        }
+      },
+      "signedDataValidator": {
+        "name": {
+          "!type": "string",
+          "!span": "9001[315:2]-9005[315:6]"
+        },
+        "tagClass": {
+          "!type": "number",
+          "!span": "9023[316:2]-9031[316:10]"
+        },
+        "type": {
+          "!type": "number",
+          "!span": "9057[317:2]-9061[317:6]"
+        },
+        "constructed": {
+          "!type": "bool",
+          "!span": "9085[318:2]-9096[318:13]"
+        },
+        "value": {
+          "<i>": "contentInfoValidator"
+        }
+      },
+      "recipientInfoValidator": {
+        "name": {
+          "!type": "string",
+          "!span": "9987[356:2]-9991[356:6]"
+        },
+        "tagClass": {
+          "!type": "number",
+          "!span": "10012[357:2]-10020[357:10]"
+        },
+        "type": {
+          "!type": "number",
+          "!span": "10046[358:2]-10050[358:6]"
+        },
+        "constructed": {
+          "!type": "bool",
+          "!span": "10074[359:2]-10085[359:13]"
+        },
+        "value": {
+          "0": {
+            "name": {
+              "!type": "string",
+              "!span": "10109[361:4]-10113[361:8]"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "10144[362:4]-10152[362:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "10180[363:4]-10184[363:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "10209[364:4]-10220[364:15]"
+            },
+            "capture": {
+              "!type": "string",
+              "!span": "10233[365:4]-10240[365:11]"
+            }
+          },
+          "1": {
+            "name": {
+              "!type": "string",
+              "!span": "10263[367:4]-10267[367:8]"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "10306[368:4]-10314[368:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "10342[369:4]-10346[369:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "10372[370:4]-10383[370:15]"
+            },
+            "value": {
+              "0": {
+                "name": {
+                  "!type": "string",
+                  "!span": "10411[372:6]-10415[372:10]"
+                },
+                "tagClass": {
+                  "!type": "number",
+                  "!span": "10463[373:6]-10471[373:14]"
+                },
+                "type": {
+                  "!type": "number",
+                  "!span": "10501[374:6]-10505[374:10]"
+                },
+                "constructed": {
+                  "!type": "bool",
+                  "!span": "10533[375:6]-10544[375:17]"
+                },
+                "captureAsn1": {
+                  "!type": "string",
+                  "!span": "10558[376:6]-10569[376:17]"
+                }
+              },
+              "1": {
+                "name": {
+                  "!type": "string",
+                  "!span": "10595[378:6]-10599[378:10]"
+                },
+                "tagClass": {
+                  "!type": "number",
+                  "!span": "10653[379:6]-10661[379:14]"
+                },
+                "type": {
+                  "!type": "number",
+                  "!span": "10691[380:6]-10695[380:10]"
+                },
+                "constructed": {
+                  "!type": "bool",
+                  "!span": "10722[381:6]-10733[381:17]"
+                },
+                "capture": {
+                  "!type": "string",
+                  "!span": "10748[382:6]-10755[382:13]"
+                }
+              }
+            }
+          },
+          "2": {
+            "name": {
+              "!type": "string",
+              "!span": "10784[385:4]-10788[385:8]"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "10834[386:4]-10842[386:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "10870[387:4]-10874[387:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "10900[388:4]-10911[388:15]"
+            },
+            "value": {
+              "0": {
+                "name": {
+                  "!type": "string",
+                  "!span": "10939[390:6]-10943[390:10]"
+                },
+                "tagClass": {
+                  "!type": "number",
+                  "!span": "11001[391:6]-11009[391:14]"
+                },
+                "type": {
+                  "!type": "number",
+                  "!span": "11039[392:6]-11043[392:10]"
+                },
+                "constructed": {
+                  "!type": "bool",
+                  "!span": "11066[393:6]-11077[393:17]"
+                },
+                "capture": {
+                  "!type": "string",
+                  "!span": "11092[394:6]-11099[394:13]"
+                }
+              },
+              "1": {
+                "name": {
+                  "!type": "string",
+                  "!span": "11131[396:6]-11135[396:10]"
+                },
+                "tagClass": {
+                  "!type": "number",
+                  "!span": "11193[397:6]-11201[397:14]"
+                },
+                "constructed": {
+                  "!type": "bool",
+                  "!span": "11231[398:6]-11242[398:17]"
+                },
+                "captureAsn1": {
+                  "!type": "string",
+                  "!span": "11257[399:6]-11268[399:17]"
+                }
+              }
+            }
+          },
+          "3": {
+            "name": {
+              "!type": "string",
+              "!span": "11303[402:4]-11307[402:8]"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "11343[403:4]-11351[403:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "11379[404:4]-11383[404:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "11412[405:4]-11423[405:15]"
+            },
+            "capture": {
+              "!type": "string",
+              "!span": "11436[406:4]-11443[406:11]"
+            }
+          }
+        }
+      }
+    },
+    "prime": {
+      "generateProbablePrime": {
+        "!type": "fn(bits: number, options: forge.prime.generateProbablePrime.!1, callback: forge.prime.generateProbablePrime.!1|fn(err: ?, num: +BigInteger))",
+        "!span": "1765[60:6]-1786[60:27]",
+        "!doc": "Generates a random probable prime with the given number of bits.\n\nAlternative algorithms can be specified by name as a string or as an\nobject with custom options like so:\n\n{\n  name: 'PRIMEINC',\n  options: {\n    maxBlockTime: <the maximum amount of time to block the main\n      thread before allowing I/O other JS to run>,\n    millerRabinTests: <the number of miller-rabin tests to run>,\n    workerScript: <the worker script URL>,\n    workers: <the number of web workers (if supported) to use,\n      -1 to use estimated cores minus one>.\n    workLoad: the size of the work load, ie: number of possible prime\n      numbers for each web worker to check per work assignment,\n      (default: 100).\n  }\n}\n\n@param bits the number of bits for the prime number.\n@param options the options to use.\n         [algorithm] the algorithm to use (default: 'PRIMEINC').\n         [prng] a custom crypto-secure pseudo-random number generator to use,\n           that must define \"getBytesSync\".\n\n@return callback(err, num) called once the operation completes."
+      },
+      "!span": "365[21:35]-370[21:40]",
+      "!doc": "PRIME API"
+    },
+    "prng": {
+      "create": {}
+    },
+    "random": {
+      "plugin": {
+        "formatKey": {
+          "!type": "fn(key: ?) -> ?",
+          "!span": "1046[35:9]-1055[35:18]"
+        },
+        "formatSeed": {
+          "!type": "fn(seed: ?) -> [number|_fromDer.!ret]",
+          "!span": "1373[47:9]-1383[47:19]"
+        },
+        "cipher": {
+          "!type": "fn(key: ?, seed: [number|_fromDer.!ret]) -> ?",
+          "!span": "1647[57:9]-1653[57:15]"
+        },
+        "increment": {
+          "!type": "fn(seed: [number|_fromDer.!ret]) -> !0",
+          "!span": "1990[65:9]-1999[65:18]"
+        },
+        "!span": "1382[43:4]-1388[43:10]",
+        "md": "sha256"
+      },
+      "seed": {
+        "!type": "[number|_fromDer.!ret]",
+        "!span": "1417[45:4]-1421[45:8]"
+      },
+      "reseeds": {
+        "!type": "number",
+        "!span": "1481[48:4]-1488[48:11]",
+        "!doc": "update reseed count"
+      },
+      "generated": {
+        "!type": "number",
+        "!span": "1536[50:4]-1545[50:13]",
+        "!doc": "amount of data generated so far"
+      },
+      "keyBytes": {
+        "!type": "string",
+        "!span": "1582[52:4]-1590[52:12]",
+        "!doc": "get digest for key bytes"
+      },
+      "pools": {
+        "!type": "[forge.random.pools.<i>]",
+        "!span": "1778[61:6]-1783[61:11]"
+      },
+      "pool": {
+        "!type": "number",
+        "!span": "1866[64:6]-1870[64:10]",
+        "!doc": "entropy pools are written to cyclically, starting at index 0"
+      },
+      "generate": {
+        "!type": "fn(count: number|string, callback: ?) -> ?",
+        "!span": "2262[76:6]-2270[76:14]",
+        "!doc": "Generates random bytes. The bytes may be generated synchronously or\nasynchronously. Web workers must use the asynchronous interface or\nelse the behavior is undefined.\n\n@param count the number of random bytes to generate.\n@param [callback(err, bytes)] called once the operation completes.\n\n@return count random bytes as a string."
+      },
+      "generateSync": {
+        "!type": "fn(count: number|string) -> ?",
+        "!span": "3996[140:6]-4008[140:18]",
+        "!doc": "Generates random bytes synchronously.\n\n@param count the number of random bytes to generate.\n\n@return count random bytes as a string."
+      },
+      "seedFile": {
+        "!type": "fn(needed: number, callback: fn(err: ?, bytes: ?))",
+        "!span": "9685[329:8]-9693[329:16]",
+        "!doc": "use nodejs async API"
+      },
+      "seedFileSync": {
+        "!type": "fn(needed: number) -> ?",
+        "!span": "9936[338:8]-9948[338:20]",
+        "!doc": "use nodejs sync API"
+      },
+      "collect": {
+        "!type": "fn(bytes: ?)",
+        "!span": "10372[357:6]-10379[357:13]",
+        "!doc": "Adds entropy to a prng ctx's accumulator.\n\n@param bytes the bytes of entropy as a string."
+      },
+      "collectInt": {
+        "!type": "fn(i: number, n: number)",
+        "!span": "10789[372:6]-10799[372:16]",
+        "!doc": "Collects an integer of n bits.\n\n@param i the integer entropy.\n@param n the number of bits in the integer."
+      },
+      "registerWorker": {
+        "!type": "fn(worker: ?)",
+        "!span": "11316[388:6]-11330[388:20]",
+        "!doc": "Registers a Web Worker to receive immediate entropy from the main thread.\nThis method is required until Web Workers can access the native crypto\nAPI. This method should be called twice for each created worker, once in\nthe main thread, and once in the worker itself.\n\n@param worker the worker to register."
+      },
+      "getBytes": {
+        "!type": "fn(count: number, callback: ?) -> ?",
+        "!span": "2732[90:6]-2740[90:14]",
+        "!doc": "Gets random bytes. If a native secure crypto API is unavailable, this\nmethod tries to make the bytes more unpredictable by drawing from data that\ncan be collected from the user of the browser, eg: mouse movement.\n\nIf a callback is given, this method will be called asynchronously.\n\n@param count the number of random bytes to get.\n@param [callback(err, bytes)] called once the operation completes.\n\n@return the random bytes in a string."
+      },
+      "getBytesSync": {
+        "!type": "fn(count: number|string) -> ?",
+        "!span": "3191[104:6]-3203[104:18]",
+        "!doc": "Gets random bytes asynchronously. If a native secure crypto API is\nunavailable, this method tries to make the bytes more unpredictable by\ndrawing from data that can be collected from the user of the browser,\neg: mouse movement.\n\n@param count the number of random bytes to get.\n\n@return the random bytes in a string."
+      },
+      "createInstance": {
+        "!type": "fn() -> forge.random",
+        "!span": "5318[184:13]-5332[184:27]",
+        "!doc": "expose spawn PRNG"
+      },
+      "!span": "5158[175:8]-5164[175:14]"
+    },
+    "rc2": {
+      "expandKey": {
+        "!type": "fn(key: string|+ByteBuffer, effKeyBits: number) -> !0",
+        "!span": "2951[72:10]-2960[72:19]",
+        "!doc": "Perform RC2 key expansion as per RFC #2268, section 2.\n\n@param key variable-length user key (between 1 and 128 bytes)\n@param effKeyBits number of effective key bits (default: 128)\n@return the expanded RC2 key (ByteBuffer of 128 bytes)"
+      },
+      "startEncrypting": {
+        "!type": "fn(key: ?, iv: ?, output: ?) -> createCipher.!ret",
+        "!span": "10256[351:10]-10271[351:25]",
+        "!doc": "Creates an RC2 cipher object to encrypt data in ECB or CBC mode using the\ngiven symmetric key. The output will be stored in the 'output' member\nof the returned cipher.\n\nThe key and iv may be given as a string of bytes or a byte buffer.\nThe cipher is initialized to use 128 effective key bits.\n\n@param key the symmetric key to use.\n@param iv the initialization vector to use.\n@param output the buffer to write to, null to create one.\n\n@return the cipher."
+      },
+      "createEncryptionCipher": {
+        "!type": "fn(key: ?, bits: number) -> createCipher.!ret",
+        "!span": "10759[370:10]-10781[370:32]",
+        "!doc": "Creates an RC2 cipher object to encrypt data in ECB or CBC mode using the\ngiven symmetric key.\n\nThe key may be given as a string of bytes or a byte buffer.\n\nTo start encrypting call start() on the cipher with an iv and optional\noutput buffer.\n\n@param key the symmetric key to use.\n\n@return the cipher."
+      },
+      "startDecrypting": {
+        "!type": "fn(key: ?, iv: ?, output: ?) -> createCipher.!ret",
+        "!span": "11355[388:10]-11370[388:25]",
+        "!doc": "Creates an RC2 cipher object to decrypt data in ECB or CBC mode using the\ngiven symmetric key. The output will be stored in the 'output' member\nof the returned cipher.\n\nThe key and iv may be given as a string of bytes or a byte buffer.\nThe cipher is initialized to use 128 effective key bits.\n\n@param key the symmetric key to use.\n@param iv the initialization vector to use.\n@param output the buffer to write to, null to create one.\n\n@return the cipher."
+      },
+      "createDecryptionCipher": {
+        "!type": "fn(key: string, bits: number) -> createCipher.!ret",
+        "!span": "11858[407:10]-11880[407:32]",
+        "!doc": "Creates an RC2 cipher object to decrypt data in ECB or CBC mode using the\ngiven symmetric key.\n\nThe key may be given as a string of bytes or a byte buffer.\n\nTo start decrypting call start() on the cipher with an iv and optional\noutput buffer.\n\n@param key the symmetric key to use.\n\n@return the cipher."
+      },
+      "!span": "2660[63:23]-2663[63:26]",
+      "!doc": "RC2 API"
+    },
+    "rsa": {
+      "publicKeyValidator": {
+        "name": {
+          "!type": "string",
+          "!span": "6195[231:2]-6199[231:6]"
+        },
+        "tagClass": {
+          "!type": "number",
+          "!span": "6227[232:2]-6235[232:10]"
+        },
+        "type": {
+          "!type": "number",
+          "!span": "6261[233:2]-6265[233:6]"
+        },
+        "constructed": {
+          "!type": "bool",
+          "!span": "6289[234:2]-6300[234:13]"
+        },
+        "captureAsn1": {
+          "!type": "string",
+          "!span": "6310[235:2]-6321[235:13]"
+        },
+        "value": {
+          "0": {
+            "name": {
+              "!type": "string",
+              "!span": "6363[237:4]-6367[237:8]"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "6417[238:4]-6425[238:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "6453[239:4]-6457[239:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "6483[240:4]-6494[240:15]"
+            },
+            "value": {
+              "<i>": {
+                "name": {
+                  "!type": "string",
+                  "!span": "6522[242:6]-6526[242:10]"
+                },
+                "tagClass": {
+                  "!type": "number",
+                  "!span": "6567[243:6]-6575[243:14]"
+                },
+                "type": {
+                  "!type": "number",
+                  "!span": "6605[244:6]-6609[244:10]"
+                },
+                "constructed": {
+                  "!type": "bool",
+                  "!span": "6632[245:6]-6643[245:17]"
+                },
+                "capture": {
+                  "!type": "string",
+                  "!span": "6658[246:6]-6665[246:13]"
+                }
+              }
+            }
+          },
+          "1": {
+            "name": {
+              "!type": "string",
+              "!span": "6724[250:4]-6728[250:8]",
+              "!doc": "subjectPublicKey"
+            },
+            "tagClass": {
+              "!type": "number",
+              "!span": "6775[251:4]-6783[251:12]"
+            },
+            "type": {
+              "!type": "number",
+              "!span": "6811[252:4]-6815[252:8]"
+            },
+            "constructed": {
+              "!type": "bool",
+              "!span": "6842[253:4]-6853[253:15]"
+            },
+            "value": {
+              "<i>": {
+                "name": {
+                  "!type": "string",
+                  "!span": "6904[256:6]-6908[256:10]",
+                  "!doc": "RSAPublicKey"
+                },
+                "tagClass": {
+                  "!type": "number",
+                  "!span": "6970[257:6]-6978[257:14]"
+                },
+                "type": {
+                  "!type": "number",
+                  "!span": "7008[258:6]-7012[258:10]"
+                },
+                "constructed": {
+                  "!type": "bool",
+                  "!span": "7040[259:6]-7051[259:17]"
+                },
+                "optional": {
+                  "!type": "bool",
+                  "!span": "7065[260:6]-7073[260:14]"
+                },
+                "captureAsn1": {
+                  "!type": "string",
+                  "!span": "7087[261:6]-7098[261:17]"
+                }
+              }
+            }
+          }
+        }
+      },
+      "encrypt": {
+        "!type": "fn(m: string|+ByteBuffer, key: _publicKeyFromJwk.!ret|_modPow.!1, bt: bool|number) -> ?",
+        "!span": "14183[479:8]-14190[479:15]",
+        "!doc": "NOTE: THIS METHOD IS DEPRECATED, use 'sign' on a private key object or\n'encrypt' on a public key object instead.\n\nPerforms RSA encryption.\n\nThe parameter bt controls whether to put padding bytes before the\nmessage passed in. Set bt to either true or false to disable padding\ncompletely (in order to handle e.g. EMSA-PSS encoding seperately before),\nsignaling whether the encryption operation is a public key operation\n(i.e. encrypting data) or not, i.e. private key operation (data signing).\n\nFor PKCS#1 v1.5 padding pass in the block type to use, i.e. either 0x01\n(for signing) or 0x02 (for encryption). The key operation mode (private\nor public) is derived from this flag in that case).\n\n@param m the message to encrypt as a byte string.\n@param key the RSA key to use.\n@param bt for PKCS#1 v1.5 padding, the block type to use\n  (0x01 for private key, 0x02 for public),\n  to disable padding: true = public key, false = private key.\n\n@return the encrypted bytes as a string."
+      },
+      "decrypt": {
+        "!type": "fn(ed: ?, key: _publicKeyFromJwk.!ret|_modPow.!1, pub: bool, ml: bool) -> ?",
+        "!span": "15898[534:8]-15905[534:15]",
+        "!doc": "NOTE: THIS METHOD IS DEPRECATED, use 'decrypt' on a private key object or\n'verify' on a public key object instead.\n\nPerforms RSA decryption.\n\nThe parameter ml controls whether to apply PKCS#1 v1.5 padding\nor not.  Set ml = false to disable padding removal completely\n(in order to handle e.g. EMSA-PSS later on) and simply pass back\nthe RSA encryption block.\n\n@param ed the encrypted data to decrypt in as a byte string.\n@param key the RSA key to use.\n@param pub true for a public key operation, false for private.\n@param ml the message length, if known, false to disable padding.\n\n@return the decrypted message as a byte string."
+      },
+      "createKeyPairGenerationState": {
+        "!type": "fn(bits: number, e: number, options: ?|number) -> _generateKeyPair.!0",
+        "!span": "17910[594:8]-17938[594:36]",
+        "!doc": "Creates an RSA key-pair generation state object. It is used to allow\nkey-generation to be performed in steps. It also allows for a UI to\ndisplay progress updates.\n\n@param bits the size for the private key in bits, defaults to 2048.\n@param e the public exponent to use, defaults to 65537 (0x10001).\n@param [options] the options to use.\n         prng a custom crypto-secure pseudo-random number generator to use,\n           that must define \"getBytesSync\".\n         algorithm the algorithm to use (default: 'PRIMEINC').\n\n@return the state object to use to generate the key-pair."
+      },
+      "stepKeyPairGenerationState": {
+        "!type": "fn(state: _generateKeyPair.!0, n: number) -> bool",
+        "!span": "20210[673:8]-20236[673:34]",
+        "!doc": "Attempts to runs the key-generation algorithm for at most n seconds\n(approximately) using the given state. When key-generation has completed,\nthe keys will be stored in state.keys.\n\nTo use this function to update a UI while generating a key or to prevent\ncausing browser lockups/warnings, set \"n\" to a value other than 0. A\nsimple pattern for generating a key and showing a progress indicator is:\n\nvar state = pki.rsa.createKeyPairGenerationState(2048);\nvar step = function() {\n  // step key-generation, run algorithm for 100 ms, repeat\n  if(!forge.pki.rsa.stepKeyPairGenerationState(state, 100)) {\n    setTimeout(step, 1);\n  } else {\n    // key-generation complete\n    // TODO: turn off progress indicator here\n    // TODO: use the generated key-pair in \"state.keys\"\n  }\n};\n// TODO: turn on progress indicator here\nsetTimeout(step, 0);\n\n@param state the state to use.\n@param n the maximum number of milliseconds to run the algorithm for, 0\n         to run the algorithm to completion.\n\n@return true if the key-generation completed, false if not."
+      },
+      "generateKeyPair": {
+        "!type": "fn(bits: number, e: number, options: ?|number, callback: ?|number) -> ?",
+        "!span": "26181[843:8]-26196[843:23]",
+        "!doc": "Generates an RSA public-private key pair in a single call.\n\nTo generate a key-pair in steps (to allow for progress updates and to\nprevent blocking or warnings in slow browsers) then use the key-pair\ngeneration state functions.\n\nTo generate a key-pair asynchronously (either through web-workers, if\navailable, or by breaking up the work on the main thread), pass a\ncallback function.\n\n@param [bits] the size for the private key in bits, defaults to 2048.\n@param [e] the public exponent to use, defaults to 65537.\n@param [options] options for key-pair generation, if given then 'bits'\n           and 'e' must *not* be given:\n         bits the size for the private key in bits, (default: 2048).\n         e the public exponent to use, (default: 65537 (0x10001)).\n         workerScript the worker script URL.\n         workers the number of web workers (if supported) to use,\n           (default: 2).\n         workLoad the size of the work load, ie: number of possible prime\n           numbers for each web worker to check per work assignment,\n           (default: 100).\n         prng a custom crypto-secure pseudo-random number generator to use,\n           that must define \"getBytesSync\". Disables use of native APIs.\n         algorithm the algorithm to use (default: 'PRIMEINC').\n@param [callback(err, keypair)] called once the operation completes.\n\n@return an object with privateKey and publicKey properties."
+      },
+      "!span": "2386[88:39]-2389[88:42]",
+      "setPublicKey": "pki.setRsaPublicKey",
+      "setPrivateKey": "pki.setRsaPrivateKey"
+    },
+    "sha512": {
+      "create": {
+        "!type": "fn(algorithm: string) -> _createKDF.!1",
+        "!span": "1357[54:7]-1363[54:13]"
+      },
+      "!span": "415[16:36]-421[16:42]",
+      "!doc": "SHA-512",
+      "sha384": "sha384",
+      "sha256": "forge.md.sha512/256",
+      "sha224": "forge.md.sha512/224"
+    },
+    "util": {
+      "isNodejs": {
+        "!type": "bool",
+        "!span": "3331[109:5]-3339[109:13]",
+        "!doc": "check if running under Node.js"
+      },
+      "parseFragment": {},
+      "makeRequest": {},
+      "cores": {
+        "!type": "number",
+        "!span": "73990[2815:9]-73995[2815:14]",
+        "!doc": "can't estimate, default to 2"
+      },
+      "setImmediate": "util.nextTick",
+      "ByteStringBuffer": "ByteBuffer",
+      "binary": {
+        "hex": {
+          "encode": "util.bytesToHex",
+          "decode": "util.binary.hex.decode"
+        },
+        "raw": {
+          "encode": "util.binary.raw.encode",
+          "decode": "util.binary.raw.decode"
+        },
+        "base64": {
+          "encode": "util.binary.base64.encode",
+          "decode": "util.binary.base64.decode"
+        },
+        "base58": {
+          "encode": "util.binary.base58.encode",
+          "decode": "util.binary.base58.decode"
+        },
+        "baseN": "util.binary.baseN"
+      },
+      "setItem": {},
+      "parseUrl": "http.parseUrl",
+      "deflate": {},
+      "ByteBuffer": {
+        "prototype": {
+          "_optimizeConstructedString": "ByteBuffer.prototype._optimizeConstructedString",
+          "length": "ByteBuffer.prototype.length",
+          "isEmpty": "ByteBuffer.prototype.isEmpty",
+          "putByte": "ByteBuffer.prototype.putByte",
+          "fillWithByte": "ByteBuffer.prototype.fillWithByte",
+          "putBytes": "ByteBuffer.prototype.putBytes",
+          "putString": "ByteBuffer.prototype.putString",
+          "putInt16": "ByteBuffer.prototype.putInt16",
+          "putInt24": "ByteBuffer.prototype.putInt24",
+          "putInt32": "ByteBuffer.prototype.putInt32",
+          "putInt16Le": "ByteBuffer.prototype.putInt16Le",
+          "putInt24Le": "ByteBuffer.prototype.putInt24Le",
+          "putInt32Le": "ByteBuffer.prototype.putInt32Le",
+          "putInt": "ByteBuffer.prototype.putInt",
+          "putSignedInt": "ByteBuffer.prototype.putSignedInt",
+          "putBuffer": "ByteBuffer.prototype.putBuffer",
+          "getByte": "ByteBuffer.prototype.getByte",
+          "getInt16": "ByteBuffer.prototype.getInt16",
+          "getInt24": "ByteBuffer.prototype.getInt24",
+          "getInt32": "ByteBuffer.prototype.getInt32",
+          "getInt16Le": "ByteBuffer.prototype.getInt16Le",
+          "getInt24Le": "ByteBuffer.prototype.getInt24Le",
+          "getInt32Le": "ByteBuffer.prototype.getInt32Le",
+          "getInt": "ByteBuffer.prototype.getInt",
+          "getSignedInt": "ByteBuffer.prototype.getSignedInt",
+          "getBytes": "ByteBuffer.prototype.getBytes",
+          "bytes": "ByteBuffer.prototype.bytes",
+          "at": "ByteBuffer.prototype.at",
+          "setAt": "ByteBuffer.prototype.setAt",
+          "last": "ByteBuffer.prototype.last",
+          "copy": "ByteBuffer.prototype.copy",
+          "compact": "ByteBuffer.prototype.compact",
+          "clear": "ByteBuffer.prototype.clear",
+          "truncate": "ByteBuffer.prototype.truncate",
+          "toHex": "ByteBuffer.prototype.toHex",
+          "toString": "ByteBuffer.prototype.toString"
+        }
+      },
+      "nextTick": "util.nextTick",
+      "isArray": "util.isArray",
+      "isArrayBuffer": "util.isArrayBuffer",
+      "isArrayBufferView": "util.isArrayBufferView",
+      "DataBuffer": {
+        "prototype": {
+          "length": "DataBuffer.prototype.length",
+          "isEmpty": "DataBuffer.prototype.isEmpty",
+          "accommodate": "DataBuffer.prototype.accommodate",
+          "putByte": "DataBuffer.prototype.putByte",
+          "fillWithByte": "DataBuffer.prototype.fillWithByte",
+          "putBytes": "DataBuffer.prototype.putBytes",
+          "putBuffer": "DataBuffer.prototype.putBuffer",
+          "putString": "DataBuffer.prototype.putString",
+          "putInt16": "DataBuffer.prototype.putInt16",
+          "putInt24": "DataBuffer.prototype.putInt24",
+          "putInt32": "DataBuffer.prototype.putInt32",
+          "putInt16Le": "DataBuffer.prototype.putInt16Le",
+          "putInt24Le": "DataBuffer.prototype.putInt24Le",
+          "putInt32Le": "DataBuffer.prototype.putInt32Le",
+          "putInt": "DataBuffer.prototype.putInt",
+          "putSignedInt": "DataBuffer.prototype.putSignedInt",
+          "getByte": "DataBuffer.prototype.getByte",
+          "getInt16": "DataBuffer.prototype.getInt16",
+          "getInt24": "DataBuffer.prototype.getInt24",
+          "getInt32": "DataBuffer.prototype.getInt32",
+          "getInt16Le": "DataBuffer.prototype.getInt16Le",
+          "getInt24Le": "DataBuffer.prototype.getInt24Le",
+          "getInt32Le": "DataBuffer.prototype.getInt32Le",
+          "getInt": "DataBuffer.prototype.getInt",
+          "getSignedInt": "DataBuffer.prototype.getSignedInt",
+          "getBytes": "DataBuffer.prototype.getBytes",
+          "bytes": "DataBuffer.prototype.bytes",
+          "at": "DataBuffer.prototype.at",
+          "setAt": "DataBuffer.prototype.setAt",
+          "last": "DataBuffer.prototype.last",
+          "copy": "DataBuffer.prototype.copy",
+          "compact": "DataBuffer.prototype.compact",
+          "clear": "DataBuffer.prototype.clear",
+          "truncate": "DataBuffer.prototype.truncate",
+          "toHex": "DataBuffer.prototype.toHex",
+          "toString": "DataBuffer.prototype.toString"
+        }
+      },
+      "createBuffer": "util.createBuffer",
+      "fillString": "util.fillString",
+      "xorBytes": "util.xorBytes",
+      "hexToBytes": "util.hexToBytes",
+      "bytesToHex": "util.bytesToHex",
+      "int32ToBytes": "util.int32ToBytes",
+      "encode64": "util.encode64",
+      "decode64": "util.decode64",
+      "encodeUtf8": "util.encodeUtf8",
+      "decodeUtf8": "util.decodeUtf8",
+      "text": {
+        "utf8": {
+          "encode": "util.text.utf8.encode",
+          "decode": "util.text.utf8.decode"
+        },
+        "utf16": {
+          "encode": "util.text.utf16.encode",
+          "decode": "util.text.utf16.decode"
+        }
+      },
+      "inflate": "util.inflate",
+      "getItem": "util.getItem",
+      "removeItem": "util.removeItem",
+      "clearItems": "util.clearItems",
+      "getQueryVariables": "util.getQueryVariables",
+      "makeLink": "util.makeLink",
+      "isEmpty": "util.isEmpty",
+      "format": "util.format",
+      "formatNumber": "util.formatNumber",
+      "formatSize": "util.formatSize",
+      "bytesFromIP": "util.bytesFromIP",
+      "bytesFromIPv4": "util.bytesFromIPv4",
+      "bytesFromIPv6": "util.bytesFromIPv6",
+      "bytesToIP": "util.bytesToIP",
+      "bytesToIPv4": "util.bytesToIPv4",
+      "bytesToIPv6": "util.bytesToIPv6",
+      "estimateCores": "util.estimateCores"
+    },
+    "hmac": {
+      "create": {}
+    },
+    "pkcs5": {
+      "pbkdf2": "forge.pbkdf2"
+    },
+    "mgf1": {
+      "create": {}
+    },
+    "pkcs1": {
+      "encode_rsa_oaep": "pkcs1.encode_rsa_oaep",
+      "decode_rsa_oaep": "pkcs1.decode_rsa_oaep"
+    },
+    "pss": {
+      "create": {}
+    },
+    "sha1": {
+      "create": "sha1.create"
+    },
+    "sha256": {
+      "create": "sha256.create"
+    },
+    "sha384": {
+      "create": "sha384.create"
+    },
+    "ssh": {
+      "privateKeyToPutty": "ssh.privateKeyToPutty",
+      "publicKeyToOpenSSH": "ssh.publicKeyToOpenSSH",
+      "privateKeyToOpenSSH": "ssh.privateKeyToOpenSSH",
+      "getPublicKeyFingerprint": "ssh.getPublicKeyFingerprint"
+    }
+  }
+}
diff --git a/app/client/src/constants/messages.ts b/app/client/src/constants/messages.ts
index 363db122e2..9de4343919 100644
--- a/app/client/src/constants/messages.ts
+++ b/app/client/src/constants/messages.ts
@@ -202,7 +202,7 @@ export const GOOGLE_RECAPTCHA_DOMAIN_ERROR = () =>
 export const SERVER_API_TIMEOUT_ERROR = () =>
   `Appsmith server is taking too long to respond. Please try again after some time`;
 export const DEFAULT_ERROR_MESSAGE = () => `There was an unexpected error`;
-
+export const REMOVE_FILE_TOOL_TIP = () => "Remove Upload";
 export const ERROR_FILE_TOO_LARGE = (fileSize: string) =>
   `File size should be less than ${fileSize}!`;
 export const ERROR_DATEPICKER_MIN_DATE = () =>
@@ -247,6 +247,8 @@ export const ERROR_EVAL_TRIGGER = (message: string) =>
 
 export const WIDGET_DELETE = (widgetName: string) =>
   `${widgetName} widget deleted`;
+export const WIDGET_BULK_DELETE = (widgetName: string) =>
+  `${widgetName} widgets deleted`;
 export const WIDGET_COPY = (widgetName: string) => `Copied ${widgetName}`;
 export const ERROR_WIDGET_COPY_NO_WIDGET_SELECTED = () =>
   `Please select a widget to copy`;
@@ -255,6 +257,8 @@ export const ERROR_WIDGET_COPY_NOT_ALLOWED = () =>
 export const WIDGET_CUT = (widgetName: string) => `Cut ${widgetName}`;
 export const ERROR_WIDGET_CUT_NO_WIDGET_SELECTED = () =>
   `Please select a widget to cut`;
+export const SELECT_ALL_WIDGETS_MSG = () =>
+  `All widgets in this page including modals have been selected`;
 export const ERROR_ADD_WIDGET_FROM_QUERY = () => `Failed to add widget`;
 
 export const REST_API_AUTHORIZATION_SUCCESSFUL = () =>
@@ -297,14 +301,52 @@ export const UNRESOLVE = () => "Unresolve";
 // comments
 export const ADD_COMMENT_PLACEHOLDER = () => "Add a comment. Use @ to mention";
 export const PIN_COMMENT = () => "Pin Comment";
+export const UNPIN_COMMENT = () => "Unpin Comment";
 export const COPY_LINK = () => "Copy Link";
 export const DELETE_COMMENT = () => "Delete Comment";
+export const DELETE_THREAD = () => "Delete Thread";
+export const EDIT_COMMENT = () => "Edit Comment";
 export const COMMENTS = () => "Comments";
+export const VIEW_LATEST = () => "View Latest";
+export const POST = () => "Post";
+export const CANCEL = () => "Cancel";
+export const NO_COMMENTS_CLICK_ON_CANVAS_TO_ADD = () =>
+  `No comments. \n Click anywhere on the canvas \nto start a conversation.`;
+export const LINK_COPIED_SUCCESSFULLY = () => "Link copied to clipboard";
+export const FULL_NAME = () => "Full Name";
+export const DISPLAY_NAME = () => "Display Name";
+export const EMAIL_ADDRESS = () => "Email Address";
+export const FIRST_AND_LAST_NAME = () => "First and last name";
+export const MARK_ALL_AS_READ = () => "Mark all as read";
+export const INVITE_A_NEW_USER = () => "Invite a new user";
+export const REMOVE = () => "Remove";
+export const NO_NOTIFICATIONS_TO_SHOW = () => "No notifications to show";
+export const ONE_UNREAD_MESSAGE = () => "1 unread conversation";
+
+// Showcase Carousel
+export const NEXT = () => "NEXT";
+export const BACK = () => "BACK";
 
 // Debugger
 export const CLICK_ON = () => "🙌 Click on ";
 export const PRESS = () => "🎉 Press ";
 export const OPEN_THE_DEBUGGER = () => " to open the debugger";
 export const NO_LOGS = () => "No logs to show";
+export const NO_ERRORS = () => "No signs of trouble here!";
+export const DEBUGGER_ERRORS = () => "Errors";
+export const DEBUGGER_LOGS = () => "Logs";
+export const INSPECT_ENTITY = () => "Inspect Entity";
+export const INSPECT_ENTITY_BLANK_STATE = () => "Select an entity to inspect";
+export const ACTION_CONFIGURATION_UPDATED = () => "Configuration updated";
+export const WIDGET_PROPERTIES_UPDATED = () => "Widget properties were updated";
+export const EMPTY_RESPONSE_FIRST_HALF = () => "🙌 Click on";
+export const EMPTY_RESPONSE_LAST_HALF = () => "to get a response";
 
 export const TROUBLESHOOT_ISSUE = () => "Troubleshoot issue";
+
+// Import/Export Application features
+export const IMPORT_APPLICATION_MODAL_TITLE = () => "Import Application";
+
+export const DELETE_CONFIRMATION_MODAL_TITLE = () => `Are you sure?`;
+export const DELETE_CONFIRMATION_MODAL_SUBTITLE = (name?: string | null) =>
+  `You want to remove ${name} from this organization`;
diff --git a/app/client/src/constants/routes.ts b/app/client/src/constants/routes.ts
index 9fe215b42f..04adc05e56 100644
--- a/app/client/src/constants/routes.ts
+++ b/app/client/src/constants/routes.ts
@@ -67,20 +67,45 @@ export const PAGE_LIST_EDITOR_URL = (
 export const DATA_SOURCES_EDITOR_URL = (
   applicationId = ":applicationId",
   pageId = ":pageId",
-): string => `${BUILDER_PAGE_URL(applicationId, pageId)}/datasources`;
+): string => `${BUILDER_PAGE_URL(applicationId, pageId)}/datasource`;
 
 export const DATA_SOURCES_EDITOR_ID_URL = (
   applicationId = ":applicationId",
   pageId = ":pageId",
   datasourceId = ":datasourceId",
-): string =>
-  `${DATA_SOURCES_EDITOR_URL(applicationId, pageId)}/${datasourceId}`;
+  params?: Record<string, string>,
+): string => {
+  const queryparams = convertToQueryParams(params);
+  return `${DATA_SOURCES_EDITOR_URL(
+    applicationId,
+    pageId,
+  )}/${datasourceId}${queryparams}`;
+};
 
 export const QUERIES_EDITOR_URL = (
   applicationId = ":applicationId",
   pageId = ":pageId",
 ): string => `${BUILDER_PAGE_URL(applicationId, pageId)}/queries`;
 
+export const INTEGRATION_TABS = {
+  ACTIVE: "ACTIVE",
+  NEW: "NEW",
+};
+
+export const INTEGRATION_EDITOR_MODES = {
+  AUTO: "auto",
+  MOCK: "mock",
+};
+export const INTEGRATION_EDITOR_URL = (
+  applicationId = ":applicationId",
+  pageId = ":pageId",
+  selectedTab = ":selectedTab",
+  mode = "",
+): string =>
+  `${BUILDER_PAGE_URL(applicationId, pageId)}/datasources/${selectedTab}${
+    mode ? "?mode=" + mode : ""
+  }`;
+
 export const QUERIES_EDITOR_ID_URL = (
   applicationId = ":applicationId",
   pageId = ":pageId",
@@ -175,6 +200,7 @@ export const BASE_SIGNUP_URL = `/signup`;
 export const SIGN_UP_URL = `${USER_AUTH_URL}/signup`;
 export const BASE_LOGIN_URL = `/login`;
 export const AUTH_LOGIN_URL = `${USER_AUTH_URL}/login`;
+export const SIGNUP_SUCCESS_URL = `/signup-success`;
 
 export const ORG_INVITE_USERS_PAGE_URL = `${ORG_URL}/invite`;
 export const ORG_SETTINGS_PAGE_URL = `${ORG_URL}/settings`;
@@ -183,3 +209,4 @@ export const matchApiPath = match(API_EDITOR_ID_URL());
 export const matchDatasourcePath = match(DATA_SOURCES_EDITOR_ID_URL());
 export const matchQueryPath = match(QUERIES_EDITOR_ID_URL());
 export const matchBuilderPath = match(BUILDER_URL);
+export const matchViewerPath = match(getApplicationViewerPageURL());
diff --git a/app/client/src/constants/userConstants.ts b/app/client/src/constants/userConstants.ts
index 17e69835a1..d66e873a9c 100644
--- a/app/client/src/constants/userConstants.ts
+++ b/app/client/src/constants/userConstants.ts
@@ -32,3 +32,6 @@ export const DefaultCurrentUserDetails: User = {
   gender: "MALE",
   anonymousId: "anonymousId",
 };
+
+// TODO keeping it here instead of the USER_API since it leads to cyclic deps errors during tests
+export const USER_PHOTO_URL = "v1/users/photo";
diff --git a/app/client/src/entities/AppsmithConsole/index.ts b/app/client/src/entities/AppsmithConsole/index.ts
index 4d15eb84b1..caa66bcb44 100644
--- a/app/client/src/entities/AppsmithConsole/index.ts
+++ b/app/client/src/entities/AppsmithConsole/index.ts
@@ -50,9 +50,14 @@ export interface LogActionPayload {
   // What is the log about. Is it a datasource update, widget update, eval error etc.
   logType?: LOG_TYPE;
   text: string;
-  // More contextual message
-  message?: string;
   // Time taken for the event to complete
+  messages?: Array<{
+    // More contextual message than `text`
+    message: string;
+    // The section of code being referred to
+    // codeSegment?: string;
+  }>;
+
   timeTaken?: string;
   // "where" source entity and propertyPsath.
   source?: SourceEntity;
diff --git a/app/client/src/entities/AppsmithConsole/logtype.ts b/app/client/src/entities/AppsmithConsole/logtype.ts
index 8fc202ca15..8fd1658e13 100644
--- a/app/client/src/entities/AppsmithConsole/logtype.ts
+++ b/app/client/src/entities/AppsmithConsole/logtype.ts
@@ -4,6 +4,8 @@ enum LOG_TYPE {
   ACTION_EXECUTION_ERROR,
   ACTION_EXECUTION_SUCCESS,
   ENTITY_DELETED,
+  EVAL_ERROR,
+  ACTION_UPDATE,
 }
 
 export default LOG_TYPE;
diff --git a/app/client/src/entities/Comments/CommentsInterfaces.ts b/app/client/src/entities/Comments/CommentsInterfaces.ts
index 2bcf6169eb..3b1e2445eb 100644
--- a/app/client/src/entities/Comments/CommentsInterfaces.ts
+++ b/app/client/src/entities/Comments/CommentsInterfaces.ts
@@ -1,5 +1,6 @@
 import { COMMENT_EVENTS } from "constants/CommentConstants";
 import { RawDraftContentState } from "draft-js";
+import { APP_MODE } from "reducers/entityReducers/appReducer";
 
 // export enum CommentThreadParentTypes {
 //   widget = "widget",
@@ -15,29 +16,57 @@ import { RawDraftContentState } from "draft-js";
 
 export type CreateCommentRequest = {
   body: RawDraftContentState;
+  mode?: APP_MODE;
 };
 
 export type CreateCommentThreadRequest = {
   applicationId: string;
+  pageId: string;
   refId: string; // could be an id to refer any parent based on parent type
   tabId?: string;
   position: { top: number; left: number }; // used as a percentage value
   comments: Array<CreateCommentRequest>;
-  resolved?: boolean;
-  isPinned?: boolean;
+  resolvedState?: {
+    active: boolean;
+  };
+  pinnedState?: {
+    active: boolean;
+    authorName?: string;
+    authorUsername?: string;
+    updationTime?: {
+      epochSecond: number;
+      nano: number;
+    };
+  };
+  isViewed?: boolean;
+  mode?: APP_MODE;
+};
+
+export type Reaction = {
+  byName: string;
+  byUsername: string;
+  createdAt: string;
+  emoji: string;
 };
 
 export type Comment = CreateCommentRequest & {
   id: string;
   authorName?: string;
-};
+  authorUsername?: string;
+  updationTime?: string;
+  creationTime?: string;
+  reactions?: Array<Reaction>;
+  threadId?: string;
+} & { _id: string };
 
 export type CommentThread = Omit<CreateCommentThreadRequest, "comments"> & {
   id: string;
   comments: Array<Comment>;
-  isVisible?: boolean;
   userPermissions?: string[];
   new?: boolean;
+  sequenceId?: string;
+  updationTime?: string;
+  creationTime?: string;
 };
 
 export type CommentEventPayload = {
diff --git a/app/client/src/entities/DataTree/dataTreeAction.ts b/app/client/src/entities/DataTree/dataTreeAction.ts
index e10f9ba481..d108491405 100644
--- a/app/client/src/entities/DataTree/dataTreeAction.ts
+++ b/app/client/src/entities/DataTree/dataTreeAction.ts
@@ -36,9 +36,15 @@ export const generateDataTreeAction = (
     config: action.config.actionConfiguration,
     dynamicBindingPathList,
     data: action.data ? action.data.body : {},
+    responseMeta: {
+      statusCode: action.data?.statusCode,
+      isExecutionSuccess: action.data?.isExecutionSuccess || false,
+      headers: action.data?.headers,
+    },
     ENTITY_TYPE: ENTITY_TYPE.ACTION,
     isLoading: action.isLoading,
     bindingPaths: getBindingPathsOfAction(action.config, editorConfig),
     dependencyMap,
+    logBlackList: {},
   };
 };
diff --git a/app/client/src/entities/DataTree/dataTreeFactory.ts b/app/client/src/entities/DataTree/dataTreeFactory.ts
index eb071d4bca..1d43bf8ec9 100644
--- a/app/client/src/entities/DataTree/dataTreeFactory.ts
+++ b/app/client/src/entities/DataTree/dataTreeFactory.ts
@@ -1,6 +1,6 @@
 import {
-  ActionData,
   ActionDataState,
+  ActionDataWithMeta,
 } from "reducers/entityReducers/actionsReducer";
 import { WidgetProps } from "widgets/BaseWidget";
 import { ActionResponse } from "api/ActionAPI";
@@ -42,7 +42,8 @@ export enum EvaluationSubstitutionType {
   SMART_SUBSTITUTE = "SMART_SUBSTITUTE",
 }
 
-export interface DataTreeAction extends Omit<ActionData, "data" | "config"> {
+export interface DataTreeAction
+  extends Omit<ActionDataWithMeta, "data" | "config"> {
   data: ActionResponse["body"];
   actionId: string;
   config: Partial<ActionConfig>;
@@ -55,6 +56,7 @@ export interface DataTreeAction extends Omit<ActionData, "data" | "config"> {
   bindingPaths: Record<string, EvaluationSubstitutionType>;
   ENTITY_TYPE: ENTITY_TYPE.ACTION;
   dependencyMap: DependencyMap;
+  logBlackList: Record<string, true>;
 }
 
 export interface DataTreeWidget extends WidgetProps {
@@ -62,6 +64,7 @@ export interface DataTreeWidget extends WidgetProps {
   triggerPaths: Record<string, boolean>;
   validationPaths: Record<string, VALIDATION_TYPES>;
   ENTITY_TYPE: ENTITY_TYPE.WIDGET;
+  logBlackList: Record<string, true>;
 }
 
 export interface DataTreeAppsmith extends Omit<AppDataState, "store"> {
@@ -96,12 +99,12 @@ type DataTreeSeed = {
 export class DataTreeFactory {
   static create({
     actions,
-    widgets,
-    widgetsMeta,
-    pageList,
     appData,
     editorConfigs,
+    pageList,
     pluginDependencyConfig,
+    widgets,
+    widgetsMeta,
   }: DataTreeSeed): DataTree {
     const dataTree: DataTree = {};
     actions.forEach((action) => {
diff --git a/app/client/src/entities/DataTree/dataTreeWidget.test.ts b/app/client/src/entities/DataTree/dataTreeWidget.test.ts
index 5ee2df1219..7ca9661ece 100644
--- a/app/client/src/entities/DataTree/dataTreeWidget.test.ts
+++ b/app/client/src/entities/DataTree/dataTreeWidget.test.ts
@@ -221,6 +221,10 @@ describe("generateDataTreeWidget", () => {
           key: "value",
         },
       ],
+      logBlackList: {
+        isValid: true,
+        value: true,
+      },
       value: "{{Input1.text}}",
       isDirty: true,
       isFocused: false,
@@ -240,6 +244,10 @@ describe("generateDataTreeWidget", () => {
       widgetName: "Input1",
       ENTITY_TYPE: ENTITY_TYPE.WIDGET,
       defaultText: "Testing",
+      defaultMetaProps: ["text", "isDirty", "isFocused"],
+      defaultProps: {
+        text: "defaultText",
+      },
     };
 
     const result = generateDataTreeWidget(widget, widgetMetaProps);
diff --git a/app/client/src/entities/DataTree/dataTreeWidget.ts b/app/client/src/entities/DataTree/dataTreeWidget.ts
index fa77cfa3fb..2243f642bf 100644
--- a/app/client/src/entities/DataTree/dataTreeWidget.ts
+++ b/app/client/src/entities/DataTree/dataTreeWidget.ts
@@ -12,10 +12,12 @@ export const generateDataTreeWidget = (
   const defaultMetaProps = WidgetFactory.getWidgetMetaPropertiesMap(
     widget.type,
   );
+
   const derivedPropertyMap = WidgetFactory.getWidgetDerivedPropertiesMap(
     widget.type,
   );
   const defaultProps = WidgetFactory.getWidgetDefaultPropertiesMap(widget.type);
+
   const propertyPaneConfigs = WidgetFactory.getWidgetPropertyPaneConfig(
     widget.type,
   );
@@ -45,6 +47,10 @@ export const generateDataTreeWidget = (
       unInitializedDefaultProps[propertyName] = undefined;
     }
   });
+  const blockedDerivedProps: Record<string, true> = {};
+  Object.keys(derivedProps).forEach((propertyName) => {
+    blockedDerivedProps[propertyName] = true;
+  });
   const {
     bindingPaths,
     triggerPaths,
@@ -61,7 +67,13 @@ export const generateDataTreeWidget = (
     ...widgetMetaProps,
     ...derivedProps,
     ...unInitializedDefaultProps,
+    defaultProps,
+    defaultMetaProps: Object.keys(defaultMetaProps),
     dynamicBindingPathList,
+    logBlackList: {
+      ...widget.logBlackList,
+      ...blockedDerivedProps,
+    },
     bindingPaths,
     triggerPaths,
     validationPaths,
diff --git a/app/client/src/entities/Datasource/RestAPIForm.ts b/app/client/src/entities/Datasource/RestAPIForm.ts
index ea4f0239e9..c12e1ae2d9 100644
--- a/app/client/src/entities/Datasource/RestAPIForm.ts
+++ b/app/client/src/entities/Datasource/RestAPIForm.ts
@@ -3,6 +3,14 @@ import { Property } from "entities/Action";
 export enum AuthType {
   NONE = "NONE",
   OAuth2 = "oAuth2",
+  basic = "basic",
+  apiKey = "apiKey",
+  bearerToken = "bearerToken",
+}
+
+export enum ApiKeyAuthType {
+  QueryParams = "queryParams",
+  Header = "header",
 }
 
 export enum GrantType {
@@ -10,7 +18,13 @@ export enum GrantType {
   AuthorizationCode = "authorization_code",
 }
 
-export type Authentication = ClientCredentials | AuthorizationCode;
+export type Authentication =
+  | ClientCredentials
+  | AuthorizationCode
+  | Basic
+  | ApiKey
+  | BearerToken;
+
 export interface ApiDatasourceForm {
   datasourceId: string;
   pluginId: string;
@@ -32,6 +46,8 @@ export interface Oauth2Common {
   headerPrefix: string;
   scopeString: string;
   isTokenHeader: boolean;
+  audience: string;
+  resource: string;
 }
 
 export interface ClientCredentials extends Oauth2Common {
@@ -45,3 +61,21 @@ export interface AuthorizationCode extends Oauth2Common {
   isAuthorizationHeader: boolean;
   isAuthorized: boolean;
 }
+
+export interface Basic {
+  authenticationType: AuthType.basic;
+  username: string;
+  password: string;
+}
+
+export interface ApiKey {
+  authenticationType: AuthType.apiKey;
+  label: string;
+  value: string;
+  addTo: string;
+}
+
+export interface BearerToken {
+  authenticationType: AuthType.bearerToken;
+  bearerToken: string;
+}
diff --git a/app/client/src/entities/Datasource/index.ts b/app/client/src/entities/Datasource/index.ts
index 68f96c4c22..4088d90691 100644
--- a/app/client/src/entities/Datasource/index.ts
+++ b/app/client/src/entities/Datasource/index.ts
@@ -5,6 +5,10 @@ export interface DatasourceAuthentication {
   authType?: string;
   username?: string;
   password?: string;
+  label?: string;
+  value?: string;
+  addTo?: string;
+  bearerToken?: string;
 }
 
 export interface DatasourceColumns {
@@ -25,6 +29,7 @@ export interface DatasourceStructure {
 export interface QueryTemplate {
   title: string;
   body: string;
+  pluginSpecifiedTemplates?: Array<{ key?: string; value?: unknown }>;
 }
 export interface DatasourceTable {
   type: string;
@@ -74,6 +79,14 @@ export interface Datasource extends BaseDatasource {
   messages?: string[];
 }
 
+export interface MockDatasource {
+  name: string;
+  description: string;
+  packageName: string;
+  pluginType: string;
+  pluginName?: string;
+}
+
 export const DEFAULT_DATASOURCE = (
   pluginId: string,
   organizationId: string,
diff --git a/app/client/src/entities/Notification.ts b/app/client/src/entities/Notification.ts
new file mode 100644
index 0000000000..8e021b66c4
--- /dev/null
+++ b/app/client/src/entities/Notification.ts
@@ -0,0 +1,12 @@
+export type AppsmithNotification = {
+  id: string;
+  _id?: string;
+  type: string;
+  new: boolean;
+  [key: string]: any;
+};
+
+export enum NotificationTypes {
+  CommentNotification = "CommentNotification",
+  CommentThreadNotification = "CommentThreadNotification",
+}
diff --git a/app/client/src/entities/Tour/index.ts b/app/client/src/entities/Tour/index.ts
new file mode 100644
index 0000000000..7eabc977b4
--- /dev/null
+++ b/app/client/src/entities/Tour/index.ts
@@ -0,0 +1,3 @@
+export enum TourType {
+  COMMENTS_TOUR = "COMMENTS_TOUR",
+}
diff --git a/app/client/src/entities/Widget/utils.test.ts b/app/client/src/entities/Widget/utils.test.ts
index 99285b6d9d..95facdac31 100644
--- a/app/client/src/entities/Widget/utils.test.ts
+++ b/app/client/src/entities/Widget/utils.test.ts
@@ -115,7 +115,7 @@ describe("getAllPathsFromPropertyConfig", () => {
       bindingPaths: {
         selectedRow: EvaluationSubstitutionType.TEMPLATE,
         selectedRows: EvaluationSubstitutionType.TEMPLATE,
-        tableData: EvaluationSubstitutionType.TEMPLATE,
+        tableData: EvaluationSubstitutionType.SMART_SUBSTITUTE,
         defaultSearchText: EvaluationSubstitutionType.TEMPLATE,
         defaultSelectedRow: EvaluationSubstitutionType.TEMPLATE,
         isVisible: EvaluationSubstitutionType.TEMPLATE,
@@ -217,7 +217,7 @@ describe("getAllPathsFromPropertyConfig", () => {
         chartType: EvaluationSubstitutionType.TEMPLATE,
         chartName: EvaluationSubstitutionType.TEMPLATE,
         "chartData.random-id.seriesName": EvaluationSubstitutionType.TEMPLATE,
-        "chartData.random-id.data": EvaluationSubstitutionType.TEMPLATE,
+        "chartData.random-id.data": EvaluationSubstitutionType.SMART_SUBSTITUTE,
         xAxisName: EvaluationSubstitutionType.TEMPLATE,
         yAxisName: EvaluationSubstitutionType.TEMPLATE,
         isVisible: EvaluationSubstitutionType.TEMPLATE,
diff --git a/app/client/src/entities/Widget/utils.ts b/app/client/src/entities/Widget/utils.ts
index b7965cd813..e243f5685a 100644
--- a/app/client/src/entities/Widget/utils.ts
+++ b/app/client/src/entities/Widget/utils.ts
@@ -36,6 +36,7 @@ export const getAllPathsFromPropertyConfig = (
             !controlConfig.isTriggerProperty
           ) {
             bindingPaths[controlConfig.propertyName] =
+              controlConfig.evaluationSubstitutionType ||
               EvaluationSubstitutionType.TEMPLATE;
             if (controlConfig.validation) {
               validationPaths[controlConfig.propertyName] =
@@ -80,6 +81,7 @@ export const getAllPathsFromPropertyConfig = (
                               !panelColumnControlConfig.isTriggerProperty
                             ) {
                               bindingPaths[panelPropertyPath] =
+                                controlConfig.evaluationSubstitutionType ||
                                 EvaluationSubstitutionType.TEMPLATE;
                               if (panelColumnControlConfig.validation) {
                                 validationPaths[panelPropertyPath] =
@@ -119,6 +121,7 @@ export const getAllPathsFromPropertyConfig = (
                   !childPropertyConfig.isTriggerProperty
                 ) {
                   bindingPaths[childArrayPropertyPath] =
+                    childPropertyConfig.evaluationSubstitutionType ||
                     EvaluationSubstitutionType.TEMPLATE;
                   if (childPropertyConfig.validation) {
                     validationPaths[childArrayPropertyPath] =
diff --git a/app/client/src/globalStyles/CodmirrorHintStyles.ts b/app/client/src/globalStyles/CodmirrorHintStyles.ts
new file mode 100644
index 0000000000..7db244f95f
--- /dev/null
+++ b/app/client/src/globalStyles/CodmirrorHintStyles.ts
@@ -0,0 +1,242 @@
+import { createGlobalStyle } from "styled-components";
+import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+import { getTypographyByKey, Theme } from "constants/DefaultTheme";
+
+export const CodemirrorHintStyles = createGlobalStyle<{
+  editorTheme: EditorTheme;
+  theme: Theme;
+}>`
+  .CodeMirror-hints {
+    position: absolute;
+    z-index: 20;
+    overflow: hidden;
+    list-style: none;
+    margin-top: ${(props) => props.theme.spaces[3]}px;
+    padding: 0px 0px;
+    font-size: 90%;
+    font-family: monospace;
+    max-height: 20em;
+    overflow-y: auto;
+    background: ${(props) =>
+      props.editorTheme === EditorTheme.LIGHT ? "#FAFAFA" : "#262626"};
+    box-shadow: 0px 12px 28px -6px rgba(0, 0, 0, 0.32);
+    border-radius: 0px;
+  }
+
+  .CodeMirror-hint {
+    height: 24px;
+    color: ${(props) =>
+      props.editorTheme === EditorTheme.LIGHT ? "#090707" : "#FFFFFF"};
+    cursor: pointer;
+    display: flex;
+    min-width: 220px;
+    width: auto;
+    align-items: center;
+    font-size: 12px;
+    line-height: 15px;
+    letter-spacing: -0.24px;
+    &:hover {
+      background: ${(props) =>
+        props.editorTheme === EditorTheme.LIGHT ? "#6A86CE" : "#157A96"};
+      border-radius: 0px;
+      color: #fff;
+      &:after {
+        color: #fff;
+      }
+    }
+  }
+
+  .CodeMirror-command-header {
+    padding: 0 ${(props) => props.theme.spaces[3]}px;
+    color: #716e6e;
+    pointer-events: none !important;
+    font-family: ${(props) => props.theme.fonts.text};
+    ${(props) => getTypographyByKey(props, "p3")}
+    font-weight: 600;
+  }
+
+  .CodeMirror-commands {
+    color: #4b4848;
+    position: relative;
+    padding: 0 ${(props) => props.theme.spaces[3]}px !important;
+    height: 25px;
+    font-family: ${(props) => props.theme.fonts.text};
+    ${(props) => getTypographyByKey(props, "p3")}
+    &:hover, &.CodeMirror-hint-active {
+      svg {
+        path {
+          fill: #ffffff;
+        }
+      }
+      .shortcut {
+        color: #ffffff;
+      }
+    }
+    .command-container {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      flex: 1;
+    }
+    .command {
+      display: flex;
+      align-items: center;
+      img {
+        height: 12px;
+        width: 12px;
+        margin-right: 7px;
+      }
+      svg {
+        height: 12px;
+        width: 12px;
+        margin-right: 7px;
+      }
+    }
+    .shortcut {
+      font-style: italic;
+      font-size: 10px;
+      color: #a9a7a7;
+      margin-left: auto;
+    }
+  }
+
+  .CodeMirror-hint-header {
+    padding-left: 8px;
+    color: #4B4848;
+    pointer-events: none !important;
+    font-weight: 600;
+  }
+
+  .datasource-hint {
+    padding: 10px 20px 10px 10px !important;
+    display: block;
+    width: 500px;
+    height: 32px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    background: #FAFAFA;
+    color: black;
+    &.custom {
+      height: unset;
+      background: #ebebeb;
+      width: 600px;
+      &:hover{
+        background: #ffffff;
+        color: black;
+      }
+      &.CodeMirror-hint-active {
+        background: #ffffff;
+      }
+    }
+
+    &.invalid {
+      color: ${(props) => props.theme.colors.errorMessage};
+    }
+  }
+  .CodeMirror-Tern-completion {
+    display: flex;
+    padding-left: ${(props) => props.theme.spaces[11]}px !important;
+    &:hover{
+      background: ${(props) =>
+        props.editorTheme === EditorTheme.LIGHT ? "#6A86CE" : "#157A96"};
+    }
+  }
+  .CodeMirror-Tern-completion:before {
+    left: 7px;
+    bottom: 6px;
+    height: 12px;
+    width: 12px;
+    border-radius: 0;
+    font-size: 10px;
+    line-height: 12px;
+    font-weight: normal;
+    text-align: center;
+    color: ${(props) => props.theme.colors.codeMirror.dataType.shortForm};
+    margin-right: ${(props) => props.theme.spaces[13]}px;
+  }
+  .CodeMirror-Tern-completion-fn:before {
+    background: ${(props) => props.theme.colors.dataTypeBg.function};
+  }
+  .CodeMirror-Tern-completion-object:before {
+    background: ${(props) => props.theme.colors.dataTypeBg.object};
+  }
+  .CodeMirror-Tern-completion-unknown:before {
+    background: ${(props) => props.theme.colors.dataTypeBg.unknown};
+  }
+  .CodeMirror-Tern-completion-array:before {
+    background: ${(props) => props.theme.colors.dataTypeBg.array};
+  }
+  .CodeMirror-Tern-completion-number:before, .CodeMirror-Tern-completion-string:before, .CodeMirror-Tern-completion-bool:before {
+    background: ${(props) => props.theme.colors.dataTypeBg.number};
+  }
+  .CodeMirror-Tern-completion:after {
+    display: flex;
+    justify-content: flex-end;
+    flex: 1;
+    padding-right: 10px;
+    font-style: italic;
+    font-weight: normal;
+    font-size: 10px;
+    line-height: 13px;
+    letter-spacing: -0.24px;
+    padding-left: 10px;
+    color: ${(props) => props.theme.colors.codeMirror.dataType.fullForm};
+  }
+  .CodeMirror-Tern-completion-fn:after {
+    content: "Function";
+  }
+  .CodeMirror-Tern-completion-object:after {
+    content: "Object";
+  }
+  .CodeMirror-Tern-completion-unknown:after {
+    content: "Unknown";
+  }
+  .CodeMirror-Tern-completion-array:after {
+    content: "Array";
+  }
+  .CodeMirror-Tern-completion-number:after {
+    content: "Number";
+  }
+  .CodeMirror-Tern-completion-string:after {
+    content: "String";
+  }
+  .CodeMirror-Tern-completion-bool:after {
+    content: "Boolean";
+  }
+  .CodeMirror-Tern-tooltip {
+    z-index: 20 !important;
+  }
+  li.CodeMirror-hint-active {
+    background: #6A86CE;
+    border-radius: 0px;
+    color: #fff;
+    &:after {
+      color: #fff;
+    }
+  }
+  .CodeMirror-Tern-hint-doc {
+    display: none;
+    &.visible {
+      display: block;
+      background-color: ${(props) =>
+        props.editorTheme === EditorTheme.DARK ? "#23292e" : "#fff"} !important;
+      color: ${(props) =>
+        props.editorTheme === EditorTheme.DARK
+          ? "#F4F4F4"
+          : "#1E242B"} !important;
+      max-height: 150px;
+      width: 250px;
+      font-size: 12px;
+      padding: 5px !important;
+      border: 1px solid !important;
+      border-color: ${(props) =>
+        props.editorTheme === EditorTheme.DARK
+          ? "#23292e"
+          : "#DEDEDE"} !important;
+      box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.12) !important;
+      overflow: scroll;
+    }
+
+  }
+`;
diff --git a/app/client/src/globalStyles/commentThreadPopovers.ts b/app/client/src/globalStyles/commentThreadPopovers.ts
index ee022b6c34..135ff0c346 100644
--- a/app/client/src/globalStyles/commentThreadPopovers.ts
+++ b/app/client/src/globalStyles/commentThreadPopovers.ts
@@ -1,12 +1,17 @@
-import { Classes } from "@blueprintjs/core";
 import { createGlobalStyle } from "styled-components";
+import { Layers } from "constants/Layers";
 
 export const CommentThreadPopoverStyles = createGlobalStyle`
-  .comment-thread .${Classes.POPOVER_CONTENT} {
-    border-radius: 0px;
+  .bp3-portal.comment-context-menu {
+    z-index: ${Layers.max};
   }
 
-  .comment-context-menu {
-    z-index: 13;
+  .bp3-portal.emoji-picker-portal {
+    z-index: ${Layers.max};
+  }
+
+  .inline-comment-thread {
+    /* unable to reference headerHeight here */
+    margin-top: 35px;
   }
 `;
diff --git a/app/client/src/globalStyles/index.tsx b/app/client/src/globalStyles/index.tsx
index 064c3d5769..a2d00289af 100644
--- a/app/client/src/globalStyles/index.tsx
+++ b/app/client/src/globalStyles/index.tsx
@@ -2,6 +2,10 @@ import React from "react";
 import { TooltipStyles } from "./tooltip";
 import { PopoverStyles } from "./popover";
 import { CommentThreadPopoverStyles } from "./commentThreadPopovers";
+import { UppyStyles } from "./uppy";
+import { PortalStyles } from "./portals";
+import { CodemirrorHintStyles } from "./CodmirrorHintStyles";
+import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 
 export default function GlobalStyles() {
   return (
@@ -9,6 +13,9 @@ export default function GlobalStyles() {
       <TooltipStyles />
       <PopoverStyles />
       <CommentThreadPopoverStyles />
+      <PortalStyles />
+      <UppyStyles />
+      <CodemirrorHintStyles editorTheme={EditorTheme.LIGHT} />
     </>
   );
 }
diff --git a/app/client/src/globalStyles/popover.ts b/app/client/src/globalStyles/popover.ts
index 82cb292a1d..25adc755e8 100644
--- a/app/client/src/globalStyles/popover.ts
+++ b/app/client/src/globalStyles/popover.ts
@@ -1,8 +1,28 @@
 import { createGlobalStyle } from "styled-components";
 import { Classes } from "@blueprintjs/core";
+import { Classes as PopoverClasses } from "@blueprintjs/popover2";
+import { Layers } from "constants/Layers";
 
 export const PopoverStyles = createGlobalStyle`
-  .${Classes.POPOVER} {
+  .${Classes.POPOVER}, .${PopoverClasses.POPOVER2} {
     box-shadow: 0px 0px 2px rgb(0 0 0 / 20%), 0px 2px 10px rgb(0 0 0 / 10%);
   }
+  .${Classes.POPOVER},
+  .${PopoverClasses.POPOVER2},
+  .${PopoverClasses.POPOVER2} .${PopoverClasses.POPOVER2_CONTENT},
+  .${Classes.POPOVER} .${Classes.POPOVER_CONTENT} {
+    border-radius: 0px;
+  }
+  .bp3-datepicker {
+    .DayPicker {
+      min-height: 251px !important ;
+      min-width: 233px !important ;
+    }
+  }
+  .comments-onboarding-carousel .${Classes.OVERLAY_CONTENT} {
+    filter: drop-shadow(0px 6px 20px rgba(0, 0, 0, 0.15));
+  }
+  .bp3-modal-widget.comments-onboarding-carousel-portal {
+    z-index: ${Layers.help} !important; 
+  }
 `;
diff --git a/app/client/src/globalStyles/portals.ts b/app/client/src/globalStyles/portals.ts
new file mode 100644
index 0000000000..9200588eac
--- /dev/null
+++ b/app/client/src/globalStyles/portals.ts
@@ -0,0 +1,25 @@
+import { createGlobalStyle } from "styled-components";
+import { Layers } from "constants/Layers";
+import { Classes } from "@blueprintjs/core";
+
+export const PortalStyles = createGlobalStyle`
+  #header-root {
+    position: relative;
+    z-index: ${Layers.header};
+  }
+  
+  #tooltip-root {
+    position: absolute;
+    top: 0;
+    width: 100vw;
+    z-index: ${Layers.max};
+  }
+
+  .bp3-portal {
+    z-index: ${Layers.portals};
+  }
+
+  .file-picker-dialog.bp3-dialog .${Classes.DIALOG_BODY} {
+    padding: 0;
+  }
+`;
diff --git a/app/client/src/globalStyles/uppy.ts b/app/client/src/globalStyles/uppy.ts
new file mode 100644
index 0000000000..86b57d3d0f
--- /dev/null
+++ b/app/client/src/globalStyles/uppy.ts
@@ -0,0 +1,11 @@
+import { createGlobalStyle } from "styled-components";
+
+export const UppyStyles = createGlobalStyle`
+  .uppy-Root .uppy-ImageCropper .uppy-u-reset.uppy-c-btn:first-child  {
+    width: 100px;
+  }
+
+  a.uppy-Dashboard-poweredBy {
+    display: none;
+  }
+`;
diff --git a/app/client/src/icons/ControlIcons.tsx b/app/client/src/icons/ControlIcons.tsx
index a9a6f6365c..5ee0a40397 100644
--- a/app/client/src/icons/ControlIcons.tsx
+++ b/app/client/src/icons/ControlIcons.tsx
@@ -33,12 +33,18 @@ import { ReactComponent as VerticalAlignBottom } from "assets/icons/control/vert
 import { ReactComponent as VerticalAlignCenter } from "assets/icons/control/vertical_align_center.svg";
 import { ReactComponent as VerticalAlignTop } from "assets/icons/control/vertical_align_top.svg";
 import { ReactComponent as CopyIcon } from "assets/icons/control/copy.svg";
+import { ReactComponent as Copy2Icon } from "assets/icons/control/copy2.svg";
+import { ReactComponent as CutIcon } from "assets/icons/control/cut.svg";
+import { ReactComponent as GroupIcon } from "assets/icons/control/group.svg";
 import { ReactComponent as HeadingOneIcon } from "assets/icons/control/heading_1.svg";
 import { ReactComponent as HeadingTwoIcon } from "assets/icons/control/heading_2.svg";
 import { ReactComponent as HeadingThreeIcon } from "assets/icons/control/heading_3.svg";
 import { ReactComponent as ParagraphIcon } from "assets/icons/control/paragraph.svg";
 import { ReactComponent as ParagraphTwoIcon } from "assets/icons/control/paragraph_2.svg";
 import { ReactComponent as BulletsIcon } from "assets/icons/control/bullets.svg";
+import { ReactComponent as DividerCapRightIcon } from "assets/icons/control/divider_cap_right.svg";
+import { ReactComponent as DividerCapLeftIcon } from "assets/icons/control/divider_cap_left.svg";
+import { ReactComponent as DividerCapAllIcon } from "assets/icons/control/divider_cap_all.svg";
 import PlayIcon from "assets/icons/control/play-icon.png";
 
 /* eslint-disable react/display-name */
@@ -220,6 +226,21 @@ export const ControlIcons: {
       <CopyIcon />
     </IconWrapper>
   ),
+  COPY2_CONTROL: (props: IconProps) => (
+    <IconWrapper {...props}>
+      <Copy2Icon />
+    </IconWrapper>
+  ),
+  CUT_CONTROL: (props: IconProps) => (
+    <IconWrapper {...props}>
+      <CutIcon />
+    </IconWrapper>
+  ),
+  GROUP_CONTROL: (props: IconProps) => (
+    <IconWrapper {...props}>
+      <GroupIcon />
+    </IconWrapper>
+  ),
   HEADING_ONE: (props: IconProps) => (
     <IconWrapper {...props}>
       <HeadingOneIcon />
@@ -250,6 +271,21 @@ export const ControlIcons: {
       <BulletsIcon />
     </IconWrapper>
   ),
+  DIVIDER_CAP_RIGHT: (props: IconProps) => (
+    <IconWrapper {...props}>
+      <DividerCapRightIcon />
+    </IconWrapper>
+  ),
+  DIVIDER_CAP_LEFT: (props: IconProps) => (
+    <IconWrapper {...props}>
+      <DividerCapLeftIcon />
+    </IconWrapper>
+  ),
+  DIVIDER_CAP_ALL: (props: IconProps) => (
+    <IconWrapper {...props}>
+      <DividerCapAllIcon />
+    </IconWrapper>
+  ),
 };
 
 export type ControlIconName = keyof typeof ControlIcons;
diff --git a/app/client/src/icons/WidgetIcons.tsx b/app/client/src/icons/WidgetIcons.tsx
index 259c6588b5..f389042028 100644
--- a/app/client/src/icons/WidgetIcons.tsx
+++ b/app/client/src/icons/WidgetIcons.tsx
@@ -22,6 +22,9 @@ import { ReactComponent as FormIcon } from "assets/icons/widget/form.svg";
 import { ReactComponent as MapIcon } from "assets/icons/widget/map.svg";
 import { ReactComponent as ModalIcon } from "assets/icons/widget/modal.svg";
 import { ReactComponent as ListIcon } from "assets/icons/widget/list.svg";
+import { ReactComponent as RatingIcon } from "assets/icons/widget/rating.svg";
+import { ReactComponent as EmbedIcon } from "assets/icons/widget/embed.svg";
+import { ReactComponent as DividerIcon } from "assets/icons/widget/divider.svg";
 /* eslint-disable react/display-name */
 
 export const WidgetIcons: {
@@ -142,6 +145,21 @@ export const WidgetIcons: {
       <ListIcon />
     </IconWrapper>
   ),
+  RATE_WIDGET: (props: IconProps) => (
+    <IconWrapper {...props}>
+      <RatingIcon />
+    </IconWrapper>
+  ),
+  IFRAME_WIDGET: (props: IconProps) => (
+    <IconWrapper {...props}>
+      <EmbedIcon />
+    </IconWrapper>
+  ),
+  DIVIDER_WIDGET: (props: IconProps) => (
+    <IconWrapper {...props}>
+      <DividerIcon />
+    </IconWrapper>
+  ),
 };
 
 export type WidgetIcon = typeof WidgetIcons[keyof typeof WidgetIcons];
diff --git a/app/client/src/index.css b/app/client/src/index.css
index 2ce8e9f6b7..84097e0241 100755
--- a/app/client/src/index.css
+++ b/app/client/src/index.css
@@ -54,15 +54,6 @@ div.bp3-popover-arrow {
   background: rgb(3, 179, 101) !important;
 }
 
-#header-root {
-  position: relative;
-  z-index: 11;
-}
-
-.bp3-portal {
-  z-index: 10;
-}
-
 .bp3-popover .bp3-input {
   outline: 0;
   box-shadow: none;
@@ -102,3 +93,12 @@ div.bp3-popover-arrow {
   background: white !important;
   border-bottom: 1px solid #E7E7E7 !important;
 }
+/* making both the Modal layer and the Dropdown layer */
+.bp3-modal-widget, .appsmith_widget_0 > .bp3-portal {
+  z-index: 2 !important;
+}
+
+/* Portals on the Modal widget */
+.bp3-modal-widget .bp3-portal {
+  z-index: 21 !important;
+}
diff --git a/app/client/src/mockResponses/WidgetConfigResponse.test.tsx b/app/client/src/mockResponses/WidgetConfigResponse.test.tsx
deleted file mode 100644
index d8bcf161a6..0000000000
--- a/app/client/src/mockResponses/WidgetConfigResponse.test.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import WIDGET_CONFIG_RESPONSE from "./WidgetConfigResponse";
-
-describe("WidgetConfigResponse", () => {
-  it("it tests autocomplete child enhancements", () => {
-    const mockProps = {
-      childAutoComplete: "child-autocomplet",
-    };
-
-    expect(
-      WIDGET_CONFIG_RESPONSE.config.LIST_WIDGET.enhancements.child.autocomplete(
-        mockProps,
-      ),
-    ).toBe(mockProps.childAutoComplete);
-  });
-
-  it("it tests hideEvaluatedValue child enhancements", () => {
-    expect(
-      WIDGET_CONFIG_RESPONSE.config.LIST_WIDGET.enhancements.child.hideEvaluatedValue(),
-    ).toBe(true);
-  });
-
-  it("it tests propertyUpdateHook child enhancements with undefined parent widget", () => {
-    const mockParentWidget = {
-      widgetId: undefined,
-    };
-
-    const result = WIDGET_CONFIG_RESPONSE.config.LIST_WIDGET.enhancements.child.propertyUpdateHook(
-      mockParentWidget,
-      "child-widget-name",
-      "text",
-      "value",
-      false,
-    );
-
-    expect(result).toStrictEqual([]);
-  });
-
-  it("it tests propertyUpdateHook child enhancements with undefined parent widget", () => {
-    const mockParentWidget = {
-      widgetId: undefined,
-    };
-
-    const result = WIDGET_CONFIG_RESPONSE.config.LIST_WIDGET.enhancements.child.propertyUpdateHook(
-      mockParentWidget,
-      "child-widget-name",
-      "text",
-      "value",
-      false,
-    );
-
-    expect(result).toStrictEqual([]);
-  });
-
-  it("it tests propertyUpdateHook child enhancements with defined parent widget", () => {
-    const mockParentWidget = {
-      widgetId: "parent-widget-id",
-      widgetName: "parent-widget-name",
-    };
-
-    const result = WIDGET_CONFIG_RESPONSE.config.LIST_WIDGET.enhancements.child.propertyUpdateHook(
-      mockParentWidget,
-      "child-widget-name",
-      "text",
-      "value",
-      false,
-    );
-
-    expect(result).toStrictEqual([
-      {
-        widgetId: "parent-widget-id",
-        propertyPath: "template.child-widget-name.text",
-        propertyValue: "{{parent-widget-name.items.map((currentItem) => )}}",
-        isDynamicTrigger: false,
-      },
-    ]);
-  });
-});
diff --git a/app/client/src/mockResponses/WidgetConfigResponse.tsx b/app/client/src/mockResponses/WidgetConfigResponse.tsx
index 97d38fd38b..e4e1105ebc 100644
--- a/app/client/src/mockResponses/WidgetConfigResponse.tsx
+++ b/app/client/src/mockResponses/WidgetConfigResponse.tsx
@@ -1,7 +1,7 @@
 import { WidgetConfigReducerState } from "reducers/entityReducers/widgetConfigReducer";
 import { WidgetProps } from "widgets/BaseWidget";
 import moment from "moment-timezone";
-import { cloneDeep, get, indexOf, isString } from "lodash";
+import { cloneDeep, get, indexOf, isString, set } from "lodash";
 import { generateReactKey } from "utils/generators";
 import { WidgetTypes } from "constants/WidgetConstants";
 import { BlueprintOperationTypes } from "sagas/WidgetBlueprintSagasEnums";
@@ -9,6 +9,10 @@ import { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReduc
 import { getDynamicBindings } from "utils/DynamicBindingUtils";
 import { Colors } from "constants/Colors";
 import FileDataTypes from "widgets/FileDataTypes";
+/*
+ ********************************{Grid Density Migration}*********************************
+ */
+export const GRID_DENSITY_MIGRATION_V1 = 4;
 
 /**
  * this config sets the default values of properties being used in the widget
@@ -18,12 +22,13 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
     BUTTON_WIDGET: {
       text: "Submit",
       buttonStyle: "PRIMARY_BUTTON",
-      rows: 1,
-      columns: 2,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+      columns: 2 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "Button",
       isDisabled: false,
       isVisible: true,
       isDefaultClickDisabled: true,
+      recaptchaV2: false,
       version: 1,
     },
     TEXT_WIDGET: {
@@ -32,38 +37,41 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
       fontStyle: "BOLD",
       textAlign: "LEFT",
       textColor: Colors.THUNDER,
-      rows: 1,
-      columns: 4,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+      columns: 4 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "Text",
       version: 1,
     },
     RICH_TEXT_EDITOR_WIDGET: {
       defaultText: "This is the initial <b>content</b> of the editor",
-      rows: 5,
-      columns: 8,
+      rows: 5 * GRID_DENSITY_MIGRATION_V1,
+      columns: 8 * GRID_DENSITY_MIGRATION_V1,
       isDisabled: false,
       isVisible: true,
+      isRequired: false,
       widgetName: "RichTextEditor",
       isDefaultClickDisabled: true,
       inputType: "html",
       version: 1,
     },
     IMAGE_WIDGET: {
-      defaultImage:
-        "https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png",
+      defaultImage: "https://source.unsplash.com/random/1500x600",
       imageShape: "RECTANGLE",
       maxZoomLevel: 1,
+      enableRotation: false,
+      enableDownload: false,
+      objectFit: "cover",
       image: "",
-      rows: 3,
-      columns: 4,
+      rows: 3 * GRID_DENSITY_MIGRATION_V1,
+      columns: 4 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "Image",
       version: 1,
     },
     INPUT_WIDGET: {
       inputType: "TEXT",
-      rows: 1,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
       label: "",
-      columns: 5,
+      columns: 5 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "Input",
       version: 1,
       resetOnSubmit: true,
@@ -72,8 +80,8 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
     },
     SWITCH_WIDGET: {
       label: "Label",
-      rows: 1,
-      columns: 2,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+      columns: 2 * GRID_DENSITY_MIGRATION_V1,
       defaultSwitchState: true,
       widgetName: "Switch",
       alignWidget: "LEFT",
@@ -82,14 +90,14 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
     },
     ICON_WIDGET: {
       widgetName: "Icon",
-      rows: 1,
-      columns: 1,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+      columns: 1 * GRID_DENSITY_MIGRATION_V1,
       version: 1,
     },
     CONTAINER_WIDGET: {
       backgroundColor: "#FFFFFF",
-      rows: 10,
-      columns: 8,
+      rows: 10 * GRID_DENSITY_MIGRATION_V1,
+      columns: 8 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "Container",
       containerStyle: "card",
       children: [],
@@ -112,10 +120,10 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
     DATE_PICKER_WIDGET: {
       isDisabled: false,
       datePickerType: "DATE_PICKER",
-      rows: 1,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
       label: "",
       dateFormat: "YYYY-MM-DD HH:mm",
-      columns: 5,
+      columns: 5 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "DatePicker",
       defaultDate: moment().format("YYYY-MM-DD HH:mm"),
       version: 1,
@@ -123,26 +131,28 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
     DATE_PICKER_WIDGET2: {
       isDisabled: false,
       datePickerType: "DATE_PICKER",
-      rows: 1,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
       label: "",
       dateFormat: "YYYY-MM-DD HH:mm",
-      columns: 5,
+      columns: 5 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "DatePicker",
       defaultDate: moment().toISOString(),
+      minDate: "2001-01-01 00:00",
+      maxDate: "2041-12-31 23:59",
       version: 2,
       isRequired: false,
     },
     VIDEO_WIDGET: {
-      rows: 7,
-      columns: 7,
+      rows: 7 * GRID_DENSITY_MIGRATION_V1,
+      columns: 7 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "Video",
       url: "https://www.youtube.com/watch?v=mzqK0QIZRLs",
       autoPlay: false,
       version: 1,
     },
     TABLE_WIDGET: {
-      rows: 7,
-      columns: 8,
+      rows: 7 * GRID_DENSITY_MIGRATION_V1,
+      columns: 9 * GRID_DENSITY_MIGRATION_V1,
       label: "Data",
       widgetName: "Table",
       searchKey: "",
@@ -235,33 +245,64 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
       tableData: [
         {
           step: "#1",
-          task: "Drag a Table",
+          task: "Drop a table",
           status: "✅",
           action: "",
         },
         {
           step: "#2",
-          task: "Create a Query fetch_users with the Mock DB",
+          task: "Create a query fetch_users with the Mock DB",
           status: "--",
           action: "",
         },
         {
           step: "#3",
-          task: "Bind the query to the table {{fetch_users.data}}",
+          task: "Bind the query using {{fetch_users.data}}",
           status: "--",
           action: "",
         },
       ],
       columnSizeMap: {
-        task: 347,
+        task: 245,
         step: 62,
         status: 75,
       },
+      blueprint: {
+        operations: [
+          {
+            type: BlueprintOperationTypes.MODIFY_PROPS,
+            fn: (widget: WidgetProps & { children?: WidgetProps[] }) => {
+              const primaryColumns = cloneDeep(widget.primaryColumns);
+              const columnIds = Object.keys(primaryColumns);
+              columnIds.forEach((columnId) => {
+                set(
+                  primaryColumns,
+                  `${columnId}.computedValue`,
+                  `{{${widget.widgetName}.sanitizedTableData.map((currentRow) => { return currentRow.${columnId}})}}`,
+                );
+              });
+              const updatePropertyMap = [
+                {
+                  widgetId: widget.widgetId,
+                  propertyName: "primaryColumns",
+                  propertyValue: primaryColumns,
+                },
+              ];
+              return updatePropertyMap;
+            },
+          },
+        ],
+      },
+      isVisibleSearch: true,
+      isVisibleFilters: true,
+      isVisibleDownload: true,
+      isVisibleCompactMode: true,
+      isVisiblePagination: true,
       version: 1,
     },
     DROP_DOWN_WIDGET: {
-      rows: 1,
-      columns: 5,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+      columns: 5 * GRID_DENSITY_MIGRATION_V1,
       label: "",
       selectionType: "SINGLE_SELECT",
       options: [
@@ -269,15 +310,16 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
         { label: "Green", value: "GREEN" },
         { label: "Red", value: "RED" },
       ],
-      widgetName: "Dropdown",
+      widgetName: "Select",
       defaultOptionValue: "GREEN",
       version: 1,
+      isFilterable: true,
       isRequired: false,
       isDisabled: false,
     },
     CHECKBOX_WIDGET: {
-      rows: 1,
-      columns: 3,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+      columns: 3 * GRID_DENSITY_MIGRATION_V1,
       label: "Label",
       defaultCheckedState: true,
       widgetName: "Checkbox",
@@ -287,8 +329,8 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
       isRequired: false,
     },
     RADIO_GROUP_WIDGET: {
-      rows: 2,
-      columns: 3,
+      rows: 2 * GRID_DENSITY_MIGRATION_V1,
+      columns: 3 * GRID_DENSITY_MIGRATION_V1,
       label: "",
       options: [
         { label: "Yes", value: "Y" },
@@ -301,10 +343,13 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
       isDisabled: false,
     },
     FILE_PICKER_WIDGET: {
-      rows: 1,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
       files: [],
+      selectedFiles: [],
+      defaultSelectedFiles: [],
+      allowedFileTypes: [],
       label: "Select Files",
-      columns: 4,
+      columns: 4 * GRID_DENSITY_MIGRATION_V1,
       maxNumFiles: 1,
       maxFileSize: 5,
       fileDataType: FileDataTypes.Base64,
@@ -315,8 +360,8 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
       isDisabled: false,
     },
     TABS_WIDGET: {
-      rows: 7,
-      columns: 8,
+      rows: 7 * GRID_DENSITY_MIGRATION_V1,
+      columns: 8 * GRID_DENSITY_MIGRATION_V1,
       shouldScrollContents: false,
       widgetName: "Tabs",
       tabsObj: {
@@ -361,11 +406,11 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
           },
         ],
       },
-      version: 2,
+      version: 3,
     },
     MODAL_WIDGET: {
-      rows: 6,
-      columns: 6,
+      rows: 6 * GRID_DENSITY_MIGRATION_V1,
+      columns: 6 * GRID_DENSITY_MIGRATION_V1,
       size: "MODAL_SMALL",
       canEscapeKeyClose: true,
       // detachFromLayout is set true for widgets that are not bound to the widgets within the layout.
@@ -393,8 +438,11 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                 view: [
                   {
                     type: "ICON_WIDGET",
-                    position: { left: 14, top: 0 },
-                    size: { rows: 1, cols: 2 },
+                    position: { left: 14 * GRID_DENSITY_MIGRATION_V1, top: 1 },
+                    size: {
+                      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+                      cols: 2 * GRID_DENSITY_MIGRATION_V1,
+                    },
                     props: {
                       iconName: "cross",
                       iconSize: 24,
@@ -404,8 +452,11 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                   },
                   {
                     type: "TEXT_WIDGET",
-                    position: { left: 0, top: 0 },
-                    size: { rows: 1, cols: 10 },
+                    position: { left: 1, top: 1 },
+                    size: {
+                      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+                      cols: 10 * GRID_DENSITY_MIGRATION_V1,
+                    },
                     props: {
                       text: "Modal Title",
                       fontSize: "HEADING1",
@@ -414,8 +465,14 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                   },
                   {
                     type: "BUTTON_WIDGET",
-                    position: { left: 9, top: 4 },
-                    size: { rows: 1, cols: 3 },
+                    position: {
+                      left: 9 * GRID_DENSITY_MIGRATION_V1,
+                      top: 4 * GRID_DENSITY_MIGRATION_V1,
+                    },
+                    size: {
+                      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+                      cols: 3 * GRID_DENSITY_MIGRATION_V1,
+                    },
                     props: {
                       text: "Cancel",
                       buttonStyle: "SECONDARY_BUTTON",
@@ -424,8 +481,14 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                   },
                   {
                     type: "BUTTON_WIDGET",
-                    position: { left: 12, top: 4 },
-                    size: { rows: 1, cols: 4 },
+                    position: {
+                      left: 12 * GRID_DENSITY_MIGRATION_V1,
+                      top: 4 * GRID_DENSITY_MIGRATION_V1,
+                    },
+                    size: {
+                      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+                      cols: 4 * GRID_DENSITY_MIGRATION_V1,
+                    },
                     props: {
                       text: "Confirm",
                       buttonStyle: "PRIMARY_BUTTON",
@@ -472,8 +535,8 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
       version: 1,
     },
     CHART_WIDGET: {
-      rows: 8,
-      columns: 6,
+      rows: 8 * GRID_DENSITY_MIGRATION_V1,
+      columns: 6 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "Chart",
       chartType: "LINE_CHART",
       chartName: "Last week's revenue",
@@ -516,18 +579,71 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
       },
       xAxisName: "Last Week",
       yAxisName: "Total Order Revenue $",
+      customFusionChartConfig: {
+        type: "column2d",
+        dataSource: {
+          chart: {
+            caption: "Last week's revenue",
+            xAxisName: "Last Week",
+            yAxisName: "Total Order Revenue $",
+            theme: "fusion",
+          },
+          data: [
+            {
+              label: "Mon",
+              value: 10000,
+            },
+            {
+              label: "Tue",
+              value: 12000,
+            },
+            {
+              label: "Wed",
+              value: 32000,
+            },
+            {
+              label: "Thu",
+              value: 28000,
+            },
+            {
+              label: "Fri",
+              value: 14000,
+            },
+            {
+              label: "Sat",
+              value: 19000,
+            },
+            {
+              label: "Sun",
+              value: 36000,
+            },
+          ],
+          trendlines: [
+            {
+              line: [
+                {
+                  startvalue: "38000",
+                  valueOnRight: "1",
+                  displayvalue: "Weekly Target",
+                },
+              ],
+            },
+          ],
+        },
+      },
     },
     FORM_BUTTON_WIDGET: {
-      rows: 1,
-      columns: 3,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+      columns: 3 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "FormButton",
       text: "Submit",
       isDefaultClickDisabled: true,
+      recaptchaV2: false,
       version: 1,
     },
     FORM_WIDGET: {
-      rows: 13,
-      columns: 7,
+      rows: 13 * GRID_DENSITY_MIGRATION_V1,
+      columns: 7 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "Form",
       backgroundColor: "white",
       children: [],
@@ -546,8 +662,11 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                 view: [
                   {
                     type: "TEXT_WIDGET",
-                    size: { rows: 1, cols: 6 },
-                    position: { top: 0, left: 0 },
+                    size: {
+                      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+                      cols: 6 * GRID_DENSITY_MIGRATION_V1,
+                    },
+                    position: { top: 1, left: 1.5 },
                     props: {
                       text: "Form",
                       fontSize: "HEADING1",
@@ -556,25 +675,39 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                   },
                   {
                     type: "FORM_BUTTON_WIDGET",
-                    size: { rows: 1, cols: 4 },
-                    position: { top: 11, left: 12 },
+                    size: {
+                      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+                      cols: 4 * GRID_DENSITY_MIGRATION_V1,
+                    },
+                    position: {
+                      top: 11.25 * GRID_DENSITY_MIGRATION_V1,
+                      left: 11.6 * GRID_DENSITY_MIGRATION_V1,
+                    },
                     props: {
                       text: "Submit",
                       buttonStyle: "PRIMARY_BUTTON",
                       disabledWhenInvalid: true,
                       resetFormOnClick: true,
+                      recaptchaV2: false,
                       version: 1,
                     },
                   },
                   {
                     type: "FORM_BUTTON_WIDGET",
-                    size: { rows: 1, cols: 4 },
-                    position: { top: 11, left: 8 },
+                    size: {
+                      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+                      cols: 4 * GRID_DENSITY_MIGRATION_V1,
+                    },
+                    position: {
+                      top: 11.25 * GRID_DENSITY_MIGRATION_V1,
+                      left: 7.5 * GRID_DENSITY_MIGRATION_V1,
+                    },
                     props: {
                       text: "Reset",
                       buttonStyle: "SECONDARY_BUTTON",
                       disabledWhenInvalid: false,
                       resetFormOnClick: true,
+                      recaptchaV2: false,
                       version: 1,
                     },
                   },
@@ -586,8 +719,8 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
       },
     },
     MAP_WIDGET: {
-      rows: 12,
-      columns: 8,
+      rows: 12 * GRID_DENSITY_MIGRATION_V1,
+      columns: 8 * GRID_DENSITY_MIGRATION_V1,
       isDisabled: false,
       isVisible: true,
       widgetName: "Map",
@@ -601,8 +734,8 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
     },
     SKELETON_WIDGET: {
       isLoading: true,
-      rows: 1,
-      columns: 1,
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+      columns: 1 * GRID_DENSITY_MIGRATION_V1,
       widgetName: "Skeleton",
       version: 1,
     },
@@ -615,20 +748,23 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
     },
     [WidgetTypes.LIST_WIDGET]: {
       backgroundColor: "",
-      itemBackgroundColor: "white",
-      rows: 10,
-      columns: 8,
+      itemBackgroundColor: "#FFFFFF",
+      rows: 10 * GRID_DENSITY_MIGRATION_V1,
+      columns: 8 * GRID_DENSITY_MIGRATION_V1,
       gridType: "vertical",
+      template: {},
       enhancements: {
         child: {
           autocomplete: (parentProps: any) => {
             return parentProps.childAutoComplete;
           },
-          hideEvaluatedValue: () => true,
+          updateDataTreePath: (parentProps: any, dataTreePath: string) => {
+            return `${parentProps.widgetName}.template.${dataTreePath}`;
+          },
           propertyUpdateHook: (
             parentProps: any,
             widgetName: string,
-            propertyPath: string, // onClick
+            propertyPath: string,
             propertyValue: string,
             isTriggerProperty: boolean,
           ) => {
@@ -645,7 +781,16 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
               "",
             );
 
-            value = `{{${parentProps.widgetName}.items.map((currentItem) => ${modifiedAction})}}`;
+            value = `{{${parentProps.widgetName}.listData.map((currentItem) => {
+              return (function(){
+                return  ${modifiedAction};
+              })();
+            })}}`;
+
+            if (!modifiedAction) {
+              value = propertyValue;
+            }
+
             const path = `template.${widgetName}.${propertyPath}`;
 
             return [
@@ -660,7 +805,7 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
         },
       },
       gridGap: 0,
-      items: [
+      listData: [
         {
           id: 1,
           num: "001",
@@ -710,13 +855,17 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
               canExtend: false,
               detachFromLayout: true,
               dropDisabled: true,
+              openParentPropertyPane: true,
               noPad: true,
               children: [],
               blueprint: {
                 view: [
                   {
                     type: "CONTAINER_WIDGET",
-                    size: { rows: 4, cols: 16 },
+                    size: {
+                      rows: 4 * GRID_DENSITY_MIGRATION_V1,
+                      cols: 16 * GRID_DENSITY_MIGRATION_V1,
+                    },
                     position: { top: 0, left: 0 },
                     props: {
                       backgroundColor: "white",
@@ -725,6 +874,7 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                       isDeletable: false,
                       disallowCopy: true,
                       disablePropertyPane: true,
+                      openParentPropertyPane: true,
                       children: [],
                       blueprint: {
                         view: [
@@ -741,11 +891,14 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                                 view: [
                                   {
                                     type: "IMAGE_WIDGET",
-                                    size: { rows: 3, cols: 4 },
+                                    size: {
+                                      rows: 3 * GRID_DENSITY_MIGRATION_V1,
+                                      cols: 4 * GRID_DENSITY_MIGRATION_V1,
+                                    },
                                     position: { top: 0, left: 0 },
                                     props: {
                                       defaultImage:
-                                        "https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png",
+                                        "https://source.unsplash.com/random/1500x600",
                                       imageShape: "RECTANGLE",
                                       maxZoomLevel: 1,
                                       image: "{{currentItem.img}}",
@@ -759,8 +912,14 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                                   },
                                   {
                                     type: "TEXT_WIDGET",
-                                    size: { rows: 1, cols: 6 },
-                                    position: { top: 0, left: 4 },
+                                    size: {
+                                      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+                                      cols: 6 * GRID_DENSITY_MIGRATION_V1,
+                                    },
+                                    position: {
+                                      top: 0,
+                                      left: 4 * GRID_DENSITY_MIGRATION_V1,
+                                    },
                                     props: {
                                       text: "{{currentItem.name}}",
                                       textStyle: "HEADING",
@@ -775,8 +934,14 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                                   },
                                   {
                                     type: "TEXT_WIDGET",
-                                    size: { rows: 1, cols: 6 },
-                                    position: { top: 1, left: 4 },
+                                    size: {
+                                      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+                                      cols: 6 * GRID_DENSITY_MIGRATION_V1,
+                                    },
+                                    position: {
+                                      top: 1 * GRID_DENSITY_MIGRATION_V1,
+                                      left: 4 * GRID_DENSITY_MIGRATION_V1,
+                                    },
                                     props: {
                                       text: "{{currentItem.num}}",
                                       textStyle: "BODY",
@@ -810,6 +975,7 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
               widgets: { [widgetId: string]: FlattenedWidgetProps },
             ) => {
               let template = {};
+              const logBlackListMap: any = {};
               const container = get(
                 widgets,
                 `${get(widget, "children.0.children.0")}`,
@@ -825,6 +991,7 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
               canvas.children &&
                 get(canvas, "children", []).forEach((child: string) => {
                   const childWidget = cloneDeep(get(widgets, `${child}`));
+                  const logBlackList: { [key: string]: boolean } = {};
                   const keys = Object.keys(childWidget);
 
                   for (let i = 0; i < keys.length; i++) {
@@ -841,7 +1008,7 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                         "",
                       );
 
-                      value = `{{${widget.widgetName}.items.map((currentItem) => ${modifiedAction})}}`;
+                      value = `{{${widget.widgetName}.listData.map((currentItem) => ${modifiedAction})}}`;
 
                       childWidget[key] = value;
 
@@ -851,6 +1018,12 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                     }
                   }
 
+                  Object.keys(childWidget).map((key) => {
+                    logBlackList[key] = true;
+                  });
+
+                  logBlackListMap[childWidget.widgetId] = logBlackList;
+
                   template = {
                     ...template,
                     [childWidget.widgetName]: childWidget,
@@ -869,6 +1042,18 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                   propertyValue: template,
                 },
               ];
+
+              // add logBlackList to updateProperyMap for all children
+              updatePropertyMap = updatePropertyMap.concat(
+                Object.keys(logBlackListMap).map((logBlackListMapKey) => {
+                  return {
+                    widgetId: logBlackListMapKey,
+                    propertyName: "logBlackList",
+                    propertyValue: logBlackListMap[logBlackListMapKey],
+                  };
+                }),
+              );
+
               return updatePropertyMap;
             },
           },
@@ -878,20 +1063,21 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
               widgets: { [widgetId: string]: FlattenedWidgetProps },
               widgetId: string,
               parentId: string,
-              widgetPropertyMaps: {
-                defaultPropertyMap: Record<string, string>;
-              },
             ) => {
               if (!parentId) return { widgets };
               const widget = { ...widgets[widgetId] };
               const parent = { ...widgets[parentId] };
+              const logBlackList: { [key: string]: boolean } = {};
 
-              const disallowedWidgets = [WidgetTypes.FILE_PICKER_WIDGET];
+              const disallowedWidgets = [
+                WidgetTypes.TABLE_WIDGET,
+                WidgetTypes.LIST_WIDGET,
+                WidgetTypes.TABS_WIDGET,
+                WidgetTypes.FORM_WIDGET,
+                WidgetTypes.CONTAINER_WIDGET,
+              ];
 
-              if (
-                Object.keys(widgetPropertyMaps.defaultPropertyMap).length > 0 ||
-                indexOf(disallowedWidgets, widget.type) > -1
-              ) {
+              if (indexOf(disallowedWidgets, widget.type) > -1) {
                 const widget = widgets[widgetId];
                 if (widget.children && widget.children.length > 0) {
                   widget.children.forEach((childId: string) => {
@@ -911,7 +1097,7 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
                   widgets,
                   message: `${
                     WidgetConfigResponse.config[widget.type].widgetName
-                  } widgets cannot be used inside the list widget right now.`,
+                  } widgets cannot be used inside the list widget.`,
                 };
               }
 
@@ -922,7 +1108,15 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
 
               parent.template = template;
 
+              // add logBlackList for the children being added
+              Object.keys(widget).map((key) => {
+                logBlackList[key] = true;
+              });
+
+              widget.logBlackList = logBlackList;
+
               widgets[parentId] = parent;
+              widgets[widgetId] = widget;
 
               return { widgets };
             },
@@ -930,6 +1124,41 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
         ],
       },
     },
+    RATE_WIDGET: {
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+      columns: 2.5 * GRID_DENSITY_MIGRATION_V1,
+      maxCount: 5,
+      defaultRate: 5,
+      activeColor: Colors.RATE_ACTIVE,
+      inactiveColor: Colors.RATE_INACTIVE,
+      size: "MEDIUM",
+      isRequired: false,
+      isAllowHalf: false,
+      isDisabled: false,
+      widgetName: "Rating",
+    },
+    [WidgetTypes.IFRAME_WIDGET]: {
+      source: "https://www.wikipedia.org/",
+      borderOpacity: 100,
+      borderWidth: 1,
+      rows: 8 * GRID_DENSITY_MIGRATION_V1,
+      columns: 7 * GRID_DENSITY_MIGRATION_V1,
+      widgetName: "Iframe",
+      version: 1,
+    },
+    DIVIDER_WIDGET: {
+      rows: 1 * GRID_DENSITY_MIGRATION_V1,
+      columns: 2 * GRID_DENSITY_MIGRATION_V1,
+      widgetName: "Divider",
+      orientation: "horizontal",
+      capType: "nc",
+      capSide: 0,
+      strokeStyle: "solid",
+      dividerColor: "black",
+      thickness: 2,
+      isVisible: true,
+      version: 1,
+    },
   },
   configVersion: 1,
 };
diff --git a/app/client/src/mockResponses/WidgetSidebarResponse.tsx b/app/client/src/mockResponses/WidgetSidebarResponse.tsx
index cec889206f..407258c988 100644
--- a/app/client/src/mockResponses/WidgetSidebarResponse.tsx
+++ b/app/client/src/mockResponses/WidgetSidebarResponse.tsx
@@ -36,7 +36,7 @@ const WidgetSidebarResponse: WidgetCardProps[] = [
   },
   {
     type: "DROP_DOWN_WIDGET",
-    widgetCardName: "Dropdown",
+    widgetCardName: "Select",
     key: generateReactKey(),
   },
   {
@@ -105,6 +105,21 @@ const WidgetSidebarResponse: WidgetCardProps[] = [
     widgetCardName: "Modal",
     key: generateReactKey(),
   },
+  {
+    type: "RATE_WIDGET",
+    widgetCardName: "Rating",
+    key: generateReactKey(),
+  },
+  {
+    type: "IFRAME_WIDGET",
+    widgetCardName: "Iframe",
+    key: generateReactKey(),
+  },
+  {
+    type: "DIVIDER_WIDGET",
+    widgetCardName: "Divider",
+    key: generateReactKey(),
+  },
 ];
 
 export default WidgetSidebarResponse;
diff --git a/app/client/src/notifications/Bell.tsx b/app/client/src/notifications/Bell.tsx
new file mode 100644
index 0000000000..51fc2842db
--- /dev/null
+++ b/app/client/src/notifications/Bell.tsx
@@ -0,0 +1,109 @@
+import React, { useEffect } from "react";
+import { useSelector } from "react-redux";
+
+import NotificationsList from "./NotificationsList";
+import { ReactComponent as BellIcon } from "assets/icons/ads/bell.svg";
+import { Popover2 } from "@blueprintjs/popover2";
+
+import "@blueprintjs/popover2/lib/css/blueprint-popover2.css";
+import { useDispatch } from "react-redux";
+
+import {
+  fetchNotificationsRequest,
+  fetchUnreadNotificationsCountRequest,
+  setIsNotificationsListVisible,
+} from "actions/notificationActions";
+import styled from "styled-components";
+
+import {
+  unreadCountSelector,
+  isNotificationsListVisibleSelector,
+} from "selectors/notificationSelectors";
+
+const Container = styled.div`
+  position: relative;
+  padding: ${(props) => props.theme.spaces[1]}px;
+  margin-right: ${(props) => props.theme.spaces[9]}px;
+  top: 3px;
+  cursor: pointer;
+`;
+
+const BellIndicatorContainer = styled.div`
+  position: absolute;
+  top: -7px;
+  right: -5px;
+`;
+
+const Count = styled.div`
+  position: absolute;
+  top: 43%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+`;
+
+const BellIndicatorIcon = styled.div`
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: ${(props) =>
+    props.theme.colors.notifications.bellIndicator};
+`;
+
+const StyledBellIcon = styled(BellIcon)`
+  width: 22px;
+  height: 22px;
+`;
+
+function Bell() {
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(fetchNotificationsRequest());
+    dispatch(fetchUnreadNotificationsCountRequest());
+  }, []);
+
+  const unreadCount = useSelector(unreadCountSelector);
+  const showIndicator = unreadCount > 0;
+
+  const isOpen = useSelector(isNotificationsListVisibleSelector);
+
+  return (
+    <Popover2
+      content={<NotificationsList />}
+      isOpen={isOpen}
+      minimal
+      modifiers={{
+        offset: {
+          enabled: true,
+          options: {
+            offset: [-15, 10],
+          },
+        },
+        preventOverflow: {
+          enabled: true,
+        },
+      }}
+      onInteraction={(nextOpenState) =>
+        dispatch(setIsNotificationsListVisible(nextOpenState))
+      }
+      placement={"bottom-end"}
+    >
+      <Container>
+        <StyledBellIcon />
+        {showIndicator && (
+          <BellIndicatorContainer>
+            {/** Not using overflow ellipsis here for UI specs */}
+            <BellIndicatorIcon />
+            <Count>
+              {unreadCount > 100
+                ? `${unreadCount}`.slice(0, 2) + ".."
+                : unreadCount}
+            </Count>
+          </BellIndicatorContainer>
+        )}
+      </Container>
+    </Popover2>
+  );
+}
+
+export default Bell;
diff --git a/app/client/src/notifications/NotificationListItem.tsx b/app/client/src/notifications/NotificationListItem.tsx
new file mode 100644
index 0000000000..da758ef85d
--- /dev/null
+++ b/app/client/src/notifications/NotificationListItem.tsx
@@ -0,0 +1,259 @@
+import React from "react";
+import ProfileImage, { Profile } from "pages/common/ProfileImage";
+
+import UserApi from "api/UserApi";
+
+import { AppsmithNotification, NotificationTypes } from "entities/Notification";
+import { getTypographyByKey } from "constants/DefaultTheme";
+import { getCommentThreadURL } from "comments/utils";
+import { markNotificationAsReadRequest } from "actions/notificationActions";
+
+import history from "utils/history";
+import { useDispatch } from "react-redux";
+
+import moment from "moment";
+import styled from "styled-components";
+
+import { APP_MODE } from "reducers/entityReducers/appReducer";
+import OrgApi from "api/OrgApi";
+
+import {
+  isPermitted,
+  PERMISSION_TYPE,
+} from "pages/Applications/permissionHelpers";
+
+export const NOTIFICATION_HEIGHT = 82;
+
+const Container = styled.div`
+  display: flex;
+  width: 100%;
+  padding: ${(props) => props.theme.spaces[6]}px;
+  height: ${NOTIFICATION_HEIGHT}px;
+
+  ${Profile} {
+    margin-right: ${(props) => props.theme.spaces[4]}px;
+  }
+
+  cursor: pointer;
+`;
+
+const NotificationBodyContainer = styled.div`
+  ${(props) => getTypographyByKey(props, "p1")};
+  & b {
+    font-weight: 500;
+  }
+
+  & div {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2; /* number of lines to show */
+    -webkit-box-orient: vertical;
+  }
+`;
+
+const FlexContainer = styled.div`
+  display: flex;
+`;
+
+const Time = styled.div`
+  color: ${(props) => props.theme.colors.notifications.time};
+  ${(props) => getTypographyByKey(props, "p3")};
+`;
+
+const ProfileImageContainer = styled.div`
+  position: relative;
+`;
+
+const UnreadIndicator = styled.div`
+  position: absolute;
+  right: 9px;
+  top: 0;
+  width: 9px;
+  height: 9px;
+  border-radius: 50%;
+  background-color: ${(props) =>
+    props.theme.colors.notifications.unreadIndicator};
+`;
+
+const getModeFromUserRole = async (orgId: string) => {
+  try {
+    const response = await OrgApi.fetchOrg({ orgId });
+    const userOrgPermissions = response?.data?.data?.userPermissions || [];
+    const canPublish = isPermitted(
+      userOrgPermissions,
+      PERMISSION_TYPE.PUBLISH_APPLICATION,
+    );
+
+    return canPublish ? APP_MODE.EDIT : APP_MODE.PUBLISHED;
+  } catch (e) {
+    return APP_MODE.PUBLISHED;
+  }
+};
+
+const getModeFromRoleAndDomain = (
+  modeFromRole: APP_MODE,
+  modeFromDomain: APP_MODE,
+) => {
+  if (modeFromRole === APP_MODE.PUBLISHED) return APP_MODE.PUBLISHED;
+  return modeFromDomain;
+};
+
+function CommentNotification(props: { notification: AppsmithNotification }) {
+  const dispatch = useDispatch();
+  const {
+    _id,
+    comment,
+    createdAt,
+    creationTime,
+    id,
+    isRead,
+  } = props.notification;
+  const {
+    applicationId,
+    applicationName,
+    authorName,
+    authorUsername,
+    mode: modeFromComment,
+    orgId,
+    pageId,
+    // resolvedState, TODO get from comment thread
+    threadId,
+  } = comment;
+
+  const _createdAt = createdAt || creationTime;
+  const displayName = authorName || authorUsername;
+
+  const handleClick = async () => {
+    const modeFromRole = await getModeFromUserRole(orgId);
+    const mode = getModeFromRoleAndDomain(modeFromRole, modeFromComment);
+
+    const commentThreadUrl = getCommentThreadURL({
+      applicationId,
+      commentThreadId: threadId,
+      // isResolved: resolvedState?.active,
+      mode,
+      pageId,
+    });
+    history.push(
+      `${commentThreadUrl.pathname}${commentThreadUrl.search}${commentThreadUrl.hash}`,
+    );
+
+    dispatch(markNotificationAsReadRequest(id || (_id as string)));
+  };
+
+  return (
+    <FlexContainer onClick={handleClick}>
+      <ProfileImageContainer>
+        <ProfileImage
+          side={25}
+          source={`/api/${UserApi.photoURL}/${authorUsername}`}
+          userName={displayName}
+        />
+        {!isRead && <UnreadIndicator />}
+      </ProfileImageContainer>
+      <NotificationBodyContainer>
+        <div>
+          <b>{displayName}</b> left a comment on <b>{applicationName}</b>
+        </div>
+        <Time>{moment(_createdAt).fromNow()}</Time>
+      </NotificationBodyContainer>
+    </FlexContainer>
+  );
+}
+
+function CommentThreadNotification(props: {
+  notification: AppsmithNotification;
+}) {
+  const dispatch = useDispatch();
+  const {
+    _id: _notificationId,
+    commentThread,
+    createdAt,
+    creationTime,
+    id: notificationId,
+    isRead,
+  } = props.notification;
+
+  const {
+    _id,
+    applicationId,
+    applicationName,
+    authorName,
+    authorUsername,
+    id,
+    mode: modeFromThread,
+    orgId,
+    pageId,
+    resolvedState,
+  } = commentThread;
+
+  const commentThreadId = _id || id;
+
+  const handleClick = async () => {
+    const modeFromRole = await getModeFromUserRole(orgId);
+    const mode = getModeFromRoleAndDomain(modeFromRole, modeFromThread);
+
+    const commentThreadUrl = getCommentThreadURL({
+      applicationId,
+      commentThreadId,
+      isResolved: resolvedState?.active,
+      mode,
+      pageId,
+    });
+
+    history.push(
+      `${commentThreadUrl.pathname}${commentThreadUrl.search}${commentThreadUrl.hash}`,
+    );
+
+    dispatch(
+      markNotificationAsReadRequest(
+        notificationId || (_notificationId as string),
+      ),
+    );
+  };
+
+  const _createdAt = createdAt || creationTime;
+  const displayName = authorName || authorUsername;
+
+  return (
+    <FlexContainer onClick={handleClick}>
+      <ProfileImageContainer>
+        <ProfileImage
+          side={25}
+          source={`/api/${UserApi.photoURL}/${authorUsername}`}
+          userName={displayName}
+        />
+        {!isRead && <UnreadIndicator />}
+      </ProfileImageContainer>
+      <NotificationBodyContainer>
+        <div>
+          <b>{displayName}</b> left a comment on <b>{applicationName}</b>
+        </div>
+        <Time>{moment(_createdAt).fromNow()}</Time>
+      </NotificationBodyContainer>
+    </FlexContainer>
+  );
+}
+
+const notificationByType = {
+  [NotificationTypes.CommentNotification]: CommentNotification,
+  [NotificationTypes.CommentThreadNotification]: CommentThreadNotification,
+};
+
+function NotificationListItem(props: { notification: AppsmithNotification }) {
+  // TODO fix this, use type from api response
+  const type = props.notification.comment
+    ? NotificationTypes.CommentNotification
+    : NotificationTypes.CommentThreadNotification;
+
+  const Component = notificationByType[type];
+
+  return (
+    <Container>
+      <Component notification={props.notification} />
+    </Container>
+  );
+}
+
+export default NotificationListItem;
diff --git a/app/client/src/notifications/NotificationsList.tsx b/app/client/src/notifications/NotificationsList.tsx
new file mode 100644
index 0000000000..4eda4426bb
--- /dev/null
+++ b/app/client/src/notifications/NotificationsList.tsx
@@ -0,0 +1,155 @@
+import React from "react";
+import { useDispatch, useSelector } from "react-redux";
+import styled from "styled-components";
+
+import Spinner from "components/ads/Spinner";
+import { IconSize } from "components/ads/Icon";
+
+import {
+  notificationsSelector,
+  fetchingNotificationsSelector,
+} from "selectors/notificationSelectors";
+import NotificationListItem, {
+  NOTIFICATION_HEIGHT,
+} from "./NotificationListItem";
+import { AppsmithNotification } from "entities/Notification";
+
+import {
+  createMessage,
+  COMMENTS,
+  MARK_ALL_AS_READ,
+  NO_NOTIFICATIONS_TO_SHOW,
+} from "constants/messages";
+
+import Button, { Category } from "components/ads/Button";
+import { getTypographyByKey } from "constants/DefaultTheme";
+
+import { Virtuoso } from "react-virtuoso";
+
+import {
+  fetchNotificationsRequest,
+  markAllNotificationsAsReadRequest,
+} from "actions/notificationActions";
+
+import { ReactComponent as EmptyState } from "assets/icons/comments/notifications-empty-state.svg";
+
+const Container = styled.div`
+  width: 326px;
+  max-height: 376px;
+`;
+
+const StyledHeader = styled.div`
+  display: flex;
+  justify-content: space-between;
+  padding: ${(props) => props.theme.spaces[4] + 1}px;
+
+  & .title {
+    ${(props) => getTypographyByKey(props, "p1")};
+    color: ${(props) => props.theme.colors.notifications.listHeaderTitle};
+  }
+
+  & .mark-all-as-read {
+    border-color: ${(props) =>
+      props.theme.colors.notifications.markAllAsReadButtonBackground};
+    background-color: ${(props) =>
+      props.theme.colors.notifications.markAllAsReadButtonBackground};
+    color: ${(props) =>
+      props.theme.colors.notifications.markAllAsReadButtonText};
+  }
+`;
+
+const Label = styled.div`
+  color: ${(props) => props.theme.colors.notifications.label};
+  ${(props) => getTypographyByKey(props, "p1")}
+`;
+
+const EmptyNotificationsStateContainer = styled.div`
+  padding: ${(props) => props.theme.spaces[9]}px;
+
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+`;
+
+function EmptyNotificationsState() {
+  return (
+    <EmptyNotificationsStateContainer>
+      <EmptyState />
+      <Label>{createMessage(NO_NOTIFICATIONS_TO_SHOW)}</Label>
+    </EmptyNotificationsStateContainer>
+  );
+}
+
+function NotificationsListHeader() {
+  const dispatch = useDispatch();
+
+  return (
+    <StyledHeader>
+      <div className="title">{createMessage(COMMENTS)}</div>
+      <Button
+        category={Category.primary}
+        className={"mark-all-as-read"}
+        onClick={() => {
+          dispatch(markAllNotificationsAsReadRequest());
+        }}
+        text={createMessage(MARK_ALL_AS_READ)}
+        type="button"
+      />
+    </StyledHeader>
+  );
+}
+
+const Footer = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: ${(props) => props.theme.spaces[4]}px;
+`;
+
+function NotificationsList() {
+  const dispatch = useDispatch();
+  const notifications = useSelector(notificationsSelector);
+  const fetchingNotifications = useSelector(fetchingNotificationsSelector);
+  const height = Math.min(4, notifications.length) * NOTIFICATION_HEIGHT;
+
+  return (
+    <Container>
+      <NotificationsListHeader />
+      {notifications.length > 0 ? (
+        <Virtuoso
+          components={{
+            Footer() {
+              if (!fetchingNotifications) return null;
+
+              return (
+                <Footer>
+                  <Spinner size={IconSize.LARGE} />
+                </Footer>
+              );
+            },
+          }}
+          data={notifications}
+          endReached={(index: number) => {
+            const last = notifications[index];
+            const { createdAt, creationTime } = last || {};
+            const _createdTime = createdAt || creationTime;
+            dispatch(fetchNotificationsRequest(_createdTime));
+          }}
+          itemContent={(index: number, notification: AppsmithNotification) => (
+            <NotificationListItem
+              key={notification.id}
+              notification={notification}
+            />
+          )}
+          overscan={1}
+          style={{ height }}
+        />
+      ) : (
+        <EmptyNotificationsState />
+      )}
+    </Container>
+  );
+}
+
+export default NotificationsList;
diff --git a/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx b/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx
index 3d9371d7c9..8a2605b18f 100644
--- a/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx
+++ b/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx
@@ -26,8 +26,9 @@ import { fetchPublishedPage } from "actions/pageActions";
 
 const Section = styled.section`
   background: ${(props) => props.theme.colors.artboard};
-  height: 100%;
-  width: 100%;
+  height: max-content;
+  min-height: 100%;
+  margin: 0 auto;
   position: relative;
   overflow-x: auto;
   overflow-y: auto;
diff --git a/app/client/src/pages/AppViewer/GlobalHotKeys.tsx b/app/client/src/pages/AppViewer/GlobalHotKeys.tsx
new file mode 100644
index 0000000000..bd63a40f5e
--- /dev/null
+++ b/app/client/src/pages/AppViewer/GlobalHotKeys.tsx
@@ -0,0 +1,56 @@
+import React from "react";
+import { connect } from "react-redux";
+import { Hotkey, Hotkeys } from "@blueprintjs/core";
+import { HotkeysTarget } from "@blueprintjs/core/lib/esnext/components/hotkeys/hotkeysTarget.js";
+import { setCommentMode as setCommentModeAction } from "actions/commentActions";
+
+import { setCommentModeInUrl } from "pages/Editor/ToggleModeButton";
+
+type Props = {
+  resetCommentMode: () => void;
+  children: React.ReactNode;
+};
+
+@HotkeysTarget
+class GlobalHotKeys extends React.Component<Props> {
+  public renderHotkeys() {
+    return (
+      <Hotkeys>
+        <Hotkey
+          combo="esc"
+          global
+          group="Canvas"
+          label="Reset"
+          onKeyDown={(e: any) => {
+            this.props.resetCommentMode();
+            e.preventDefault();
+          }}
+        />
+        <Hotkey
+          combo="v"
+          global
+          label="View Mode"
+          onKeyDown={this.props.resetCommentMode}
+        />
+        <Hotkey
+          combo="c"
+          global
+          label="Comment Mode"
+          onKeyDown={() => setCommentModeInUrl(true)}
+        />
+      </Hotkeys>
+    );
+  }
+
+  render() {
+    return <div>{this.props.children}</div>;
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    resetCommentMode: () => dispatch(setCommentModeAction(false)),
+  };
+};
+
+export default connect(null, mapDispatchToProps)(GlobalHotKeys);
diff --git a/app/client/src/pages/AppViewer/index.tsx b/app/client/src/pages/AppViewer/index.tsx
index a76fc6fcc0..d947a2f620 100644
--- a/app/client/src/pages/AppViewer/index.tsx
+++ b/app/client/src/pages/AppViewer/index.tsx
@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import styled from "styled-components";
+import styled, { ThemeProvider } from "styled-components";
 import { connect } from "react-redux";
 import { withRouter, RouteComponentProps, Route } from "react-router";
 import { Switch } from "react-router-dom";
@@ -28,6 +28,12 @@ import { editorInitializer } from "utils/EditorUtils";
 import * as Sentry from "@sentry/react";
 import log from "loglevel";
 import { getViewModePageList } from "selectors/editorSelectors";
+import AppComments from "comments/AppComments/AppComments";
+import AddCommentTourComponent from "comments/tour/AddCommentTourComponent";
+import CommentShowCaseCarousel from "comments/CommentsShowcaseCarousel";
+import { getThemeDetails, ThemeMode } from "selectors/themeSelectors";
+import { Theme } from "constants/DefaultTheme";
+import GlobalHotKeys from "./GlobalHotKeys";
 
 const SentryRoute = Sentry.withSentryRouting(Route);
 
@@ -42,6 +48,18 @@ const AppViewerBody = styled.section<{ hasPages: boolean }>`
   );
 `;
 
+const ContainerWithComments = styled.div`
+  display: flex;
+  width: 100%;
+  height: 100%;
+`;
+
+const AppViewerBodyContainer = styled.div<{ width?: string }>`
+  flex: 1;
+  overflow: auto;
+  margin: 0 auto;
+`;
+
 export type AppViewerProps = {
   initializeAppViewer: (applicationId: string, pageId?: string) => void;
   isInitialized: boolean;
@@ -59,6 +77,7 @@ export type AppViewerProps = {
   ) => void;
   resetChildrenMetaProperty: (widgetId: string) => void;
   pages: PageListPayload;
+  lightTheme: Theme;
 } & RouteComponentProps<BuilderRouteParams>;
 
 class AppViewer extends Component<
@@ -86,30 +105,41 @@ class AppViewer extends Component<
   public render() {
     const { isInitialized } = this.props;
     return (
-      <EditorContext.Provider
-        value={{
-          executeAction: this.props.executeAction,
-          updateWidgetMetaProperty: this.props.updateWidgetMetaProperty,
-          resetChildrenMetaProperty: this.props.resetChildrenMetaProperty,
-        }}
-      >
-        <AppViewerBody hasPages={this.props.pages.length > 1}>
-          {isInitialized && this.state.registered && (
-            <Switch>
-              <SentryRoute
-                component={AppViewerPageContainer}
-                exact
-                path={getApplicationViewerPageURL()}
-              />
-              <SentryRoute
-                component={AppViewerPageContainer}
-                exact
-                path={`${getApplicationViewerPageURL()}/fork`}
-              />
-            </Switch>
-          )}
-        </AppViewerBody>
-      </EditorContext.Provider>
+      <ThemeProvider theme={this.props.lightTheme}>
+        <GlobalHotKeys>
+          <EditorContext.Provider
+            value={{
+              executeAction: this.props.executeAction,
+              updateWidgetMetaProperty: this.props.updateWidgetMetaProperty,
+              resetChildrenMetaProperty: this.props.resetChildrenMetaProperty,
+            }}
+          >
+            <ContainerWithComments>
+              <AppComments isInline />
+              <AppViewerBodyContainer>
+                <AppViewerBody hasPages={this.props.pages.length > 1}>
+                  {isInitialized && this.state.registered && (
+                    <Switch>
+                      <SentryRoute
+                        component={AppViewerPageContainer}
+                        exact
+                        path={getApplicationViewerPageURL()}
+                      />
+                      <SentryRoute
+                        component={AppViewerPageContainer}
+                        exact
+                        path={`${getApplicationViewerPageURL()}/fork`}
+                      />
+                    </Switch>
+                  )}
+                </AppViewerBody>
+              </AppViewerBodyContainer>
+            </ContainerWithComments>
+            <AddCommentTourComponent />
+            <CommentShowCaseCarousel />
+          </EditorContext.Provider>
+        </GlobalHotKeys>
+      </ThemeProvider>
     );
   }
 }
@@ -117,6 +147,7 @@ class AppViewer extends Component<
 const mapStateToProps = (state: AppState) => ({
   isInitialized: getIsInitialized(state),
   pages: getViewModePageList(state),
+  lightTheme: getThemeDetails(state, ThemeMode.LIGHT),
 });
 
 const mapDispatchToProps = (dispatch: any) => ({
diff --git a/app/client/src/pages/AppViewer/viewer/AppViewerHeader.tsx b/app/client/src/pages/AppViewer/viewer/AppViewerHeader.tsx
index 3e8a6a054c..3a2d7242af 100644
--- a/app/client/src/pages/AppViewer/viewer/AppViewerHeader.tsx
+++ b/app/client/src/pages/AppViewer/viewer/AppViewerHeader.tsx
@@ -13,7 +13,7 @@ import {
   PageListPayload,
 } from "constants/ReduxActionConstants";
 import { APPLICATIONS_URL, AUTH_LOGIN_URL } from "constants/routes";
-import { connect } from "react-redux";
+import { connect, useSelector } from "react-redux";
 import { AppState } from "reducers";
 import { getEditorURL } from "selectors/appViewSelectors";
 import { getViewModePageList } from "selectors/editorSelectors";
@@ -32,8 +32,9 @@ import ProfileDropdown from "pages/common/ProfileDropdown";
 import { Profile } from "pages/common/ProfileImage";
 import PageTabsContainer from "./PageTabsContainer";
 import { getThemeDetails, ThemeMode } from "selectors/themeSelectors";
+import ToggleCommentModeButton from "pages/Editor/ToggleModeButton";
 import GetAppViewerHeaderCTA from "./GetAppViewerHeaderCTA";
-import ToggleCommentModeButton from "comments/ToggleCommentModeButton";
+import { showAppInviteUsersDialogSelector } from "selectors/applicationSelectors";
 
 const HeaderWrapper = styled(StyledHeader)<{ hasPages: boolean }>`
   box-shadow: unset;
@@ -138,6 +139,10 @@ export function AppViewerHeader(props: AppViewerHeaderProps) {
   const isEmbed = queryParams.get("embed");
   const hideHeader = !!isEmbed;
 
+  const showAppInviteUsersDialog = useSelector(
+    showAppInviteUsersDialogSelector,
+  );
+
   function HtmlTitle() {
     if (!currentApplicationDetails?.name) return null;
     return (
@@ -166,9 +171,14 @@ export function AppViewerHeader(props: AppViewerHeaderProps) {
         <HtmlTitle />
         <HeaderRow justify={"space-between"}>
           <HeaderSection justify={"flex-start"}>
-            <PrimaryLogoLink to={APPLICATIONS_URL}>
-              <AppsmithLogoImg alt="Appsmith logo" src={AppsmithLogo} />
-            </PrimaryLogoLink>
+            <div style={{ flex: 1 }}>
+              <PrimaryLogoLink to={APPLICATIONS_URL}>
+                <AppsmithLogoImg alt="Appsmith logo" src={AppsmithLogo} />
+              </PrimaryLogoLink>
+            </div>
+            <div style={{ flex: 1 }}>
+              <ToggleCommentModeButton />
+            </div>
           </HeaderSection>
           <HeaderSection className="current-app-name" justify={"center"}>
             {currentApplicationDetails && (
@@ -176,13 +186,13 @@ export function AppViewerHeader(props: AppViewerHeaderProps) {
             )}
           </HeaderSection>
           <HeaderSection justify={"flex-end"}>
-            <ToggleCommentModeButton />
             {currentApplicationDetails && (
               <>
                 <FormDialogComponent
                   Form={AppInviteUsersForm}
                   applicationId={currentApplicationDetails.id}
                   canOutsideClickClose
+                  isOpen={showAppInviteUsersDialog}
                   orgId={currentOrgId}
                   title={currentApplicationDetails.name}
                   trigger={
diff --git a/app/client/src/pages/AppViewer/viewer/GetAppViewerHeaderCTA.tsx b/app/client/src/pages/AppViewer/viewer/GetAppViewerHeaderCTA.tsx
index 31d109d9bb..905814a8b5 100644
--- a/app/client/src/pages/AppViewer/viewer/GetAppViewerHeaderCTA.tsx
+++ b/app/client/src/pages/AppViewer/viewer/GetAppViewerHeaderCTA.tsx
@@ -24,12 +24,12 @@ const ForkButton = styled(Cta)`
 
 function GetAppViewerHeaderCTA(props: any) {
   const {
-    url,
     canEdit,
     currentApplicationDetails,
     currentUser,
     forkUrl,
     loginUrl,
+    url,
   } = props;
   let CTA = null;
   const dispatch = useDispatch();
diff --git a/app/client/src/pages/AppViewer/viewer/PageTabs.tsx b/app/client/src/pages/AppViewer/viewer/PageTabs.tsx
index 7a5f3e827d..e1a7ad5835 100644
--- a/app/client/src/pages/AppViewer/viewer/PageTabs.tsx
+++ b/app/client/src/pages/AppViewer/viewer/PageTabs.tsx
@@ -111,8 +111,8 @@ function PageTabName({ name }: { name: string }) {
 function PageTabContainer({
   children,
   isTabActive,
-  tabsScrollable,
   setShowScrollArrows,
+  tabsScrollable,
 }: {
   children: React.ReactNode;
   isTabActive: boolean;
@@ -140,8 +140,14 @@ type Props = {
 };
 
 export function PageTabs(props: Props) {
-  const { currentApplicationDetails, appPages } = props;
+  const { appPages, currentApplicationDetails } = props;
   const { pathname } = useLocation();
+  const location = useLocation();
+  const [query, setQuery] = useState("");
+
+  useEffect(() => {
+    setQuery(window.location.search);
+  }, [location]);
 
   return (
     <TabsContainer ref={props.measuredTabsRef}>
@@ -161,10 +167,13 @@ export function PageTabs(props: Props) {
           <PageTab
             activeClassName="is-active"
             className="t--page-switch-tab"
-            to={getApplicationViewerPageURL(
-              currentApplicationDetails?.id,
-              page.pageId,
-            )}
+            to={{
+              pathname: getApplicationViewerPageURL(
+                currentApplicationDetails?.id,
+                page.pageId,
+              ),
+              search: query,
+            }}
           >
             <PageTabName name={page.pageName} />
           </PageTab>
diff --git a/app/client/src/pages/AppViewer/viewer/PageTabsContainer.tsx b/app/client/src/pages/AppViewer/viewer/PageTabsContainer.tsx
index 6caef173cb..a6b8eb1cc9 100644
--- a/app/client/src/pages/AppViewer/viewer/PageTabsContainer.tsx
+++ b/app/client/src/pages/AppViewer/viewer/PageTabsContainer.tsx
@@ -67,7 +67,7 @@ export function PageTabsContainer(props: AppViewerHeaderProps) {
 
   const setShowScrollArrows = useCallback(() => {
     if (tabsRef.current) {
-      const { scrollWidth, offsetWidth, scrollLeft } = tabsRef.current;
+      const { offsetWidth, scrollLeft, scrollWidth } = tabsRef.current;
       setShouldShowLeftArrow(scrollLeft > 0);
       setShouldShowRightArrow(scrollLeft + offsetWidth < scrollWidth);
     }
@@ -76,7 +76,7 @@ export function PageTabsContainer(props: AppViewerHeaderProps) {
   const measuredTabsRef = useCallback((node) => {
     tabsRef.current = node;
     if (node !== null) {
-      const { scrollWidth, offsetWidth } = node;
+      const { offsetWidth, scrollWidth } = node;
       setTabsScrollable(scrollWidth > offsetWidth);
       setShowScrollArrows();
     }
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index 6f6fae0bc4..1ebb696b08 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -41,11 +41,14 @@ import { UpdateApplicationPayload } from "api/ApplicationApi";
 import {
   getIsFetchingApplications,
   getIsSavingAppName,
+  getIsErroredSavingAppName,
 } from "selectors/applicationSelectors";
 import { Classes as CsClasses } from "components/ads/common";
 import TooltipComponent from "components/ads/Tooltip";
 import { isEllipsisActive } from "utils/helpers";
 import ForkApplicationModal from "./ForkApplicationModal";
+import { Toaster } from "components/ads/Toast";
+import { Variant } from "components/ads/common";
 
 type NameWrapperProps = {
   hasReadPermission: boolean;
@@ -220,6 +223,7 @@ type ApplicationCardProps = {
   share?: (applicationId: string) => void;
   delete?: (applicationId: string) => void;
   update?: (id: string, data: UpdateApplicationPayload) => void;
+  enableImportExport?: boolean;
 };
 
 const EditButton = styled(Button)`
@@ -246,6 +250,7 @@ export function ApplicationCard(props: ApplicationCardProps) {
   const isFetchingApplications = useSelector(getIsFetchingApplications);
   const theme = useContext(ThemeContext);
   const isSavingName = useSelector(getIsSavingAppName);
+  const isErroredSavingName = useSelector(getIsErroredSavingAppName);
   const initialsAndColorCode = getInitialsAndColorCode(
     props.application.name,
     theme.colors.appCardColors,
@@ -297,6 +302,14 @@ export function ApplicationCard(props: ApplicationCardProps) {
         cypressSelector: "t--fork-app",
       });
     }
+    if (!!props.enableImportExport && hasExportPermission) {
+      moreActionItems.push({
+        onSelect: exportApplicationAsJSONFile,
+        text: "Export",
+        icon: "download",
+        cypressSelector: "t--export-app",
+      });
+    }
     setMoreActionItems(moreActionItems);
     addDeleteOption();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -312,6 +325,10 @@ export function ApplicationCard(props: ApplicationCardProps) {
     props.application?.userPermissions ?? [],
     PERMISSION_TYPE.READ_APPLICATION,
   );
+  const hasExportPermission = isPermitted(
+    props.application?.userPermissions ?? [],
+    PERMISSION_TYPE.EXPORT_APPLICATION,
+  );
   const updateColor = (color: string) => {
     setSelectedColor(color);
     props.update &&
@@ -331,6 +348,25 @@ export function ApplicationCard(props: ApplicationCardProps) {
   const shareApp = () => {
     props.share && props.share(props.application.id);
   };
+  const exportApplicationAsJSONFile = () => {
+    // export api response comes with content-disposition header.
+    // there is no straightforward way to handle it with axios/fetch
+    const id = `t--export-app-link`;
+    const existingLink = document.getElementById(id);
+    existingLink && existingLink.remove();
+    const link = document.createElement("a");
+    link.href = `/api/v1/applications/export/${props.application.id}`;
+    link.target = "_blank";
+    link.id = id;
+    document.body.appendChild(link);
+    link.click();
+    setIsMenuOpen(false);
+    Toaster.show({
+      text: `Successfully exported ${props.application.name}`,
+      variant: Variant.success,
+    });
+    link.remove();
+  };
   const forkApplicationInitiate = () => {
     // open fork application modal
     // on click on an organisation, create app and take to app
@@ -416,6 +452,7 @@ export function ApplicationCard(props: ApplicationCardProps) {
             editInteractionKind={EditInteractionKind.SINGLE}
             fill
             hideEditIcon={false}
+            isError={isErroredSavingName}
             isInvalid={(value: string) => {
               if (!value) {
                 return "Name cannot be empty";
diff --git a/app/client/src/pages/Applications/CreateApplicationForm.tsx b/app/client/src/pages/Applications/CreateApplicationForm.tsx
index 0b14274579..d49bfbc02b 100644
--- a/app/client/src/pages/Applications/CreateApplicationForm.tsx
+++ b/app/client/src/pages/Applications/CreateApplicationForm.tsx
@@ -49,7 +49,7 @@ const validate = (values: CreateApplicationFormValues) => {
 // TODO(abhinav): abstract onCancel out.
 
 function CreateApplicationForm(props: Props) {
-  const { error, handleSubmit, pristine, submitting, invalid } = props;
+  const { error, handleSubmit, invalid, pristine, submitting } = props;
   return (
     <Form onSubmit={handleSubmit(createApplicationFormSubmitHandler)}>
       {error && !pristine && <FormMessage intent="danger" message={error} />}
diff --git a/app/client/src/pages/Applications/ForkApplicationModal.tsx b/app/client/src/pages/Applications/ForkApplicationModal.tsx
index 230e4e472b..d17df5f87b 100644
--- a/app/client/src/pages/Applications/ForkApplicationModal.tsx
+++ b/app/client/src/pages/Applications/ForkApplicationModal.tsx
@@ -32,7 +32,7 @@ type ForkApplicationModalProps = {
 };
 
 function ForkApplicationModal(props: ForkApplicationModalProps) {
-  const { setModalClose, isModalOpen } = props;
+  const { isModalOpen, setModalClose } = props;
   const [organizationId, selectOrganizationId] = useState("");
   const dispatch = useDispatch();
   const userOrgs = useSelector(getUserApplicationsOrgs);
diff --git a/app/client/src/pages/Applications/ForkModalStyles.ts b/app/client/src/pages/Applications/ForkModalStyles.ts
index a79e04f042..2e731b7b57 100644
--- a/app/client/src/pages/Applications/ForkModalStyles.ts
+++ b/app/client/src/pages/Applications/ForkModalStyles.ts
@@ -26,9 +26,10 @@ const StyledRadioComponent = styled(RadioComponent)`
   }
 `;
 
-const ForkButton = styled(Button)`
+const ForkButton = styled(Button)<{ disabled?: boolean }>`
   height: 38px;
   width: 203px;
+  pointer-events: ${(props) => (!!props.disabled ? "none" : "auto")};
 `;
 
 const OrganizationList = styled.div`
diff --git a/app/client/src/pages/Applications/ImportApplicationModal.tsx b/app/client/src/pages/Applications/ImportApplicationModal.tsx
new file mode 100644
index 0000000000..4f37426224
--- /dev/null
+++ b/app/client/src/pages/Applications/ImportApplicationModal.tsx
@@ -0,0 +1,117 @@
+import React, { useCallback, useState } from "react";
+import styled from "styled-components";
+import Button, { Size } from "components/ads/Button";
+import { StyledDialog } from "./ForkModalStyles";
+import { useSelector } from "store";
+import { AppState } from "reducers";
+import FilePicker, { SetProgress, FileType } from "components/ads/FilePicker";
+import { useDispatch } from "react-redux";
+import { importApplication } from "actions/applicationActions";
+import { Toaster } from "components/ads/Toast";
+import { Variant } from "components/ads/common";
+import { IMPORT_APPLICATION_MODAL_TITLE } from "constants/messages";
+
+const ImportButton = styled(Button)<{ disabled?: boolean }>`
+  height: 30px;
+  width: 81px;
+  pointer-events: ${(props) => (!!props.disabled ? "none" : "auto")};
+`;
+
+const ButtonWrapper = styled.div`
+  display: flex;
+  justify-content: center;
+`;
+
+const FilePickerWrapper = styled.div`
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+`;
+
+type ImportApplicationModalProps = {
+  // import?: (file: any) => void;
+  organizationId?: string;
+  isModalOpen?: boolean;
+  onClose?: () => void;
+};
+
+function ImportApplicationModal(props: ImportApplicationModalProps) {
+  const { isModalOpen, onClose, organizationId } = props;
+  const [appFileToBeUploaded, setAppFileToBeUploaded] = useState<{
+    file: File;
+    setProgress: SetProgress;
+  } | null>(null);
+  const dispatch = useDispatch();
+
+  const importingApplication = useSelector(
+    (state: AppState) => state.ui.applications.importingApplication,
+  );
+
+  const FileUploader = useCallback(
+    async (file: File, setProgress: SetProgress) => {
+      if (!!file) {
+        setAppFileToBeUploaded({
+          file,
+          setProgress,
+        });
+      } else {
+        setAppFileToBeUploaded(null);
+      }
+    },
+    [],
+  );
+
+  const onImportApplication = useCallback(() => {
+    if (!appFileToBeUploaded) {
+      Toaster.show({
+        text: "Please choose a valid application file!",
+        variant: Variant.danger,
+      });
+      return;
+    }
+    const { file } = appFileToBeUploaded || {};
+
+    dispatch(
+      importApplication({
+        orgId: organizationId as string,
+        applicationFile: file,
+      }),
+    );
+  }, [appFileToBeUploaded, organizationId]);
+
+  const onRemoveFile = useCallback(() => setAppFileToBeUploaded(null), []);
+
+  return (
+    <StyledDialog
+      canOutsideClickClose
+      className={"t--import-application-modal"}
+      isOpen={isModalOpen}
+      maxHeight={"540px"}
+      setModalClose={onClose}
+      title={IMPORT_APPLICATION_MODAL_TITLE()}
+    >
+      <FilePickerWrapper>
+        <FilePicker
+          delayedUpload
+          fileType={FileType.JSON}
+          fileUploader={FileUploader}
+          onFileRemoved={onRemoveFile}
+        />
+      </FilePickerWrapper>
+      <ButtonWrapper>
+        <ImportButton
+          // category={ButtonCategory.tertiary}
+          cypressSelector={"t--org-import-app-button"}
+          disabled={!appFileToBeUploaded}
+          isLoading={importingApplication}
+          onClick={onImportApplication}
+          size={Size.large}
+          text={"IMPORT"}
+        />
+      </ButtonWrapper>
+    </StyledDialog>
+  );
+}
+
+export default ImportApplicationModal;
diff --git a/app/client/src/pages/Applications/OnboardingForm.tsx b/app/client/src/pages/Applications/OnboardingForm.tsx
new file mode 100644
index 0000000000..f573d62b10
--- /dev/null
+++ b/app/client/src/pages/Applications/OnboardingForm.tsx
@@ -0,0 +1,43 @@
+import React, { useEffect } from "react";
+import { useSelector } from "react-redux";
+import { useScript, ScriptStatus } from "utils/hooks/useScript";
+import { getCurrentUser } from "selectors/usersSelectors";
+import styled from "styled-components";
+import { setOnboardingFormInProgress } from "utils/storage";
+
+export const TypeformContainer = styled.div`
+  & iframe {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 0;
+    border: 0;
+  }
+`;
+
+function OnboardingForm() {
+  const status = useScript(`https://embed.typeform.com/embed.js`);
+  const currentUser = useSelector(getCurrentUser);
+
+  useEffect(() => {
+    setOnboardingFormInProgress(true);
+  }, []);
+
+  if (status !== ScriptStatus.READY || !currentUser) return null;
+
+  return (
+    <TypeformContainer>
+      <iframe
+        allow="camera; microphone; autoplay; encrypted-media;"
+        frameBorder="0"
+        height="100%"
+        id="typeform-full"
+        src={`https://form.typeform.com/to/m7sRcK1Y?typeform-medium=embed-snippet#email=${currentUser?.email}`}
+        width="100%"
+      />
+    </TypeformContainer>
+  );
+}
+
+export default OnboardingForm;
diff --git a/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx b/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx
index 11cecd4ea3..b6b282b884 100644
--- a/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx
+++ b/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx
@@ -127,7 +127,7 @@ const ReadMore = withTheme(
 );
 
 function ReleaseComponent({ release }: ReleaseProps) {
-  const { name, publishedAt, descriptionHtml } = release;
+  const { descriptionHtml, name, publishedAt } = release;
   const [isCollapsed, setCollapsed] = useState(true);
   const [shouldShowReadMore, setShouldShowReadMore] = useState(false);
   const contentRef = useRef<HTMLDivElement>(null);
diff --git a/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx b/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx
index 256e104863..eb03198782 100644
--- a/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx
+++ b/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx
@@ -94,7 +94,7 @@ const Header = withTheme(
 );
 
 function ProductUpdatesModal() {
-  const { releaseItems, newReleasesCount } = useSelector(
+  const { newReleasesCount, releaseItems } = useSelector(
     (state: AppState) => state.ui.releases,
   );
   const dispatch = useDispatch();
diff --git a/app/client/src/pages/Applications/__tests__/CreateOrganizationForm.test.tsx b/app/client/src/pages/Applications/__tests__/CreateOrganizationForm.test.tsx
deleted file mode 100644
index df9df4fa2e..0000000000
--- a/app/client/src/pages/Applications/__tests__/CreateOrganizationForm.test.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from "react";
-import userEvent from "@testing-library/user-event";
-import { unmountComponentAtNode } from "react-dom";
-import { render, fireEvent } from "test/testUtils";
-import { act } from "react-dom/test-utils";
-import CreateOrganisationMockResponse from "mockResponses/CreateOrganisationMockResponse.json";
-import Applications from "../index";
-
-let container: any = null;
-describe("Applications", () => {
-  beforeEach(async () => {
-    // setup a DOM element as a render target
-    container = document.createElement("div");
-    document.body.appendChild(container);
-  });
-  it("create a new organisation", async (done) => {
-    const { findByDataCy, findByText } = render(
-      <Applications
-        deleteApplication={() => {
-          console.log("Delete application");
-        }}
-      />,
-    );
-    const createOrgLink = await findByText("Create Organization");
-    // recommended to use act when dispatching events
-    // that might result in state updates
-    act(() => {
-      userEvent.click(createOrgLink);
-    });
-    const orgName = CreateOrganisationMockResponse.data.name;
-    const form = await findByDataCy("create-organisation-form");
-    const orgNameField = await findByDataCy("create-organisation-form__name");
-
-    act(() => {
-      userEvent.type(orgNameField, orgName);
-      fireEvent.submit(form);
-    });
-
-    await findByText(orgName);
-
-    await done();
-  });
-  afterEach(() => {
-    // cleanup on exiting
-    unmountComponentAtNode(container);
-    container.remove();
-    container = null;
-  });
-});
diff --git a/app/client/src/pages/Applications/index.tsx b/app/client/src/pages/Applications/index.tsx
index 83a8fdfad3..64c44d95a9 100644
--- a/app/client/src/pages/Applications/index.tsx
+++ b/app/client/src/pages/Applications/index.tsx
@@ -1,6 +1,5 @@
 import React, {
   Component,
-  Fragment,
   useContext,
   useEffect,
   useRef,
@@ -38,7 +37,6 @@ import FormDialogComponent from "components/editorComponents/form/FormDialogComp
 // import OnboardingHelper from "components/editorComponents/Onboarding/Helper";
 import { User } from "constants/userConstants";
 import { getCurrentUser } from "selectors/usersSelectors";
-import CreateOrganizationForm from "pages/organization/CreateOrganizationForm";
 import { CREATE_ORGANIZATION_FORM_NAME } from "constants/forms";
 import {
   DropdownOnSelectActions,
@@ -68,6 +66,7 @@ import EditableText, {
 } from "components/ads/EditableText";
 import { notEmptyValidator } from "components/ads/TextInput";
 import { saveOrg } from "actions/orgActions";
+import { leaveOrganization } from "actions/userActions";
 import CenteredWrapper from "../../components/designSystems/appsmith/CenteredWrapper";
 import NoSearchImage from "../../assets/images/NoSearchResult.svg";
 import { getNextEntityName, getRandomPaletteColor } from "utils/AppsmithUtils";
@@ -78,6 +77,16 @@ import ProductUpdatesModal from "pages/Applications/ProductUpdatesModal";
 import WelcomeHelper from "components/editorComponents/Onboarding/WelcomeHelper";
 import { useIntiateOnboarding } from "components/editorComponents/Onboarding/utils";
 import AnalyticsUtil from "utils/AnalyticsUtil";
+import { createOrganizationSubmitHandler } from "../organization/helpers";
+import UserApi from "api/UserApi";
+import ImportApplicationModal from "./ImportApplicationModal";
+import OnboardingForm from "./OnboardingForm";
+import { getAppsmithConfigs } from "configs";
+import { SIGNUP_SUCCESS_URL } from "constants/routes";
+import {
+  setOnboardingFormInProgress,
+  getOnboardingFormInProgress,
+} from "utils/storage";
 
 const OrgDropDown = styled.div`
   display: flex;
@@ -318,15 +327,6 @@ const textIconStyles = (props: { color: string; hover: string }) => {
   `;
 };
 
-const NewWorkspaceWrapper = styled.div`
-  ${(props) => {
-    return `${textIconStyles({
-      color: props.theme.colors.applications.textColor,
-      hover: props.theme.colors.applications.hover.textColor,
-    })}`;
-  }}
-`;
-
 const ApplicationAddCardWrapper = styled(Card)`
   display: flex;
   flex-direction: column;
@@ -360,7 +360,7 @@ const ApplicationAddCardWrapper = styled(Card)`
   }}
 `;
 
-function OrgMenuItem({ org, isFetchingApplications, selected }: any) {
+function OrgMenuItem({ isFetchingApplications, org, selected }: any) {
   const menuRef = useRef<HTMLAnchorElement>(null);
   useEffect(() => {
     if (selected) {
@@ -383,20 +383,15 @@ function OrgMenuItem({ org, isFetchingApplications, selected }: any) {
   );
 }
 
+const submitCreateOrganizationForm = async (data: any, dispatch: any) => {
+  const result = await createOrganizationSubmitHandler(data, dispatch);
+  return result;
+};
+
 function LeftPane() {
+  const dispatch = useDispatch();
   const fetchedUserOrgs = useSelector(getUserApplicationsOrgs);
   const isFetchingApplications = useSelector(getIsFetchingApplications);
-  const NewWorkspaceTrigger = (
-    <NewWorkspaceWrapper>
-      <MenuItem
-        className={isFetchingApplications ? BlueprintClasses.SKELETON : ""}
-        data-cy="create-organisation-link"
-        icon="plus"
-        key={"new-workspace"}
-        text={"Create Organization"}
-      />
-    </NewWorkspaceWrapper>
-  );
   let userOrgs;
   if (!isFetchingApplications) {
     userOrgs = fetchedUserOrgs;
@@ -416,11 +411,24 @@ function LeftPane() {
         isFetchingApplications={isFetchingApplications}
       >
         <WorkpsacesNavigator data-cy="t--left-panel">
-          <FormDialogComponent
-            Form={CreateOrganizationForm}
-            title={CREATE_ORGANIZATION_FORM_NAME}
-            trigger={NewWorkspaceTrigger}
-          />
+          {!isFetchingApplications && fetchedUserOrgs && (
+            <MenuItem
+              cypressSelector="t--org-new-organization-auto-create"
+              icon="plus"
+              onSelect={() =>
+                submitCreateOrganizationForm(
+                  {
+                    name: getNextEntityName(
+                      "Untitled organization ",
+                      fetchedUserOrgs.map((el: any) => el.organization.name),
+                    ),
+                  },
+                  dispatch,
+                )
+              }
+              text={CREATE_ORGANIZATION_FORM_NAME}
+            />
+          )}
           {userOrgs &&
             userOrgs.map((org: any) => (
               <OrgMenuItem
@@ -506,6 +514,7 @@ const NoSearchResultImg = styled.img`
 `;
 
 function ApplicationsSection(props: any) {
+  const enableImportExport = true;
   const dispatch = useDispatch();
   const theme = useContext(ThemeContext);
   const isSavingOrgInfo = useSelector(getIsSavingOrgInfo);
@@ -523,6 +532,8 @@ function ApplicationsSection(props: any) {
       });
     }
   };
+  const [warnLeavingOrganization, setWarnLeavingOrganization] = useState(false);
+  const [orgToOpenMenu, setOrgToOpenMenu] = useState<string | null>(null);
   const updateApplicationDispatch = (
     id: string,
     data: UpdateApplicationPayload,
@@ -535,8 +546,18 @@ function ApplicationsSection(props: any) {
   };
 
   const [selectedOrgId, setSelectedOrgId] = useState<string | undefined>();
+  const [
+    selectedOrgIdForImportApplication,
+    setSelectedOrgIdForImportApplication,
+  ] = useState<string | undefined>();
   const Form: any = OrgInviteUsersForm;
 
+  const leaveOrg = (orgId: string) => {
+    setWarnLeavingOrganization(false);
+    setOrgToOpenMenu(null);
+    dispatch(leaveOrganization(orgId));
+  };
+
   const OrgNameChange = (newName: string, orgId: string) => {
     dispatch(
       saveOrg({
@@ -551,10 +572,14 @@ function ApplicationsSection(props: any) {
     disabled?: boolean;
     orgSlug: string;
   }) {
-    const { orgName, disabled, orgSlug } = props;
+    const { disabled, orgName, orgSlug } = props;
 
     return (
-      <OrgNameWrapper className="t--org-name" disabled={disabled}>
+      <OrgNameWrapper
+        className="t--org-name"
+        disabled={disabled}
+        onClick={() => setOrgToOpenMenu(orgSlug)}
+      >
         <StyledAnchor id={orgSlug} />
         <OrgNameHolder
           className={isFetchingApplications ? BlueprintClasses.SKELETON : ""}
@@ -613,7 +638,7 @@ function ApplicationsSection(props: any) {
   } else {
     organizationsListComponent = updatedOrgs.map(
       (organizationObject: any, index: number) => {
-        const { organization, applications, userRoles } = organizationObject;
+        const { applications, organization, userRoles } = organizationObject;
         const hasManageOrgPermissions = isPermitted(
           organization.userPermissions,
           PERMISSION_TYPE.MANAGE_ORGANIZATION,
@@ -624,61 +649,107 @@ function ApplicationsSection(props: any) {
               {(currentUser || isFetchingApplications) && (
                 <Menu
                   className="t--org-name"
-                  disabled={!hasManageOrgPermissions || isFetchingApplications}
+                  cypressSelector="t--org-name"
+                  disabled={isFetchingApplications}
+                  isOpen={organization.slug === orgToOpenMenu}
+                  onClose={() => {
+                    setOrgToOpenMenu(null);
+                  }}
+                  onClosing={() => {
+                    setWarnLeavingOrganization(false);
+                  }}
                   position={Position.BOTTOM_RIGHT}
                   target={OrgMenuTarget({
                     orgName: organization.name,
-                    disabled: !hasManageOrgPermissions,
                     orgSlug: organization.slug,
                   })}
                 >
-                  <OrgRename
-                    defaultValue={organization.name}
-                    editInteractionKind={EditInteractionKind.SINGLE}
-                    fill
-                    hideEditIcon={false}
-                    isEditingDefault={false}
-                    isInvalid={(value: string) => {
-                      return notEmptyValidator(value).message;
-                    }}
-                    onBlur={(value: string) => {
-                      OrgNameChange(value, organization.id);
-                    }}
-                    placeholder="Workspace name"
-                    savingState={
-                      isSavingOrgInfo
-                        ? SavingState.STARTED
-                        : SavingState.NOT_STARTED
-                    }
-                    underline
-                  />
+                  {hasManageOrgPermissions && (
+                    <>
+                      <OrgRename
+                        cypressSelector="t--org-rename-input"
+                        defaultValue={organization.name}
+                        editInteractionKind={EditInteractionKind.SINGLE}
+                        fill
+                        hideEditIcon={false}
+                        isEditingDefault={false}
+                        isInvalid={(value: string) => {
+                          return notEmptyValidator(value).message;
+                        }}
+                        onBlur={(value: string) => {
+                          OrgNameChange(value, organization.id);
+                        }}
+                        placeholder="Workspace name"
+                        savingState={
+                          isSavingOrgInfo
+                            ? SavingState.STARTED
+                            : SavingState.NOT_STARTED
+                        }
+                        underline
+                      />
+                      <MenuItem
+                        cypressSelector="t--org-setting"
+                        icon="general"
+                        onSelect={() =>
+                          getOnSelectAction(DropdownOnSelectActions.REDIRECT, {
+                            path: `/org/${organization.id}/settings/general`,
+                          })
+                        }
+                        text="Organization Settings"
+                      />
+                      {enableImportExport && (
+                        <MenuItem
+                          cypressSelector="t--org-import-app"
+                          icon="upload"
+                          onSelect={() =>
+                            setSelectedOrgIdForImportApplication(
+                              organization.id,
+                            )
+                          }
+                          text="Import Application"
+                        />
+                      )}
+                      <MenuItem
+                        icon="share"
+                        onSelect={() => setSelectedOrgId(organization.id)}
+                        text="Share"
+                      />
+                      <MenuItem
+                        icon="user"
+                        onSelect={() =>
+                          getOnSelectAction(DropdownOnSelectActions.REDIRECT, {
+                            path: `/org/${organization.id}/settings/members`,
+                          })
+                        }
+                        text="Members"
+                      />
+                    </>
+                  )}
                   <MenuItem
-                    cypressSelector="t--org-setting"
-                    icon="general"
+                    icon="logout"
                     onSelect={() =>
-                      getOnSelectAction(DropdownOnSelectActions.REDIRECT, {
-                        path: `/org/${organization.id}/settings/general`,
-                      })
+                      !warnLeavingOrganization
+                        ? setWarnLeavingOrganization(true)
+                        : leaveOrg(organization.id)
                     }
-                    text="Organization Settings"
-                  />
-                  <MenuItem
-                    icon="share"
-                    onSelect={() => setSelectedOrgId(organization.id)}
-                    text="Share"
-                  />
-                  <MenuItem
-                    icon="user"
-                    onSelect={() =>
-                      getOnSelectAction(DropdownOnSelectActions.REDIRECT, {
-                        path: `/org/${organization.id}/settings/members`,
-                      })
+                    text={
+                      !warnLeavingOrganization
+                        ? "Leave Organization"
+                        : "Are you sure?"
                     }
-                    text="Members"
+                    type={!warnLeavingOrganization ? undefined : "warning"}
                   />
                 </Menu>
               )}
-
+              {selectedOrgIdForImportApplication && (
+                <ImportApplicationModal
+                  isModalOpen={
+                    selectedOrgIdForImportApplication === organization.id
+                  }
+                  onClose={() => setSelectedOrgIdForImportApplication("")}
+                  organizationId={selectedOrgIdForImportApplication}
+                />
+              )}
               {hasManageOrgPermissions && (
                 <StyledDialog
                   canEscapeKeyClose={false}
@@ -704,6 +775,7 @@ function ApplicationsSection(props: any) {
                         <ProfileImage
                           className="org-share-user-icons"
                           key={el.username}
+                          source={`/api/${UserApi.photoURL}/${el.username}`}
                           userName={el.name ? el.name : el.username}
                         />
                       ))}
@@ -782,6 +854,7 @@ function ApplicationsSection(props: any) {
                       application={application}
                       delete={deleteApplication}
                       duplicate={duplicateApplicationDispatch}
+                      enableImportExport={enableImportExport}
                       key={application.id}
                       update={updateApplicationDispatch}
                     />
@@ -819,15 +892,22 @@ type ApplicationProps = {
   currentUser?: User;
   searchKeyword: string | undefined;
 };
+
+const getIsFromSignup = () => {
+  return window.location?.pathname === SIGNUP_SUCCESS_URL;
+};
+
+const { onboardingFormEnabled } = getAppsmithConfigs();
 class Applications extends Component<
   ApplicationProps,
-  { selectedOrgId: string }
+  { selectedOrgId: string; showOnboardingForm: boolean }
 > {
   constructor(props: ApplicationProps) {
     super(props);
 
     this.state = {
       selectedOrgId: "",
+      showOnboardingForm: false,
     };
   }
 
@@ -835,20 +915,66 @@ class Applications extends Component<
     PerformanceTracker.stopTracking(PerformanceTransactionName.LOGIN_CLICK);
     PerformanceTracker.stopTracking(PerformanceTransactionName.SIGN_UP);
     this.props.getAllApplication();
+    window.addEventListener("message", this.handleTypeFormMessage, false);
+    this.showOnboardingForm();
   }
 
+  componentWillUnmount() {
+    window.removeEventListener("message", this.handleTypeFormMessage);
+  }
+
+  showOnboardingForm = async () => {
+    const isFromSignUp = getIsFromSignup();
+    const isOnboardingFormInProgress = await getOnboardingFormInProgress();
+    const showOnboardingForm =
+      onboardingFormEnabled && (isFromSignUp || isOnboardingFormInProgress);
+    this.setState({
+      showOnboardingForm: !!showOnboardingForm,
+    });
+
+    // Redirect directly in case we're not showing the onboarding form
+    if (isFromSignUp && !onboardingFormEnabled) {
+      this.redirectUsingQueryParam();
+    }
+  };
+
+  redirectUsingQueryParam = () => {
+    const urlObject = new URL(window.location.href);
+    const redirectUrl = urlObject?.searchParams.get("redirectUrl");
+    if (redirectUrl) {
+      try {
+        window.location.replace(redirectUrl);
+      } catch (e) {
+        console.error("Error handling the redirect url");
+      }
+    }
+  };
+
+  handleTypeFormMessage = (event: any) => {
+    if (event?.data?.type === "form-submit" && this.state.showOnboardingForm) {
+      setOnboardingFormInProgress();
+      this.redirectUsingQueryParam();
+    }
+  };
+
   public render() {
     return (
       <PageWrapper displayName="Applications">
-        <ProductUpdatesModal />
-        <LeftPane />
-        <SubHeader
-          search={{
-            placeholder: "Search for apps...",
-            queryFn: this.props.searchApplications,
-          }}
-        />
-        <ApplicationsSection searchKeyword={this.props.searchKeyword} />
+        {this.state.showOnboardingForm ? (
+          <OnboardingForm />
+        ) : (
+          <>
+            <ProductUpdatesModal />
+            <LeftPane />
+            <SubHeader
+              search={{
+                placeholder: "Search for apps...",
+                queryFn: this.props.searchApplications,
+              }}
+            />
+            <ApplicationsSection searchKeyword={this.props.searchKeyword} />
+          </>
+        )}
       </PageWrapper>
     );
   }
diff --git a/app/client/src/pages/Applications/permissionHelpers.tsx b/app/client/src/pages/Applications/permissionHelpers.tsx
index 0aac048df2..7ad434a6fe 100644
--- a/app/client/src/pages/Applications/permissionHelpers.tsx
+++ b/app/client/src/pages/Applications/permissionHelpers.tsx
@@ -2,10 +2,12 @@ export enum PERMISSION_TYPE {
   MANAGE_ORGANIZATION = "manage:organizations",
   CREATE_APPLICATION = "manage:orgApplications",
   MANAGE_APPLICATION = "manage:applications",
+  EXPORT_APPLICATION = "export:applications",
   READ_APPLICATION = "read:applications",
   READ_ORGANIZATION = "read:organizations",
   INVITE_USER_TO_ORGANIZATION = "inviteUsers:organization",
   MAKE_PUBLIC_APPLICATION = "makePublic:applications",
+  PUBLISH_APPLICATION = "publish:orgApplications",
 }
 
 export const isPermitted = (permissions: string[], type: string) => {
diff --git a/app/client/src/pages/Editor/APIEditor/ApiHomeScreen.tsx b/app/client/src/pages/Editor/APIEditor/ApiHomeScreen.tsx
deleted file mode 100644
index 72bb473d1b..0000000000
--- a/app/client/src/pages/Editor/APIEditor/ApiHomeScreen.tsx
+++ /dev/null
@@ -1,851 +0,0 @@
-import React from "react";
-import { Link } from "react-router-dom";
-import { connect } from "react-redux";
-import { reduxForm, InjectedFormProps, getFormValues } from "redux-form";
-import { Icon, Card } from "@blueprintjs/core";
-import styled from "styled-components";
-import InfiniteScroll from "react-infinite-scroller";
-import { DEFAULT_PROVIDER_OPTION } from "constants/ApiEditorConstants";
-import {
-  getCurlImportPageURL,
-  getProviderTemplatesURL,
-} from "constants/routes";
-import { SAAS_EDITOR_URL } from "pages/Editor/SaaSEditor/constants";
-import { AppState } from "reducers";
-import { ActionDataState } from "reducers/entityReducers/actionsReducer";
-import { getImportedCollections } from "selectors/applicationSelectors";
-import { TemplateList } from "constants/collectionsConstants";
-import {
-  ProvidersDataArray,
-  SearchResultsProviders,
-} from "constants/providerConstants";
-import {
-  getProviders,
-  getProvidersLoadingState,
-} from "selectors/applicationSelectors";
-import { getProviderCategories } from "selectors/editorSelectors";
-import { fetchImportedCollections } from "actions/collectionAction";
-import { API_HOME_SCREEN_FORM } from "constants/forms";
-import {
-  fetchProviders,
-  fetchProviderCategories,
-  fetchProvidersWithCategory,
-  clearProviders,
-  searchApiOrProvider,
-} from "actions/providerActions";
-import { Colors } from "constants/Colors";
-import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
-import { BaseTextInput } from "components/designSystems/appsmith/TextInputComponent";
-import { API_EDITOR_URL_WITH_SELECTED_PAGE_ID } from "constants/routes";
-import DropdownField from "components/editorComponents/form/fields/DropdownField";
-import Spinner from "components/editorComponents/Spinner";
-import CurlLogo from "assets/images/Curl-logo.svg";
-import { FetchProviderWithCategoryRequest } from "api/ProvidersApi";
-import { Plugin } from "api/PluginApi";
-import { createNewApiAction, setCurrentCategory } from "actions/apiPaneActions";
-import { getInitialsAndColorCode } from "utils/AppsmithUtils";
-import AnalyticsUtil, { EventLocation } from "utils/AnalyticsUtil";
-import { getAppsmithConfigs } from "configs";
-import { getAppCardColorPalette } from "selectors/themeSelectors";
-import { CURL } from "constants/AppsmithActionConstants/ActionConstants";
-import CloseEditor from "components/editorComponents/CloseEditor";
-import { PluginType } from "entities/Action";
-const { enableRapidAPI } = getAppsmithConfigs();
-
-const SearchContainer = styled.div`
-  display: flex;
-  width: 40%;
-  .closeBtn {
-    position: absolute;
-    left: 70%;
-  }
-`;
-
-const SearchBar = styled(BaseTextInput)`
-  margin-bottom: 10px;
-  input {
-    background-color: ${Colors.WHITE};
-    1px solid ${Colors.GEYSER};
-  }
-`;
-
-const ApiHomePage = styled.div`
-  font-size: 20px;
-  padding: 20px;
-  margin-left: 10px;
-  min-height: 95vh;
-  max-height: 95vh;
-  overflow: auto;
-  padding-bottom: 50px;
-  .closeBtn {
-    position: absolute;
-    left: 70%;
-  }
-  .searchResultsContainer {
-    background-color: ${Colors.WHITE};
-    z-index: 9999;
-    width: 70%;
-    padding: 20px;
-    border: 1px solid ${Colors.ALTO};
-    box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.1);
-    position: absolute;
-    border-radius: 4px;
-    max-height: 80vh;
-    overflow: auto;
-  }
-  .searchCloseBtn {
-    float: right;
-    cursor: pointer;
-  }
-  .bp3-collapse-body {
-    position: absolute;
-    z-index: 99999;
-    background-color: ${Colors.WHITE};
-    border: 1px solid ${Colors.ALTO};
-    box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.1);
-    border-radius: 4px;
-    width: 100%;
-    padding: 20px;
-  }
-  .fontSize16 {
-    font-size: 16px;
-  }
-`;
-
-const StyledContainer = styled.div`
-  flex: 1;
-  padding-top: 12px;
-  padding-bottom: 12px;
-
-  .sectionHeadings {
-    font-weight: 500;
-    font-size: 16px;
-  }
-  .link {
-    color: ${Colors.OXFORD_BLUE};
-  }
-  .link:hover {
-    color: ${Colors.OXFORD_BLUE};
-    text-decoration: none !important;
-  }
-  .textBtn {
-    font-size: 14px;
-    justify-content: center;
-    text-align: center;
-    letter-spacing: -0.17px;
-    color: ${Colors.OXFORD_BLUE};
-    font-weight: 500;
-    text-decoration: none !important;
-    flex-wrap: wrap;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  @media (min-width: 2500px) {
-    .textBtn {
-      font-size: 18px;
-    }
-  }
-  .link {
-    color: ${Colors.OXFORD_BLUE};
-  }
-  a:hover {
-    color: ${Colors.OXFORD_BLUE};
-    text-decoration: none;
-  }
-  .providerSearchCard {
-    display: flex;
-    color: ${Colors.BLACK};
-    padding: 5px;
-    cursor: pointer;
-  }
-  .providerSearchCard:hover {
-    background-color: ${Colors.CONCRETE};
-  }
-  .providerSearchResultImage {
-    height: 50px;
-    width: 60px;
-    object-fit: contain;
-  }
-  .providerSearchResultName {
-    display: flex;
-    align-self: center;
-    padding-left: 15px;
-    font-size: 16px;
-  }
-  .apiImage {
-    object-fit: contain;
-    height: 50px;
-    width: auto;
-    max-width: 100%;
-    margin-top: -5px;
-    margin-bottom: 10px;
-    min-height: 50px;
-  }
-  .curlImage {
-    width: 55px;
-  }
-  .saasImage.t--saas-google-sheets-plugin-image {
-    width: 40px;
-  }
-  .createIcon {
-    align-items: center;
-    margin-top: 15px;
-    margin-bottom: 25px;
-  }
-  .eachCard {
-    margin: 15px;
-    width: 140px;
-    height: 110px;
-    padding-bottom: 0px;
-    cursor: pointer;
-    border: 1px solid #e6e6e6;
-    box-shadow: none;
-  }
-  .eachCard:active {
-    border: 1px solid ${Colors.JAFFA_DARK};
-    background: rgba(242, 153, 74, 0.17);
-  }
-  .eachCard:hover {
-    border: 1px solid ${Colors.JAFFA_DARK};
-  }
-  @media (min-width: 2500px) {
-    .eachCard {
-      width: 240px;
-      height: 200px;
-    }
-    .apiImage {
-      margin-top: 25px;
-      margin-bottom: 20px;
-      height: 80px;
-    }
-    .curlImage {
-      width: 100px;
-    }
-    .createIcon {
-      height: 70px;
-    }
-  }
-`;
-
-const ApiCard = styled.div`
-  flex: 1;
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
-  column-gap: 10px;
-  flex-wrap: wrap;
-  margin-left: -10px;
-  text-align: center;
-  min-width: 150px;
-  border-radius: 4px;
-  width: 100%;
-  @media (min-width: 2500px) {
-    grid-template-columns: repeat(auto-fill, minmax(350px, 1fr));
-  }
-`;
-const CardList = styled.div`
-  margin: 15px;
-  .eachProviderCard {
-    width: 140px;
-    height: 110px;
-    padding-bottom: 0px;
-    cursor: pointer;
-    border: 1px solid #e6e6e6;
-    box-shadow: none;
-  }
-  .eachProviderCard:active {
-    border: 1px solid ${Colors.JAFFA_DARK};
-    background: rgba(242, 153, 74, 0.17);
-  }
-  .eachProviderCard:hover {
-    border: 1px solid ${Colors.JAFFA_DARK};
-  }
-  .providerInitials {
-    padding: 11px;
-    width: 70px;
-    margin: auto auto 14px;
-    color: ${Colors.WHITE};
-    border-radius: 2px;
-    fontsize: 16px;
-    font-weight: bold;
-    text-align: center;
-  }
-  @media (min-width: 2500px) {
-    .eachProviderCard {
-      width: 240px;
-      height: 200px;
-      padding-bottom: 0px;
-      cursor: pointer;
-      border: 1px solid #e6e6e6;
-      box-shadow: none;
-    }
-    .providerInitials {
-      padding: 25px;
-      width: 100px;
-      margin-top: 20px;
-      margin-bottom: 38px;
-    }
-  }
-`;
-
-const DropdownSelect = styled.div`
-  font-size: 14px;
-  float: right;
-  width: 232px;
-  margin-right: 25px;
-  margin-bottom: 25px;
-`;
-
-const LoadingContainer = styled(CenteredWrapper)`
-  height: 50%;
-`;
-
-const PageLoadingContainer = styled(CenteredWrapper)`
-  margin-top: 100px;
-  height: 50%;
-`;
-
-type ApiHomeScreenProps = {
-  initialValues: {
-    category: string;
-  };
-  currentCategory: string;
-  importedCollections: TemplateList[];
-  fetchImportedCollections: () => void;
-  providers: ProvidersDataArray[];
-  fetchProviders: () => void;
-  clearProviders: () => void;
-  fetchProviderCategories: () => void;
-  searchApiOrProvider: (searchKey: string) => void;
-  providerCategories: string[];
-  apiOrProviderSearchResults: {
-    providers: SearchResultsProviders[];
-  };
-  pageId: string;
-  plugins: Plugin[];
-  applicationId: string;
-  actions: ActionDataState;
-  fetchProvidersWithCategory: (
-    request: FetchProviderWithCategoryRequest,
-  ) => void;
-  location: {
-    search: string;
-  };
-  match: {
-    url: string;
-  };
-  history: {
-    replace: (data: string) => void;
-    push: (data: string) => void;
-  };
-  isFetchingProviders: boolean;
-  providersTotal: number;
-  isSwitchingCategory: boolean;
-  createNewApiAction: (pageId: string, from: EventLocation) => void;
-  setCurrentCategory: (category: string) => void;
-  previouslySetCategory: string;
-  fetchProvidersError: boolean;
-  colorPalette: string[];
-};
-
-type ApiHomeScreenState = {
-  page: number;
-  showSearchResults: boolean;
-};
-
-type Props = ApiHomeScreenProps &
-  InjectedFormProps<{ category: string }, ApiHomeScreenProps>;
-
-class ApiHomeScreen extends React.Component<Props, ApiHomeScreenState> {
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      page: 1,
-      showSearchResults: false,
-    };
-  }
-
-  componentDidMount() {
-    const {
-      importedCollections,
-      providersTotal,
-      providerCategories,
-    } = this.props;
-    if (providerCategories.length === 0 && enableRapidAPI) {
-      this.props.fetchProviderCategories();
-    }
-    if (importedCollections.length === 0 && enableRapidAPI) {
-      this.props.fetchImportedCollections();
-    }
-    if (!providersTotal && enableRapidAPI) {
-      this.props.clearProviders();
-      this.props.change("category", DEFAULT_PROVIDER_OPTION);
-      this.props.fetchProvidersWithCategory({
-        category: DEFAULT_PROVIDER_OPTION,
-        page: 1,
-      });
-    }
-  }
-
-  componentDidUpdate(prevProps: Props) {
-    if (
-      prevProps.currentCategory !== this.props.currentCategory &&
-      this.props.currentCategory !== this.props.previouslySetCategory &&
-      enableRapidAPI
-    ) {
-      this.props.setCurrentCategory(this.props.currentCategory);
-      this.props.clearProviders();
-      this.props.fetchProvidersWithCategory({
-        category: this.props.currentCategory,
-        page: 1,
-      });
-    }
-  }
-
-  handleCreateNew = () => {
-    const pageId = new URLSearchParams(this.props.location.search).get(
-      "importTo",
-    );
-    if (pageId) {
-      this.props.createNewApiAction(pageId, "API_PANE");
-    }
-  };
-
-  handleSearchChange = (e: React.ChangeEvent<{ value: string }>) => {
-    const { searchApiOrProvider } = this.props;
-    const value = e.target.value;
-    if (value) {
-      searchApiOrProvider(value);
-      this.setState({ showSearchResults: true });
-    } else {
-      this.setState({ showSearchResults: false });
-    }
-  };
-
-  handleFetchMoreProviders = (page: number) => {
-    const { currentCategory } = this.props;
-    this.props.fetchProvidersWithCategory({
-      category: currentCategory,
-      page: page,
-    });
-  };
-
-  render() {
-    const {
-      // importedCollections,
-      providers,
-      applicationId,
-      pageId,
-      location,
-      history,
-      // isFetchingProviders,
-      providerCategories,
-      providersTotal,
-      isSwitchingCategory,
-      apiOrProviderSearchResults,
-      fetchProvidersError,
-    } = this.props;
-    const { showSearchResults } = this.state;
-
-    let destinationPageId = new URLSearchParams(location.search).get(
-      "importTo",
-    );
-
-    if (!destinationPageId) {
-      destinationPageId = pageId;
-      history.push(
-        API_EDITOR_URL_WITH_SELECTED_PAGE_ID(applicationId, pageId, pageId),
-      );
-    }
-    const curlImportURL =
-      getCurlImportPageURL(applicationId, pageId) + location.search;
-
-    const PROVIDER_CATEGORIES_OPTIONS = providerCategories.map((category) => ({
-      label: category,
-      value: category,
-    }));
-
-    const ApiHomepageTopSection = (
-      <>
-        {enableRapidAPI && (
-          <SearchContainer>
-            <SearchBar
-              icon="search"
-              input={{
-                onChange: this.handleSearchChange,
-                onFocus: (e) => {
-                  if (e.target.value) {
-                    this.setState({ showSearchResults: true });
-                  } else {
-                    this.setState({ showSearchResults: false });
-                  }
-                },
-              }}
-              placeholder="Search"
-            />
-          </SearchContainer>
-        )}
-        {enableRapidAPI && (
-          <div>
-            {showSearchResults && (
-              <div className="searchResultsContainer">
-                <Icon
-                  className="searchCloseBtn"
-                  icon="cross"
-                  iconSize={20}
-                  onClick={() => {
-                    this.setState({ showSearchResults: false });
-                  }}
-                />
-                <StyledContainer>
-                  <div>
-                    <p className="sectionHeadings">{"Providers"}</p>
-                    {apiOrProviderSearchResults.providers.map(
-                      (providerSearchResult) => (
-                        <React.Fragment key={providerSearchResult.id}>
-                          <p
-                            className="providerSearchCard"
-                            onClick={() =>
-                              history.push(
-                                getProviderTemplatesURL(
-                                  applicationId,
-                                  pageId,
-                                  providerSearchResult.id +
-                                    `/?importTo=${destinationPageId}`,
-                                ),
-                              )
-                            }
-                          >
-                            {providerSearchResult.imageUrl ? (
-                              <img
-                                alt="img"
-                                className="providerSearchResultImage"
-                                src={providerSearchResult.imageUrl}
-                              />
-                            ) : (
-                              <div
-                                style={{
-                                  backgroundColor: getInitialsAndColorCode(
-                                    providerSearchResult.name,
-                                    this.props.colorPalette,
-                                  )[1],
-                                  padding: 11,
-                                  width: 60,
-                                  color: "#fff",
-                                  borderRadius: 2,
-                                  fontSize: 16,
-                                  fontWeight: "bold",
-                                  textAlign: "center",
-                                }}
-                              >
-                                <span>
-                                  {
-                                    getInitialsAndColorCode(
-                                      providerSearchResult.name,
-                                      this.props.colorPalette,
-                                    )[0]
-                                  }
-                                </span>
-                              </div>
-                            )}
-                            <span className="providerSearchResultName">
-                              {providerSearchResult.name}
-                              {/* |{" "} {providerSearchResult.noOfApis} APIs */}
-                            </span>
-                          </p>
-                        </React.Fragment>
-                      ),
-                    )}
-                  </div>
-                </StyledContainer>
-              </div>
-            )}
-          </div>
-        )}
-        <StyledContainer>
-          <p className="sectionHeadings">{"Import API"}</p>
-          <ApiCard>
-            <Card
-              className="eachCard t--createBlankApiCard"
-              interactive={false}
-              onClick={this.handleCreateNew}
-            >
-              <Icon className="createIcon" icon="plus" iconSize={20} />
-              <p className="textBtn">Create new</p>
-            </Card>
-
-            {/* <Card interactive={false} className="eachCard">
-              <img src={PostmanLogo} className="apiImage" alt="Postman"></img>
-              <p className="textBtn">Postman</p>
-            </Card> */}
-
-            <Link
-              onClick={() => {
-                AnalyticsUtil.logEvent("IMPORT_API_CLICK", {
-                  importSource: CURL,
-                });
-              }}
-              to={curlImportURL}
-            >
-              <Card className="eachCard" interactive={false}>
-                <img
-                  alt="CURL"
-                  className="curlImage t--curlImage"
-                  src={CurlLogo}
-                />
-                <p className="textBtn">CURL</p>
-              </Card>
-            </Link>
-            {/**
-             * Loop over all Saas plugins
-             */}
-            {this.props.plugins
-              .filter((p) => p.type === PluginType.SAAS)
-              .map((p) => (
-                <Link
-                  key={p.id}
-                  to={
-                    SAAS_EDITOR_URL(applicationId, pageId, p.packageName) +
-                    location.search
-                  }
-                >
-                  <Card className="eachCard" interactive={false}>
-                    <img
-                      alt={p.name}
-                      className={
-                        "saasImage t--saas-" + p.packageName + "-image"
-                      }
-                      src={p.iconLocation}
-                    />
-                    <p className="textBtn">{p.name}</p>
-                  </Card>
-                </Link>
-              ))}
-          </ApiCard>
-        </StyledContainer>
-        {/* Imported APIs section start */}
-        {/* <StyledContainer>
-          <p className="sectionHeadings">{"Imported APIs"}</p>
-
-          {importedCollections.length > 0 ? (
-            <ImportedApisCard>
-              {importedCollections.map(importedCollection => (
-                <Card
-                  key={importedCollection.id}
-                  interactive={false}
-                  className="eachImportedApiCard"
-                >
-                  <Icon
-                    icon="folder-close"
-                    iconSize={20}
-                    className="importedApiIcon"
-                  />
-                  <p className="textBtn">{importedCollection.name}</p>
-                </Card>
-              ))}
-            </ImportedApisCard>
-          ) : (
-            <NoCollections>
-              <p>
-                Your imported APIs will appear here. You can import APIs from
-                the options in the above section.
-              </p>
-            </NoCollections>
-          )}
-        </StyledContainer> */}
-      </>
-    );
-
-    return (
-      <ApiHomePage
-        className="t--apiHomePage"
-        style={{ overflow: showSearchResults ? "hidden" : "auto" }}
-      >
-        <CloseEditor />
-        {isSwitchingCategory || !enableRapidAPI ? (
-          <>
-            {ApiHomepageTopSection}
-            {enableRapidAPI && isSwitchingCategory && (
-              <PageLoadingContainer>
-                <Spinner size={30} />
-              </PageLoadingContainer>
-            )}
-          </>
-        ) : (
-          <InfiniteScroll
-            hasMore={providers.length < providersTotal}
-            initialLoad={false}
-            loadMore={this.handleFetchMoreProviders.bind(this)}
-            loader={
-              <LoadingContainer>
-                <Spinner size={30} />
-              </LoadingContainer>
-            }
-            pageStart={0}
-            useWindow={false}
-          >
-            {ApiHomepageTopSection}
-            {/* Marketplace APIs section start */}
-            <StyledContainer>
-              <div>
-                <div style={{ float: "left" }}>
-                  <p className="sectionHeadings">{"Marketplace APIs"}</p>
-                </div>
-                <div>
-                  <DropdownSelect>
-                    <DropdownField
-                      name="category"
-                      options={PROVIDER_CATEGORIES_OPTIONS}
-                      placeholder="All APIs"
-                      width={232}
-                    />
-                  </DropdownSelect>
-                </div>
-              </div>
-
-              <br />
-              <br />
-
-              {isSwitchingCategory ? (
-                <LoadingContainer>
-                  <Spinner size={30} />
-                </LoadingContainer>
-              ) : fetchProvidersError ? (
-                <div>
-                  <p className="fontSize16">No providers found.</p>
-                </div>
-              ) : (
-                <div>
-                  <ApiCard>
-                    {providers.map((provider, index) => (
-                      <CardList
-                        key={index}
-                        onClick={() => {
-                          AnalyticsUtil.logEvent("3P_PROVIDER_CLICK", {
-                            providerName: provider.name,
-                          });
-                          history.push(
-                            getProviderTemplatesURL(
-                              applicationId,
-                              pageId,
-                              provider.id + `/?importTo=${destinationPageId}`,
-                            ),
-                          );
-                        }}
-                      >
-                        <Card
-                          className="eachProviderCard t--eachProviderCard"
-                          interactive={false}
-                        >
-                          {provider.imageUrl ? (
-                            <img
-                              alt="Provider"
-                              className="apiImage"
-                              src={provider.imageUrl}
-                            />
-                          ) : (
-                            <div
-                              className="providerInitials"
-                              style={{
-                                backgroundColor: getInitialsAndColorCode(
-                                  provider.name,
-                                  this.props.colorPalette,
-                                )[1],
-                              }}
-                            >
-                              <span>
-                                {
-                                  getInitialsAndColorCode(
-                                    provider.name,
-                                    this.props.colorPalette,
-                                  )[0]
-                                }
-                              </span>
-                            </div>
-                          )}
-                          {provider.name && (
-                            <p className="textBtn" title={provider.name}>
-                              {provider.name}
-                            </p>
-                          )}
-                        </Card>
-                      </CardList>
-                    ))}
-                  </ApiCard>
-                </div>
-              )}
-            </StyledContainer>
-            {/* Marketplace APIs section end */}
-          </InfiniteScroll>
-        )}
-      </ApiHomePage>
-    );
-  }
-}
-
-const mapStateToProps = (state: AppState) => {
-  const { providers } = state.ui;
-  const {
-    providersTotal,
-    isSwitchingCategory,
-    fetchProvidersError,
-    apiOrProviderSearchResults,
-  } = providers;
-  const formData = getFormValues(API_HOME_SCREEN_FORM)(
-    state,
-  ) as FetchProviderWithCategoryRequest;
-  let category = DEFAULT_PROVIDER_OPTION;
-
-  if (formData) {
-    category = formData.category;
-  }
-
-  let initialCategoryValue;
-  if (state.ui.apiPane.currentCategory === "") {
-    initialCategoryValue = DEFAULT_PROVIDER_OPTION;
-  } else {
-    initialCategoryValue = state.ui.apiPane.currentCategory;
-  }
-
-  return {
-    currentCategory: category,
-    importedCollections: getImportedCollections(state),
-    providers: getProviders(state),
-    isFetchingProviders: getProvidersLoadingState(state),
-    actions: state.entities.actions,
-    providersTotal,
-    providerCategories: getProviderCategories(state),
-    plugins: state.entities.plugins.list,
-    isSwitchingCategory,
-    apiOrProviderSearchResults,
-    previouslySetCategory: state.ui.apiPane.currentCategory,
-    initialValues: { category: initialCategoryValue },
-    fetchProvidersError,
-    colorPalette: getAppCardColorPalette(state),
-  };
-};
-
-const mapDispatchToProps = (dispatch: any) => ({
-  fetchImportedCollections: () => dispatch(fetchImportedCollections()),
-  fetchProviders: () => dispatch(fetchProviders()),
-  clearProviders: () => dispatch(clearProviders()),
-  fetchProviderCategories: () => dispatch(fetchProviderCategories()),
-  fetchProvidersWithCategory: (request: FetchProviderWithCategoryRequest) =>
-    dispatch(fetchProvidersWithCategory(request)),
-  searchApiOrProvider: (searchKey: string) =>
-    dispatch(searchApiOrProvider({ searchKey })),
-  createNewApiAction: (pageId: string, from: EventLocation) =>
-    dispatch(createNewApiAction(pageId, from)),
-  setCurrentCategory: (category: string) =>
-    dispatch(setCurrentCategory(category)),
-});
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-)(
-  reduxForm<{ category: string }, ApiHomeScreenProps>({
-    form: API_HOME_SCREEN_FORM,
-  })(ApiHomeScreen),
-);
diff --git a/app/client/src/pages/Editor/APIEditor/CurlImportForm.tsx b/app/client/src/pages/Editor/APIEditor/CurlImportForm.tsx
index e3d8c8b84e..c0c8f93737 100644
--- a/app/client/src/pages/Editor/APIEditor/CurlImportForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/CurlImportForm.tsx
@@ -2,7 +2,6 @@ import React from "react";
 import { reduxForm, InjectedFormProps, Form, Field } from "redux-form";
 import { connect } from "react-redux";
 import { withRouter, RouteComponentProps } from "react-router";
-import { Icon } from "@blueprintjs/core";
 import styled from "styled-components";
 import { AppState } from "reducers";
 import { ActionDataState } from "reducers/entityReducers/actionsReducer";
@@ -13,6 +12,7 @@ import { createNewApiName } from "utils/AppsmithUtils";
 import { Colors } from "constants/Colors";
 import Button from "components/editorComponents/Button";
 import CurlLogo from "assets/images/Curl-logo.svg";
+import CloseEditor from "../../../components/editorComponents/CloseEditor";
 
 const CurlImportFormContainer = styled.div`
   display: flex;
@@ -59,7 +59,7 @@ const CurlImport = styled.div`
 `;
 
 const CurlContainer = styled.div`
-  margin-top: 8vh;
+  margin-top: 20px;
   padding-left: 70px;
   padding-right: 70px;
 
@@ -115,9 +115,10 @@ type Props = StateAndRouteProps &
 
 class CurlImportForm extends React.Component<Props> {
   render() {
-    const { handleSubmit, history, isImportingCurl } = this.props;
+    const { handleSubmit, isImportingCurl } = this.props;
     return (
       <>
+        <CloseEditor />
         <Header>
           <p className="header">
             <img alt="CURL" className="curlImage" src={CurlLogo} />
@@ -127,15 +128,6 @@ class CurlImportForm extends React.Component<Props> {
         </Header>
         <Form onSubmit={handleSubmit(curlImportSubmitHandler)}>
           <CurlImport>
-            <Icon
-              className="backBtn"
-              icon="chevron-left"
-              iconSize={16}
-              onClick={() => history.goBack()}
-            />
-            <span className="backBtnText" onClick={() => history.goBack()}>
-              {" Back"}
-            </span>
             <CurlContainer>
               <label className="inputLabel">{"Paste CURL Code Here"}</label>
               <CurlLabel>
@@ -173,9 +165,7 @@ class CurlImportForm extends React.Component<Props> {
 }
 
 const mapStateToProps = (state: AppState, props: Props): ReduxStateProps => {
-  const destinationPageId = new URLSearchParams(props.location.search).get(
-    "importTo",
-  );
+  const { pageId: destinationPageId } = props.match.params;
 
   if (destinationPageId) {
     return {
diff --git a/app/client/src/pages/Editor/APIEditor/DatasourceList.tsx b/app/client/src/pages/Editor/APIEditor/DatasourceList.tsx
new file mode 100644
index 0000000000..bf28daf820
--- /dev/null
+++ b/app/client/src/pages/Editor/APIEditor/DatasourceList.tsx
@@ -0,0 +1,205 @@
+import React, { useState } from "react";
+import styled from "styled-components";
+import Icon, { IconSize } from "components/ads/Icon";
+import { StyledSeparator } from "pages/Applications/ProductUpdatesModal/ReleaseComponent";
+import { DATA_SOURCES_EDITOR_ID_URL } from "constants/routes";
+import history from "utils/history";
+import { TabComponent } from "components/ads/Tabs";
+import Text, { FontWeight, TextType } from "components/ads/Text";
+import { TabbedViewContainer } from "./Form";
+import get from "lodash/get";
+
+const EmptyDatasourceContainer = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 280px;
+  padding: 50px;
+  border-left: 2px solid ${(props) => props.theme.colors.apiPane.dividerBg};
+  height: 100%;
+`;
+
+const DatasourceContainer = styled.div`
+  .react-tabs__tab-list {
+    padding: 0 16px !important;
+    border-bottom: none;
+    border-left: 2px solid #e8e8e8;
+    .cs-icon {
+      margin-right: 0;
+    }
+  }
+`;
+
+const DataSourceListWrapper = styled.div`
+  width: 0;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  border-left: 2px solid ${(props) => props.theme.colors.apiPane.dividerBg};
+  overflow: auto;
+  transition: width 2s;
+  background: white;
+  &.show {
+    width: 280px;
+  }
+`;
+
+const DatasourceCard = styled.div`
+  margin-bottom: 10px;
+  width: 100%;
+  padding: 10px;
+  display: flex;
+  flex-direction: column;
+  background: #ffffff;
+  border: 1px solid ${(props) => props.theme.colors.apiPane.dividerBg};
+  cursor: pointer;
+  transition: 0.3s all ease;
+  .cs-icon {
+    opacity: 0;
+    transition: 0.3s all ease;
+  }
+  &:hover {
+    box-shadow: 0 0 5px #c7c7c7;
+    .cs-icon {
+      opacity: 1;
+    }
+  }
+`;
+
+const DatasourceURL = styled.span`
+  margin: 8px 0;
+  font-size: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: #457ae6;
+  width: fit-content;
+  max-width: 100%;
+  font-weight: 500;
+`;
+
+const PadTop = styled.div`
+  padding-top: 5px;
+  border: none;
+`;
+
+const DataSourceNameContainer = styled.div`
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  .cs-text {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  .cs-icon {
+    flex-shrink: 0;
+    svg {
+      path {
+        fill: #4b4848;
+      }
+    }
+    &:hover {
+      background-color: ${(props) => props.theme.colors.apiPane.iconHoverBg};
+    }
+  }
+`;
+
+export const getDatasourceInfo = (datasource: any): string => {
+  const info = [];
+  const headers = get(datasource, "datasourceConfiguration.headers", []);
+  const authType = get(
+    datasource,
+    "datasourceConfiguration.authentication.authenticationType",
+    "",
+  ).toUpperCase();
+  if (headers.length)
+    info.push(`${headers.length} HEADER${headers.length > 1 ? "S" : ""}`);
+  if (authType.length) info.push(authType);
+  return info.join(" | ");
+};
+
+export default function DataSourceList(props: any) {
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  return (
+    <DatasourceContainer>
+      <TabbedViewContainer>
+        <TabComponent
+          onSelect={setSelectedIndex}
+          selectedIndex={selectedIndex}
+          tabs={[
+            {
+              key: "datasources",
+              title: "Datasources",
+              icon: "datasource",
+              iconSize: IconSize.LARGE,
+              panelComponent:
+                props.datasources && props.datasources.length > 0 ? (
+                  <DataSourceListWrapper
+                    className={selectedIndex === 0 ? "show" : ""}
+                  >
+                    {(props.datasources || []).map((d: any, idx: number) => {
+                      const dataSourceInfo: string = getDatasourceInfo(d);
+                      return (
+                        <DatasourceCard
+                          key={idx}
+                          onClick={() => props.onClick(d)}
+                        >
+                          <DataSourceNameContainer>
+                            <Text type={TextType.H5} weight={FontWeight.BOLD}>
+                              {d.name}
+                            </Text>
+                            <Icon
+                              name="edit"
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                history.push(
+                                  DATA_SOURCES_EDITOR_ID_URL(
+                                    props.applicationId,
+                                    props.currentPageId,
+                                    d.id,
+                                  ),
+                                );
+                              }}
+                              size={IconSize.LARGE}
+                            />
+                          </DataSourceNameContainer>
+                          <DatasourceURL>
+                            {d.datasourceConfiguration.url}
+                          </DatasourceURL>
+                          {dataSourceInfo && (
+                            <>
+                              <StyledSeparator />
+                              <PadTop>
+                                <Text
+                                  type={TextType.P3}
+                                  weight={FontWeight.NORMAL}
+                                >
+                                  {dataSourceInfo}
+                                </Text>
+                              </PadTop>
+                            </>
+                          )}
+                        </DatasourceCard>
+                      );
+                    })}
+                  </DataSourceListWrapper>
+                ) : (
+                  <EmptyDatasourceContainer>
+                    <Text
+                      textAlign="center"
+                      type={TextType.P3}
+                      weight={FontWeight.NORMAL}
+                    >
+                      When you save a datasource, it will show up here.
+                    </Text>
+                  </EmptyDatasourceContainer>
+                ),
+            },
+          ]}
+        />
+      </TabbedViewContainer>
+    </DatasourceContainer>
+  );
+}
diff --git a/app/client/src/pages/Editor/APIEditor/Form.tsx b/app/client/src/pages/Editor/APIEditor/Form.tsx
index e0a93284bb..9976047873 100644
--- a/app/client/src/pages/Editor/APIEditor/Form.tsx
+++ b/app/client/src/pages/Editor/APIEditor/Form.tsx
@@ -1,6 +1,11 @@
 import React, { useState } from "react";
 import { connect, useSelector, useDispatch } from "react-redux";
-import { formValueSelector, InjectedFormProps, reduxForm } from "redux-form";
+import {
+  formValueSelector,
+  InjectedFormProps,
+  reduxForm,
+  change,
+} from "redux-form";
 import {
   HTTP_METHOD_OPTIONS,
   HTTP_METHODS,
@@ -27,7 +32,7 @@ import { ExplorerURLParams } from "../Explorer/helpers";
 import MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu";
 import Icon from "components/ads/Icon";
 import Button, { Size } from "components/ads/Button";
-import { TabComponent } from "components/ads/Tabs";
+import { TabComponent, TabTitle } from "components/ads/Tabs";
 import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import Text, { Case, TextType } from "components/ads/Text";
 import { Classes, Variant } from "components/ads/common";
@@ -37,11 +42,18 @@ import { createMessage, WIDGET_BIND_HELP } from "constants/messages";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import CloseEditor from "components/editorComponents/CloseEditor";
 import { useParams } from "react-router";
-
+import { Icon as ButtonIcon } from "@blueprintjs/core";
+import { IconSize } from "components/ads/Icon";
+import get from "lodash/get";
+import DataSourceList from "./DatasourceList";
+import { Datasource } from "entities/Datasource";
 const Form = styled.form`
   display: flex;
   flex-direction: column;
-  height: calc(100vh - ${(props) => props.theme.smallHeaderHeight});
+  height: calc(
+    100vh - ${(props) => props.theme.smallHeaderHeight} -
+      ${(props) => props.theme.backBanner}
+  );
   overflow: hidden;
   width: 100%;
   ${FormLabel} {
@@ -61,10 +73,9 @@ const Form = styled.form`
 `;
 
 const MainConfiguration = styled.div`
-  padding: ${(props) => props.theme.spaces[8]}px
-    ${(props) => props.theme.spaces[12]}px 0px
-    ${(props) => props.theme.spaces[12]}px;
-  background-color: ${(props) => props.theme.colors.apiPane.bg};
+  padding: ${(props) => props.theme.spaces[4]}px
+    ${(props) => props.theme.spaces[10]}px 0px
+    ${(props) => props.theme.spaces[10]}px;
   height: 124px;
 `;
 
@@ -91,15 +102,18 @@ const DatasourceWrapper = styled.div`
 const SecondaryWrapper = styled.div`
   display: flex;
   flex-direction: column;
-  height: calc(100% - 126px);
+  flex-grow: 1;
+  height: 100%;
   ${HelpSection} {
     margin-bottom: 10px;
   }
 `;
 
-const TabbedViewContainer = styled.div`
+export const TabbedViewContainer = styled.div`
   flex: 1;
   overflow: auto;
+  position: relative;
+  height: 100%;
   border-top: 2px solid ${(props) => props.theme.colors.apiPane.dividerBg};
   ${FormRow} {
     min-height: auto;
@@ -136,7 +150,7 @@ const SettingsWrapper = styled.div`
 `;
 
 const TabSection = styled.div`
-  background-color: ${(props) => props.theme.colors.apiPane.bg};
+  background: white;
   height: 100%;
   overflow: auto;
 `;
@@ -164,6 +178,12 @@ const Link = styled.a`
   }
 `;
 
+const Wrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+  height: calc(100% - 126px);
+  position: relative;
+`;
 interface APIFormProps {
   pluginId: string;
   onRunClick: (paginationField?: PaginationField) => void;
@@ -174,6 +194,7 @@ interface APIFormProps {
   appName: string;
   httpMethodFromForm: string;
   actionConfigurationHeaders?: any;
+  datasourceHeaders?: any;
   actionName: string;
   apiId: string;
   apiName: string;
@@ -181,6 +202,10 @@ interface APIFormProps {
   paramsCount: number;
   settingsConfig: any;
   hintMessages?: Array<string>;
+  datasources?: any;
+  currentPageId?: string;
+  applicationId?: string;
+  updateDatasource: (datasource: Datasource) => void;
 }
 
 type Props = APIFormProps & InjectedFormProps<Action, APIFormProps>;
@@ -195,25 +220,241 @@ export const NameWrapper = styled.div`
   }
 `;
 
+export const ShowHideImportedHeaders = styled.button`
+  background: #ebebeb;
+  color: #4b4848;
+  padding: 3px 5px;
+  border: none;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  font-size: 12px;
+  height: 20px;
+`;
+
+const Flex = styled.div<{ size: number }>`
+  flex: ${(props) => props.size};
+  ${(props) =>
+    props.size === 3
+      ? `
+    margin-left: ${props.theme.spaces[4]}px;
+  `
+      : null};
+  width: 100%;
+  position: relative;
+  min-height: 32px;
+  height: auto;
+  background-color: #fafafa;
+  border-color: #d3dee3;
+  border-bottom: 1px solid #e8e8e8;
+  color: #4b4848;
+  display: flex;
+  align-items: center;
+`;
+
+const FlexContainer = styled.div`
+  display: flex;
+  align-items: center;
+  width: calc(100% - 30px);
+
+  .key-value {
+    padding: ${(props) => props.theme.spaces[2]}px 0px
+      ${(props) => props.theme.spaces[2]}px
+      ${(props) => props.theme.spaces[1]}px;
+    .${Classes.TEXT} {
+      color: ${(props) => props.theme.colors.apiPane.text};
+    }
+  }
+  .key-value:nth-child(2) {
+    margin-left: ${(props) => props.theme.spaces[4]}px;
+  }
+  .disabled {
+    background: #e8e8e8;
+    margin-bottom: 2px;
+  }
+`;
+
+const KeyValueStackContainer = styled.div`
+  padding: ${(props) => props.theme.spaces[4]}px
+    ${(props) => props.theme.spaces[14]}px 0
+    ${(props) => props.theme.spaces[11] + 2}px;
+`;
+const FormRowWithLabel = styled(FormRow)`
+  flex-wrap: wrap;
+  ${FormLabel} {
+    width: 100%;
+  }
+  & svg {
+    cursor: pointer;
+  }
+`;
+
+function ImportedHeaderKeyValue(props: { headers: any }) {
+  return (
+    <>
+      {props.headers.map((header: any, index: number) => {
+        return (
+          <FormRowWithLabel key={index}>
+            <FlexContainer>
+              <Flex className="key-value disabled" size={1}>
+                <Text type={TextType.H6}>{header.key}</Text>
+              </Flex>
+              <Flex className="key-value disabled" size={3}>
+                <Text type={TextType.H6}>{header.value}</Text>
+              </Flex>
+            </FlexContainer>
+          </FormRowWithLabel>
+        );
+      })}
+    </>
+  );
+}
+
+const DatasourceListTrigger = styled.div`
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  color: #939090;
+  &:hover {
+    span {
+      color: #090707;
+    }
+    svg path {
+      fill: #090707;
+    }
+  }
+`;
+
+const BoundaryContainer = styled.div`
+  border: 1px solid transparent;
+  border-right: none;
+`;
+
+function renderImportedHeadersButton(
+  headersCount: number,
+  onClick: any,
+  showInheritedAttributes: boolean,
+) {
+  return (
+    <KeyValueStackContainer>
+      <ShowHideImportedHeaders
+        onClick={(e) => {
+          e.preventDefault();
+          onClick(!showInheritedAttributes);
+        }}
+      >
+        <ButtonIcon
+          icon={showInheritedAttributes ? "eye-open" : "eye-off"}
+          iconSize={14}
+        />
+        &nbsp;&nbsp;
+        <Text case={Case.CAPITALIZE} type={TextType.P2}>
+          {showInheritedAttributes
+            ? "Showing inherited headers"
+            : `${headersCount} headers`}
+        </Text>
+      </ShowHideImportedHeaders>
+    </KeyValueStackContainer>
+  );
+}
+
+const CloseIconContainer = styled.div`
+  position: absolute;
+  top: 12px;
+  right: 10px;
+  svg {
+    path {
+      fill: #a9a7a7;
+    }
+  }
+`;
+
+function renderHelpSection(
+  handleClickLearnHow: any,
+  setApiBindHelpSectionVisible: any,
+) {
+  return (
+    <HelpSection>
+      <Callout
+        closeButton
+        fill
+        label={
+          <CalloutContent>
+            <Link
+              className="t--learn-how-apis-link"
+              onClick={handleClickLearnHow}
+            >
+              <Text case={Case.UPPERCASE} type={TextType.H6}>
+                Learn How
+              </Text>
+              <Icon name="right-arrow" />
+            </Link>
+          </CalloutContent>
+        }
+        onClose={() => setApiBindHelpSectionVisible(false)}
+        text={createMessage(WIDGET_BIND_HELP)}
+        variant={Variant.warning}
+      />
+    </HelpSection>
+  );
+}
+
+function ImportedHeaders(props: { headers: any }) {
+  const [showHeaders, toggleHeaders] = useState(false);
+  return (
+    <>
+      {renderImportedHeadersButton(
+        props.headers.length,
+        toggleHeaders,
+        showHeaders,
+      )}
+      <KeyValueStackContainer>
+        <FormRowWithLabel>
+          <FlexContainer>
+            <Flex className="key-value" size={1}>
+              <Text case={Case.CAPITALIZE} type={TextType.H6}>
+                Key
+              </Text>
+            </Flex>
+            <Flex className="key-value" size={3}>
+              <Text case={Case.CAPITALIZE} type={TextType.H6}>
+                Value
+              </Text>
+            </Flex>
+          </FlexContainer>
+        </FormRowWithLabel>
+        {showHeaders && <ImportedHeaderKeyValue headers={props.headers} />}
+      </KeyValueStackContainer>
+    </>
+  );
+}
+
 function ApiEditorForm(props: Props) {
   const [selectedIndex, setSelectedIndex] = useState(0);
+  const [showDatasources, toggleDatasources] = useState(
+    !!props.datasources.length,
+  );
   const [
     apiBindHelpSectionVisible,
     setApiBindHelpSectionVisible,
   ] = useLocalStorage("apiBindHelpSectionVisible", "true");
 
   const {
-    pluginId,
-    onRunClick,
-    handleSubmit,
-    isRunning,
     actionConfigurationHeaders,
-    httpMethodFromForm,
     actionName,
+    handleSubmit,
     headersCount,
-    paramsCount,
-    settingsConfig,
     hintMessages,
+    httpMethodFromForm,
+    isRunning,
+    onRunClick,
+    paramsCount,
+    pluginId,
+    settingsConfig,
+    updateDatasource,
   } = props;
   const dispatch = useDispatch();
   const allowPostBody =
@@ -237,54 +478,56 @@ function ApiEditorForm(props: Props) {
     AnalyticsUtil.logEvent("OPEN_OMNIBAR", { source: "LEARN_HOW_DATASOURCE" });
   };
   return (
-    <Form onSubmit={handleSubmit}>
-      <MainConfiguration>
-        <FormRow className="form-row-header">
-          <NameWrapper className="t--nameOfApi">
-            <CloseEditor />
-            <ActionNameEditor page="API_PANE" />
-          </NameWrapper>
-          <ActionButtons className="t--formActionButtons">
-            <MoreActionsMenu
-              className="t--more-action-menu"
-              id={currentActionConfig ? currentActionConfig.id : ""}
-              name={currentActionConfig ? currentActionConfig.name : ""}
-              pageId={pageId}
-            />
-            <Button
-              className="t--apiFormRunBtn"
-              isLoading={isRunning}
-              onClick={() => {
-                onRunClick();
-              }}
-              size={Size.medium}
-              tag="button"
-              text="Run"
-              type="button"
-            />
-          </ActionButtons>
-        </FormRow>
-        <FormRow className="api-info-row">
-          <RequestDropdownField
-            className="t--apiFormHttpMethod"
-            height={"35px"}
-            name="actionConfiguration.httpMethod"
-            optionWidth={"100px"}
-            options={HTTP_METHOD_OPTIONS}
-            placeholder="Method"
-            width={"100px"}
-          />
-          <DatasourceWrapper className="t--dataSourceField">
-            <EmbeddedDatasourcePathField
-              name="actionConfiguration.path"
-              placeholder="https://mock-api.appsmith.com/users"
-              pluginId={pluginId}
-              theme={theme}
-            />
-          </DatasourceWrapper>
-        </FormRow>
-      </MainConfiguration>
-      <SecondaryWrapper>
+    <>
+      <CloseEditor />
+      <Form onSubmit={handleSubmit}>
+        <MainConfiguration>
+          <FormRow className="form-row-header">
+            <NameWrapper className="t--nameOfApi">
+              <ActionNameEditor page="API_PANE" />
+            </NameWrapper>
+            <ActionButtons className="t--formActionButtons">
+              <MoreActionsMenu
+                className="t--more-action-menu"
+                id={currentActionConfig ? currentActionConfig.id : ""}
+                name={currentActionConfig ? currentActionConfig.name : ""}
+                pageId={pageId}
+              />
+              <Button
+                className="t--apiFormRunBtn"
+                isLoading={isRunning}
+                onClick={() => {
+                  onRunClick();
+                }}
+                size={Size.medium}
+                tag="button"
+                text="Run"
+                type="button"
+              />
+            </ActionButtons>
+          </FormRow>
+          <FormRow className="api-info-row">
+            <BoundaryContainer>
+              <RequestDropdownField
+                className="t--apiFormHttpMethod"
+                height={"35px"}
+                name="actionConfiguration.httpMethod"
+                optionWidth={"100px"}
+                options={HTTP_METHOD_OPTIONS}
+                placeholder="Method"
+                width={"100px"}
+              />
+            </BoundaryContainer>
+            <DatasourceWrapper className="t--dataSourceField">
+              <EmbeddedDatasourcePathField
+                name="actionConfiguration.path"
+                placeholder="https://mock-api.appsmith.com/users"
+                pluginId={pluginId}
+                theme={theme}
+              />
+            </DatasourceWrapper>
+          </FormRow>
+        </MainConfiguration>
         {hintMessages && (
           <HelpSection>
             {hintMessages.map((msg, i) => (
@@ -292,125 +535,159 @@ function ApiEditorForm(props: Props) {
             ))}
           </HelpSection>
         )}
-        <TabbedViewContainer>
-          <TabComponent
-            onSelect={setSelectedIndex}
-            selectedIndex={selectedIndex}
-            tabs={[
-              {
-                key: "headers",
-                title: "Headers",
-                count: headersCount,
-                panelComponent: (
-                  <TabSection>
-                    {apiBindHelpSectionVisible && (
-                      <HelpSection>
-                        <Callout
-                          closeButton
-                          fill
-                          label={
-                            <CalloutContent>
-                              <Link
-                                className="t--learn-how-apis-link"
-                                onClick={handleClickLearnHow}
-                              >
-                                <Text case={Case.UPPERCASE} type={TextType.H6}>
-                                  Learn How
-                                </Text>
-                                <Icon name="right-arrow" />
-                              </Link>
-                            </CalloutContent>
-                          }
-                          onClose={() => setApiBindHelpSectionVisible(false)}
-                          text={createMessage(WIDGET_BIND_HELP)}
-                          variant={Variant.warning}
+        <Wrapper>
+          <SecondaryWrapper>
+            <TabbedViewContainer>
+              <TabComponent
+                onSelect={setSelectedIndex}
+                selectedIndex={selectedIndex}
+                tabs={[
+                  {
+                    key: "headers",
+                    title: "Headers",
+                    count: headersCount,
+                    panelComponent: (
+                      <TabSection>
+                        {apiBindHelpSectionVisible &&
+                          renderHelpSection(
+                            handleClickLearnHow,
+                            setApiBindHelpSectionVisible,
+                          )}
+                        {props.datasourceHeaders.length > 0 && (
+                          <ImportedHeaders headers={props.datasourceHeaders} />
+                        )}
+                        <KeyValueFieldArray
+                          actionConfig={actionConfigurationHeaders}
+                          dataTreePath={`${actionName}.config.headers`}
+                          hideHeader={!!props.datasourceHeaders.length}
+                          label="Headers"
+                          name="actionConfiguration.headers"
+                          placeholder="Value"
+                          theme={theme}
                         />
-                      </HelpSection>
-                    )}
-                    <KeyValueFieldArray
-                      actionConfig={actionConfigurationHeaders}
-                      dataTreePath={`${actionName}.config.headers`}
-                      label="Headers"
-                      name="actionConfiguration.headers"
-                      placeholder="Value"
-                      theme={theme}
-                    />
-                  </TabSection>
-                ),
-              },
-              {
-                key: "params",
-                title: "Params",
-                count: paramsCount,
-                panelComponent: (
-                  <TabSection>
-                    <KeyValueFieldArray
-                      dataTreePath={`${actionName}.config.queryParameters`}
-                      label="Params"
-                      name="actionConfiguration.queryParameters"
-                      theme={theme}
-                    />
-                  </TabSection>
-                ),
-              },
-              {
-                key: "body",
-                title: "Body",
-                panelComponent: allowPostBody ? (
-                  <PostBodyData
-                    dataTreePath={`${actionName}.config`}
-                    theme={theme}
-                  />
-                ) : (
-                  <NoBodyMessage>
-                    <Text type={TextType.P2}>
-                      This request does not have a body
-                    </Text>
-                  </NoBodyMessage>
-                ),
-              },
-              {
-                key: "pagination",
-                title: "Pagination",
-                panelComponent: (
-                  <Pagination
-                    onTestClick={props.onRunClick}
-                    paginationType={props.paginationType}
-                    theme={theme}
-                  />
-                ),
-              },
-              {
-                key: "settings",
-                title: "Settings",
-                panelComponent: (
-                  <SettingsWrapper>
-                    <ActionSettings
-                      actionSettingsConfig={settingsConfig}
-                      formName={API_EDITOR_FORM_NAME}
-                      theme={theme}
-                    />
-                  </SettingsWrapper>
-                ),
-              },
-            ]}
-          />
-        </TabbedViewContainer>
-
-        <ApiResponseView apiName={actionName} theme={theme} />
-      </SecondaryWrapper>
-    </Form>
+                      </TabSection>
+                    ),
+                  },
+                  {
+                    key: "params",
+                    title: "Params",
+                    count: paramsCount,
+                    panelComponent: (
+                      <TabSection>
+                        <KeyValueFieldArray
+                          dataTreePath={`${actionName}.config.queryParameters`}
+                          label="Params"
+                          name="actionConfiguration.queryParameters"
+                          theme={theme}
+                        />
+                      </TabSection>
+                    ),
+                  },
+                  {
+                    key: "body",
+                    title: "Body",
+                    panelComponent: allowPostBody ? (
+                      <PostBodyData
+                        dataTreePath={`${actionName}.config`}
+                        theme={theme}
+                      />
+                    ) : (
+                      <NoBodyMessage>
+                        <Text type={TextType.P2}>
+                          This request does not have a body
+                        </Text>
+                      </NoBodyMessage>
+                    ),
+                  },
+                  {
+                    key: "pagination",
+                    title: "Pagination",
+                    panelComponent: (
+                      <Pagination
+                        onTestClick={props.onRunClick}
+                        paginationType={props.paginationType}
+                        theme={theme}
+                      />
+                    ),
+                  },
+                  {
+                    key: "settings",
+                    title: "Settings",
+                    panelComponent: (
+                      <SettingsWrapper>
+                        <ActionSettings
+                          actionSettingsConfig={settingsConfig}
+                          formName={API_EDITOR_FORM_NAME}
+                          theme={theme}
+                        />
+                      </SettingsWrapper>
+                    ),
+                  },
+                ]}
+              />
+              {!showDatasources && (
+                <DatasourceListTrigger
+                  onClick={() => toggleDatasources(!showDatasources)}
+                >
+                  <Icon name="datasource" size={IconSize.LARGE} />
+                  <TabTitle>Datasources</TabTitle>
+                </DatasourceListTrigger>
+              )}
+            </TabbedViewContainer>
+            <ApiResponseView
+              apiName={actionName}
+              onRunClick={onRunClick}
+              theme={theme}
+            />
+          </SecondaryWrapper>
+          {showDatasources && (
+            <>
+              <DataSourceList
+                applicationId={props.applicationId}
+                currentPageId={props.currentPageId}
+                datasources={props.datasources}
+                onClick={updateDatasource}
+              />
+              <CloseIconContainer>
+                <Icon
+                  className="close-modal-icon"
+                  name="close-modal"
+                  onClick={() => toggleDatasources(!showDatasources)}
+                  size={IconSize.SMALL}
+                />
+              </CloseIconContainer>
+            </>
+          )}
+        </Wrapper>
+      </Form>
+    </>
   );
 }
 
 const selector = formValueSelector(API_EDITOR_FORM_NAME);
 
-export default connect((state: AppState) => {
+type ReduxDispatchProps = {
+  updateDatasource: (datasource: Datasource) => void;
+};
+
+const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({
+  updateDatasource: (datasource) => {
+    dispatch(change(API_EDITOR_FORM_NAME, "datasource", datasource));
+  },
+});
+
+export default connect((state: AppState, props: { pluginId: string }) => {
   const httpMethodFromForm = selector(state, "actionConfiguration.httpMethod");
-  const actionConfigurationHeaders = selector(
-    state,
-    "actionConfiguration.headers",
-  );
+  const actionConfigurationHeaders =
+    selector(state, "actionConfiguration.headers") || [];
+  let datasourceFromAction = selector(state, "datasource");
+  if (datasourceFromAction && datasourceFromAction.hasOwnProperty("id")) {
+    datasourceFromAction = state.entities.datasources.list.find(
+      (d) => d.id === datasourceFromAction.id,
+    );
+  }
+  const datasourceHeaders =
+    get(datasourceFromAction, "datasourceConfiguration.headers") || [];
   const apiId = selector(state, "id");
   const actionName = getApiName(state, apiId) || "";
   const headers = selector(state, "actionConfiguration.headers");
@@ -420,7 +697,14 @@ export default connect((state: AppState) => {
     const validHeaders = headers.filter(
       (value) => value.key && value.key !== "",
     );
-    headersCount = validHeaders.length;
+    headersCount += validHeaders.length;
+  }
+
+  if (Array.isArray(datasourceHeaders)) {
+    const validHeaders = datasourceHeaders.filter(
+      (value: any) => value.key && value.key !== "",
+    );
+    headersCount += validHeaders.length;
   }
 
   const params = selector(state, "actionConfiguration.queryParameters");
@@ -437,11 +721,17 @@ export default connect((state: AppState) => {
     apiId,
     httpMethodFromForm,
     actionConfigurationHeaders,
+    datasourceHeaders,
     headersCount,
     paramsCount,
     hintMessages,
+    datasources: state.entities.datasources.list.filter(
+      (d) => d.pluginId === props.pluginId,
+    ),
+    currentPageId: state.entities.pageList.currentPageId,
+    applicationId: state.entities.pageList.applicationId,
   };
-})(
+}, mapDispatchToProps)(
   reduxForm<Action, APIFormProps>({
     form: API_EDITOR_FORM_NAME,
   })(ApiEditorForm),
diff --git a/app/client/src/pages/Editor/APIEditor/Pagination.tsx b/app/client/src/pages/Editor/APIEditor/Pagination.tsx
index 8ba7d963e4..b8876e1862 100644
--- a/app/client/src/pages/Editor/APIEditor/Pagination.tsx
+++ b/app/client/src/pages/Editor/APIEditor/Pagination.tsx
@@ -173,6 +173,7 @@ export default function Pagination(props: PaginationProps) {
                 size={Size.medium}
                 tag="button"
                 text={"Test"}
+                type="button"
               />
             </PaginationFieldWrapper>
             <Step type={TextType.P1}>Next url</Step>
@@ -192,6 +193,7 @@ export default function Pagination(props: PaginationProps) {
                 size={Size.medium}
                 tag="button"
                 text={"Test"}
+                type="button"
               />
             </PaginationFieldWrapper>
           </div>
diff --git a/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx b/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx
index a3b03cd6d4..e1d3b549c6 100644
--- a/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx
+++ b/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx
@@ -5,7 +5,7 @@ import { formValueSelector } from "redux-form";
 import {
   ApiContentTypes,
   POST_BODY_FORMAT_OPTIONS,
-  POST_BODY_FORMAT_TITLES_NO_MULTI_PART,
+  POST_BODY_FORMAT_TITLES,
 } from "constants/ApiEditorConstants";
 import { API_EDITOR_FORM_NAME } from "constants/forms";
 import KeyValueFieldArray from "components/editorComponents/form/fields/KeyValueFieldArray";
@@ -48,11 +48,11 @@ type Props = PostDataProps;
 
 function PostBodyData(props: Props) {
   const {
-    displayFormat,
-    dataTreePath,
-    updateBodyContentType,
-    theme,
     apiId,
+    dataTreePath,
+    displayFormat,
+    theme,
+    updateBodyContentType,
   } = props;
 
   return (
@@ -62,7 +62,7 @@ function PostBodyData(props: Props) {
           updateBodyContentType(title, apiId)
         }
         selected={displayFormat}
-        tabs={POST_BODY_FORMAT_TITLES_NO_MULTI_PART.map((el) => {
+        tabs={POST_BODY_FORMAT_TITLES.map((el) => {
           let component = (
             <JSONEditorFieldWrapper
               className={"t--apiFormPostBody"}
@@ -83,7 +83,10 @@ function PostBodyData(props: Props) {
               />
             </JSONEditorFieldWrapper>
           );
-          if (el.title === ApiContentTypes.FORM_URLENCODED) {
+          if (
+            el.title === ApiContentTypes.FORM_URLENCODED ||
+            el.title === ApiContentTypes.MULTIPART_FORM_DATA
+          ) {
             component = (
               <KeyValueFieldArray
                 dataTreePath={`${dataTreePath}.bodyFormData`}
diff --git a/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx b/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx
index 14ebeac42c..d78bbf1f50 100644
--- a/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx
@@ -28,7 +28,7 @@ import {
   addApiToPage,
 } from "actions/providerActions";
 import { getDuplicateName } from "utils/AppsmithUtils";
-import { API_EDITOR_URL_WITH_SELECTED_PAGE_ID } from "constants/routes";
+import { INTEGRATION_EDITOR_URL, INTEGRATION_TABS } from "constants/routes";
 import Spinner from "components/editorComponents/Spinner";
 import { getInitialsAndColorCode } from "utils/AppsmithUtils";
 import AnalyticsUtil from "utils/AnalyticsUtil";
@@ -266,10 +266,10 @@ class ProviderTemplates extends React.Component<ProviderTemplatesProps> {
 
   render() {
     const {
-      providerTemplates,
       history,
       isFetchingProviderTemplates,
       providerDetails,
+      providerTemplates,
     } = this.props;
     const { applicationId, pageId } = this.props.match.params;
 
@@ -306,10 +306,10 @@ class ProviderTemplates extends React.Component<ProviderTemplatesProps> {
             iconSize={16}
             onClick={() =>
               history.push(
-                API_EDITOR_URL_WITH_SELECTED_PAGE_ID(
+                INTEGRATION_EDITOR_URL(
                   applicationId,
                   pageId,
-                  destinationPageId ? destinationPageId : pageId,
+                  INTEGRATION_TABS.ACTIVE,
                 ),
               )
             }
@@ -318,10 +318,10 @@ class ProviderTemplates extends React.Component<ProviderTemplatesProps> {
             className="backBtnText"
             onClick={() =>
               history.push(
-                API_EDITOR_URL_WITH_SELECTED_PAGE_ID(
+                INTEGRATION_EDITOR_URL(
                   applicationId,
                   pageId,
-                  destinationPageId ? destinationPageId : pageId,
+                  INTEGRATION_TABS.ACTIVE,
                 ),
               )
             }
diff --git a/app/client/src/pages/Editor/APIEditor/RapidApiEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/RapidApiEditorForm.tsx
index fc98490e4e..382e03c15d 100644
--- a/app/client/src/pages/Editor/APIEditor/RapidApiEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/RapidApiEditorForm.tsx
@@ -117,18 +117,18 @@ type Props = APIFormProps & InjectedFormProps<Action, APIFormProps>;
 
 function RapidApiEditorForm(props: Props) {
   const {
-    onDeleteClick,
-    onRunClick,
+    actionConfiguration,
+    actionConfigurationBodyFormData,
+    actionConfigurationHeaders,
     handleSubmit,
     isDeleting,
     isRunning,
-    templateId,
-    actionConfiguration,
-    actionConfigurationHeaders,
-    actionConfigurationBodyFormData,
+    onDeleteClick,
+    onRunClick,
+    providerCredentialSteps,
     providerImage,
     providerURL,
-    providerCredentialSteps,
+    templateId,
   } = props;
 
   const postbodyResponsePresent =
@@ -185,14 +185,12 @@ function RapidApiEditorForm(props: Props) {
             leftImage={providerImage}
             name="provider.name"
             placeholder="Provider name"
-            showLightningMenu={false}
           />
           <DynamicTextField
             disabled
             leftIcon={FormIcons.SLASH_ICON}
             name="actionConfiguration.path"
             placeholder="v1/method"
-            showLightningMenu={false}
           />
         </FormRow>
         {/* Display How to get Credentials info if it is present */}
@@ -261,7 +259,7 @@ function RapidApiEditorForm(props: Props) {
           />
         </TabbedViewContainer>
 
-        <ApiResponseView apiName={props.apiName} />
+        <ApiResponseView apiName={props.apiName} onRunClick={onRunClick} />
       </SecondaryWrapper>
     </Form>
   );
diff --git a/app/client/src/pages/Editor/APIEditor/ResultPagination.tsx b/app/client/src/pages/Editor/APIEditor/ResultPagination.tsx
index e7df48ae39..933b609d65 100644
--- a/app/client/src/pages/Editor/APIEditor/ResultPagination.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ResultPagination.tsx
@@ -33,21 +33,19 @@ const PaginationContainer = styled.div`
 
 class ResultPagination extends React.Component<Props> {
   render() {
-    const { total, handlePageChange, currentPage = 1 } = this.props;
+    const { currentPage = 1, handlePageChange, total } = this.props;
 
     return (
       <Pagination limit={40} pageCount={5} total={total}>
         {({
-          pages,
+          getPageItemProps,
           hasNextPage,
           hasPreviousPage,
-          previousPage,
           nextPage,
+          pages,
+          previousPage,
           totalPages,
-          getPageItemProps,
         }) => {
-          console.log(hasNextPage, "hasNextPage");
-
           return (
             <PaginationContainer>
               <div
diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx
index 813bf0cf52..5f26a87fc5 100644
--- a/app/client/src/pages/Editor/APIEditor/index.tsx
+++ b/app/client/src/pages/Editor/APIEditor/index.tsx
@@ -3,7 +3,6 @@ import { connect } from "react-redux";
 import { submit } from "redux-form";
 import ApiEditorForm from "./Form";
 import RapidApiEditorForm from "./RapidApiEditorForm";
-import ApiHomeScreen from "./ApiHomeScreen";
 import { deleteAction, runActionInit } from "actions/actionActions";
 import { PaginationField } from "api/ActionAPI";
 import { AppState } from "reducers";
@@ -151,16 +150,16 @@ class ApiEditor extends React.Component<Props> {
 
   render() {
     const {
+      isCreating,
+      isDeleting,
+      isEditorInitialized,
+      isRunning,
       match: {
         params: { apiId },
       },
-      plugins,
-      pluginId,
-      isRunning,
-      isDeleting,
-      isCreating,
       paginationType,
-      isEditorInitialized,
+      pluginId,
+      plugins,
     } = this.props;
     if (!this.props.pluginId && this.props.match.params.apiId) {
       return <EntityNotFoundPane />;
@@ -182,15 +181,6 @@ class ApiEditor extends React.Component<Props> {
       }
     }
 
-    const apiHomeScreen = (
-      <ApiHomeScreen
-        applicationId={this.props.match.params.applicationId}
-        history={this.props.history}
-        location={this.props.location}
-        match={this.props.match}
-        pageId={this.props.match.params.pageId}
-      />
-    );
     return (
       <div
         style={{
@@ -198,57 +188,51 @@ class ApiEditor extends React.Component<Props> {
           height: "100%",
         }}
       >
-        {apiId ? (
-          <>
-            {formUiComponent === "ApiEditorForm" && (
-              <ApiEditorForm
-                apiName={this.props.apiName}
-                appName={
-                  this.props.currentApplication
-                    ? this.props.currentApplication.name
-                    : ""
-                }
-                isDeleting={isDeleting}
-                isRunning={isRunning}
-                onDeleteClick={this.handleDeleteClick}
-                onRunClick={this.handleRunClick}
-                paginationType={paginationType}
-                pluginId={pluginId}
-                settingsConfig={this.props.settingsConfig}
-              />
-            )}
-
-            {formUiComponent === "RapidApiEditorForm" && (
-              <RapidApiEditorForm
-                apiId={this.props.match.params.apiId}
-                apiName={this.props.apiName}
-                appName={
-                  this.props.currentApplication
-                    ? this.props.currentApplication.name
-                    : ""
-                }
-                isDeleting={isDeleting}
-                isRunning={isRunning}
-                location={this.props.location}
-                onDeleteClick={this.handleDeleteClick}
-                onRunClick={this.handleRunClick}
-                paginationType={paginationType}
-              />
-            )}
-
-            {formUiComponent === "SaaSEditorForm" &&
-              history.push(
-                SAAS_EDITOR_API_ID_URL(
-                  this.props.match.params.applicationId,
-                  this.props.match.params.pageId,
-                  this.props.plugins[this.props.pluginId]?.packageName ?? "",
-                  this.props.match.params.apiId,
-                ),
-              )}
-          </>
-        ) : (
-          apiHomeScreen
+        {formUiComponent === "ApiEditorForm" && (
+          <ApiEditorForm
+            apiName={this.props.apiName}
+            appName={
+              this.props.currentApplication
+                ? this.props.currentApplication.name
+                : ""
+            }
+            isDeleting={isDeleting}
+            isRunning={isRunning}
+            onDeleteClick={this.handleDeleteClick}
+            onRunClick={this.handleRunClick}
+            paginationType={paginationType}
+            pluginId={pluginId}
+            settingsConfig={this.props.settingsConfig}
+          />
         )}
+
+        {formUiComponent === "RapidApiEditorForm" && (
+          <RapidApiEditorForm
+            apiId={this.props.match.params.apiId}
+            apiName={this.props.apiName}
+            appName={
+              this.props.currentApplication
+                ? this.props.currentApplication.name
+                : ""
+            }
+            isDeleting={isDeleting}
+            isRunning={isRunning}
+            location={this.props.location}
+            onDeleteClick={this.handleDeleteClick}
+            onRunClick={this.handleRunClick}
+            paginationType={paginationType}
+          />
+        )}
+
+        {formUiComponent === "SaaSEditorForm" &&
+          history.push(
+            SAAS_EDITOR_API_ID_URL(
+              this.props.match.params.applicationId,
+              this.props.match.params.pageId,
+              this.props.plugins[this.props.pluginId]?.packageName ?? "",
+              this.props.match.params.apiId,
+            ),
+          )}
       </div>
     );
   }
@@ -257,7 +241,7 @@ class ApiEditor extends React.Component<Props> {
 const mapStateToProps = (state: AppState, props: any): ReduxStateProps => {
   const apiAction = getActionById(state, props);
   const apiName = getApiName(state, props.match.params.apiId);
-  const { isDeleting, isRunning, isCreating } = state.ui.apiPane;
+  const { isCreating, isDeleting, isRunning } = state.ui.apiPane;
   const pluginId = _.get(apiAction, "pluginId", "");
   const settingsConfig = getPluginSettingConfigs(state, pluginId);
   return {
diff --git a/app/client/src/pages/Editor/Canvas.tsx b/app/client/src/pages/Editor/Canvas.tsx
index 36d71047ed..e84710d9dc 100644
--- a/app/client/src/pages/Editor/Canvas.tsx
+++ b/app/client/src/pages/Editor/Canvas.tsx
@@ -5,6 +5,8 @@ import { ContainerWidgetProps } from "widgets/ContainerWidget";
 import { WidgetProps } from "widgets/BaseWidget";
 import PropertyPane from "pages/Editor/PropertyPane";
 import ArtBoard from "pages/common/ArtBoard";
+import log from "loglevel";
+import * as Sentry from "@sentry/react";
 
 interface CanvasProps {
   dsl: ContainerWidgetProps<WidgetProps>;
@@ -16,14 +18,20 @@ const Canvas = memo((props: CanvasProps) => {
     return (
       <>
         <PropertyPane />
-        <ArtBoard className="t--canvas-artboard" width={props.dsl.rightColumn}>
+        <ArtBoard
+          className="t--canvas-artboard"
+          data-testid="t--canvas-artboard"
+          id="art-board"
+          width={props.dsl.rightColumn}
+        >
           {props.dsl.widgetId &&
             WidgetFactory.createWidget(props.dsl, RenderModes.CANVAS)}
         </ArtBoard>
       </>
     );
   } catch (error) {
-    console.log("Error rendering DSL", error);
+    log.error("Error rendering DSL", error);
+    Sentry.captureException(error);
     return null;
   }
 });
diff --git a/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx b/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx
index 1c018c9bf5..b3cb20cec6 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx
@@ -1,21 +1,38 @@
 import React from "react";
 import styled from "styled-components";
 import { Icon } from "@blueprintjs/core";
-
-const BackText = styled.span`
-  font-size: 16px;
-  font-weight: 500;
-`;
+import Text, { TextType } from "components/ads/Text";
+import { useHistory } from "react-router-dom";
+import { useSelector } from "react-redux";
+import {
+  getCurrentApplicationId,
+  getCurrentPageId,
+} from "../../../selectors/editorSelectors";
+import { BUILDER_PAGE_URL } from "../../../constants/routes";
 
 const Back = styled.span`
+  //width: 100%;
+  height: 30px;
+  display: flex;
+  align-items: center;
   cursor: pointer;
+  padding-left: 16px;
+  /* background-color: ${(props) => props.theme.colors.apiPane.iconHoverBg}; */
 `;
 
-function BackButton(props: { onClick: () => void }) {
+function BackButton() {
+  const history = useHistory();
+  const applicationId = useSelector(getCurrentApplicationId);
+  const pageId = useSelector(getCurrentPageId);
+  const goBack = () => {
+    history.push(BUILDER_PAGE_URL(applicationId, pageId));
+  };
   return (
-    <Back onClick={props.onClick}>
+    <Back onClick={goBack}>
       <Icon icon="chevron-left" iconSize={16} />
-      <BackText>Back</BackText>
+      <Text style={{ color: "#0c0000", lineHeight: "14px" }} type={TextType.P1}>
+        Back
+      </Text>
     </Back>
   );
 }
diff --git a/app/client/src/pages/Editor/DataSourceEditor/Connected.tsx b/app/client/src/pages/Editor/DataSourceEditor/Connected.tsx
index 2391789aa5..524b401e27 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/Connected.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/Connected.tsx
@@ -3,28 +3,23 @@ import { useDispatch, useSelector } from "react-redux";
 import { useParams } from "react-router";
 import { AppState } from "reducers";
 import { isNil } from "lodash";
-import { BaseButton } from "components/designSystems/blueprint/ButtonComponent";
+import Button from "components/ads/Button";
 import { getDatasource, getPlugin } from "selectors/entitiesSelector";
 import { Colors } from "constants/Colors";
 import { HeaderIcons } from "icons/HeaderIcons";
-import history from "utils/history";
 import styled from "styled-components";
 import { createActionRequest } from "actions/actionActions";
-import {
-  API_EDITOR_URL_WITH_SELECTED_PAGE_ID,
-  QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID,
-} from "constants/routes";
-import { createNewApiName, createNewQueryName } from "utils/AppsmithUtils";
+import { createNewQueryName } from "utils/AppsmithUtils";
 import { getCurrentPageId } from "selectors/editorSelectors";
-import { DEFAULT_API_ACTION_CONFIG } from "constants/ApiEditorConstants";
-import { ApiActionConfig, PluginType, QueryAction } from "entities/Action";
+import { ApiActionConfig, Action } from "entities/Action";
 import { renderDatasourceSection } from "./DatasourceSection";
-import { Toaster } from "components/ads/Toast";
-import { Variant } from "components/ads/common";
 import { OnboardingStep } from "constants/OnboardingConstants";
 import { inOnboarding } from "sagas/OnboardingSagas";
 import OnboardingIndicator from "components/editorComponents/Onboarding/Indicator";
-import { createMessage, ERROR_ADD_API_INVALID_URL } from "constants/messages";
+import { Toaster } from "components/ads/Toast";
+import { Variant } from "components/ads/common";
+import { ERROR_ADD_API_INVALID_URL } from "constants/messages";
+import { DEFAULT_API_ACTION_CONFIG } from "constants/ApiEditorConstants";
 
 const ConnectedText = styled.div`
   color: ${Colors.OXFORD_BLUE};
@@ -51,10 +46,15 @@ const Wrapper = styled.div`
   margin-top: 18px;
 `;
 
-const ActionButton = styled(BaseButton)`
+const ActionButton = styled(Button)`
+  padding: 10px 20px;
   &&&& {
+    height: 36px;
+    //max-width: 120px;
     width: auto;
-    align-self: center;
+  }
+  span > svg > path {
+    stroke: white;
   }
 `;
 
@@ -73,13 +73,32 @@ function Connected() {
   const datasourceFormConfigs = useSelector(
     (state: AppState) => state.entities.plugins.formConfigs,
   );
+
   const plugin = useSelector((state: AppState) =>
     getPlugin(state, datasource?.pluginId ?? ""),
   );
-  const isDBDatasource = plugin?.type === PluginType.DB;
 
   const createQueryAction = useCallback(() => {
     const newQueryName = createNewQueryName(actions, currentPageId || "");
+
+    if (
+      plugin?.type === "API" &&
+      (!datasource ||
+        !datasource.datasourceConfiguration ||
+        !datasource.datasourceConfiguration.url)
+    ) {
+      Toaster.show({
+        text: ERROR_ADD_API_INVALID_URL(),
+        variant: Variant.danger,
+      });
+      return;
+    }
+
+    const headers = datasource?.datasourceConfiguration?.headers ?? [];
+    const defaultApiActionConfig: ApiActionConfig = {
+      ...DEFAULT_API_ACTION_CONFIG,
+      headers: headers.length ? headers : DEFAULT_API_ACTION_CONFIG.headers,
+    };
     let payload = {
       name: newQueryName,
       pageId: currentPageId,
@@ -87,12 +106,13 @@ function Connected() {
       datasource: {
         id: datasource?.id,
       },
-      actionConfiguration: {},
+      actionConfiguration: plugin?.type === "API" ? defaultApiActionConfig : {},
       eventData: {
         actionType: "Query",
         from: "datasource-pane",
       },
-    } as Partial<QueryAction>; // TODO: refactor later. Handle case for undefined datasource before we reach here.
+    } as Partial<Action>;
+
     if (datasource)
       if (isInOnboarding) {
         // If in onboarding and tooltip is being shown
@@ -106,55 +126,8 @@ function Connected() {
       }
 
     dispatch(createActionRequest(payload));
-    history.push(
-      QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID(
-        params.applicationId,
-        currentPageId,
-        currentPageId,
-      ),
-    );
   }, [dispatch, actions, currentPageId, params.applicationId, datasource]);
 
-  const createApiAction = useCallback(() => {
-    const newApiName = createNewApiName(actions, currentPageId || "");
-    const headers = datasource?.datasourceConfiguration?.headers ?? [];
-    const defaultApiActionConfig: ApiActionConfig = {
-      ...DEFAULT_API_ACTION_CONFIG,
-      headers: headers.length ? headers : DEFAULT_API_ACTION_CONFIG.headers,
-    };
-
-    if (!datasource?.datasourceConfiguration?.url) {
-      Toaster.show({
-        text: createMessage(ERROR_ADD_API_INVALID_URL),
-        variant: Variant.danger,
-      });
-
-      return;
-    }
-
-    dispatch(
-      createActionRequest({
-        name: newApiName,
-        pageId: currentPageId,
-        pluginId: datasource.pluginId,
-        datasource: {
-          id: datasource.id,
-        },
-        eventData: {
-          actionType: "API",
-          from: "datasource-pane",
-        },
-        actionConfiguration: defaultApiActionConfig,
-      }),
-    );
-    history.push(
-      API_EDITOR_URL_WITH_SELECTED_PAGE_ID(
-        params.applicationId,
-        currentPageId,
-        currentPageId,
-      ),
-    );
-  }, [dispatch, actions, currentPageId, params.applicationId, datasource]);
   const currentFormConfig: Array<any> =
     datasourceFormConfigs[datasource?.pluginId ?? ""];
 
@@ -173,12 +146,10 @@ function Connected() {
 
         <OnboardingIndicator step={OnboardingStep.EXAMPLE_DATABASE} width={120}>
           <ActionButton
-            accent="primary"
             className="t--create-query"
-            filled
-            icon={"plus"}
-            onClick={isDBDatasource ? createQueryAction : createApiAction}
-            text={isDBDatasource ? "New Query" : "New API"}
+            icon="plus"
+            onClick={createQueryAction}
+            text={"New Query"}
           />
         </OnboardingIndicator>
       </Header>
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx
index c8fd253e0a..1e0c851f7f 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx
@@ -3,23 +3,20 @@ import { connect } from "react-redux";
 import styled from "styled-components";
 import _ from "lodash";
 import { DATASOURCE_DB_FORM } from "constants/forms";
-import { DATA_SOURCES_EDITOR_URL } from "constants/routes";
-
-import history from "utils/history";
 import { Icon } from "@blueprintjs/core";
 import FormTitle from "./FormTitle";
-
+import Button, { Category } from "components/ads/Button";
+import { Colors } from "constants/Colors";
 import CollapsibleHelp from "components/designSystems/appsmith/help/CollapsibleHelp";
 import Connected from "./Connected";
 
-import Button from "components/editorComponents/Button";
+import EditButton from "components/editorComponents/Button";
 import { Datasource } from "entities/Datasource";
 import { reduxForm, InjectedFormProps } from "redux-form";
 import { APPSMITH_IP_ADDRESSES } from "constants/DatasourceEditorConstants";
 import { getAppsmithConfigs } from "configs";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { convertArrayToSentence } from "utils/helpers";
-import BackButton from "./BackButton";
 import { PluginType } from "entities/Action";
 import Boxed from "components/editorComponents/Onboarding/Boxed";
 import { OnboardingStep } from "constants/OnboardingConstants";
@@ -60,7 +57,7 @@ interface DatasourceDBEditorProps extends JSONtoFormProps {
 type Props = DatasourceDBEditorProps &
   InjectedFormProps<Datasource, DatasourceDBEditorProps>;
 
-const StyledButton = styled(Button)`
+const StyledButton = styled(EditButton)`
   &&&& {
     width: 87px;
     height: 32px;
@@ -78,6 +75,16 @@ const CollapsibleWrapper = styled.div`
   width: max-content;
 `;
 
+const EditDatasourceButton = styled(Button)`
+  padding: 10px 20px;
+  &&&& {
+    height: 32px;
+    max-width: 160px;
+    border: 1px solid ${Colors.HIT_GRAY};
+    width: auto;
+  }
+`;
+
 class DatasourceDBEditor extends JSONtoForm<Props> {
   componentDidUpdate(prevProps: Props) {
     if (prevProps.datasourceId !== this.props.datasourceId) {
@@ -118,15 +125,13 @@ class DatasourceDBEditor extends JSONtoForm<Props> {
 
   renderDataSourceConfigForm = (sections: any) => {
     const {
-      isSaving,
-      applicationId,
-      pageId,
-      isTesting,
-      isDeleting,
       datasourceId,
       handleDelete,
-      pluginType,
+      isDeleting,
+      isSaving,
+      isTesting,
       messages,
+      pluginType,
     } = this.props;
     const { viewMode } = this.props;
     return (
@@ -135,12 +140,6 @@ class DatasourceDBEditor extends JSONtoForm<Props> {
           e.preventDefault();
         }}
       >
-        <BackButton
-          onClick={() =>
-            history.push(DATA_SOURCES_EDITOR_URL(applicationId, pageId))
-          }
-        />
-        <br />
         <Header>
           <FormTitleContainer>
             <PluginImage alt="Datasource" src={this.props.pluginImage} />
@@ -148,8 +147,8 @@ class DatasourceDBEditor extends JSONtoForm<Props> {
           </FormTitleContainer>
           {viewMode && (
             <Boxed step={OnboardingStep.SUCCESSFUL_BINDING}>
-              <ActionButton
-                accent="secondary"
+              <EditDatasourceButton
+                category={Category.tertiary}
                 className="t--edit-datasource"
                 onClick={() => {
                   this.props.setDatasourceEditorMode(
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
index 92be7549fb..ef1f263ea6 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
@@ -25,7 +25,9 @@ const ValueWrapper = styled.div`
 `;
 
 const FieldWrapper = styled.div`
-  margin-top: 9px;
+  &:not(first-child) {
+    margin-top: 9px;
+  }
 `;
 
 export const renderDatasourceSection = (
@@ -40,7 +42,7 @@ export const renderDatasourceSection = (
           return renderDatasourceSection(section, datasource);
         } else {
           try {
-            const { label, configProperty, controlType } = section;
+            const { configProperty, controlType, label } = section;
             const reactKey = datasource.id + "_" + label;
             let value = get(datasource, configProperty);
 
diff --git a/app/client/src/pages/Editor/DataSourceEditor/JSONtoForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/JSONtoForm.tsx
index 51b96ab12a..df1764fbe5 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/JSONtoForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/JSONtoForm.tsx
@@ -9,6 +9,7 @@ import { Datasource } from "entities/Datasource";
 import { isHidden } from "components/formControls/utils";
 import log from "loglevel";
 import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
+import CloseEditor from "components/editorComponents/CloseEditor";
 
 export const LoadingContainer = styled(CenteredWrapper)`
   height: 50%;
@@ -30,7 +31,7 @@ export const Header = styled.div`
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-top: 16px;
+  //margin-top: 16px;
 `;
 
 export const SaveButtonContainer = styled.div`
@@ -49,9 +50,14 @@ export const ActionButton = styled(BaseButton)`
 
 const DBForm = styled.div`
   padding: 20px;
-  margin-left: 10px;
   margin-right: 0px;
-  height: calc(100vh - ${(props) => props.theme.smallHeaderHeight});
+  height: calc(
+    100vh -
+      (
+        ${(props) => props.theme.smallHeaderHeight} +
+          ${(props) => props.theme.backBanner}
+      )
+  );
   overflow: auto;
   .backBtn {
     padding-bottom: 1px;
@@ -203,7 +209,12 @@ export class JSONtoForm<
   };
 
   renderForm = (content: any) => {
-    return <DBForm>{content}</DBForm>;
+    return (
+      <div>
+        <CloseEditor />
+        <DBForm>{content}</DBForm>
+      </div>
+    );
   };
 
   renderMainSection = (section: any, index: number) => {
@@ -237,7 +248,7 @@ export class JSONtoForm<
   };
 
   setupConfig = (config: ControlProps) => {
-    const { controlType, isRequired, configProperty } = config;
+    const { configProperty, controlType, isRequired } = config;
     this.configDetails[configProperty] = controlType;
 
     if (isRequired) {
diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
index efc9a12e6d..f8e87121cb 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
@@ -2,10 +2,9 @@ import React from "react";
 import styled from "styled-components";
 import { createNewApiName } from "utils/AppsmithUtils";
 import { DATASOURCE_REST_API_FORM } from "constants/forms";
-import { DATA_SOURCES_EDITOR_URL } from "constants/routes";
-import history from "utils/history";
 import FormTitle from "./FormTitle";
 import Button from "components/editorComponents/Button";
+import AdsButton from "components/ads/Button";
 import { Datasource } from "entities/Datasource";
 import {
   getFormMeta,
@@ -15,7 +14,6 @@ import {
 } from "redux-form";
 import { BaseButton } from "components/designSystems/blueprint/ButtonComponent";
 import AnalyticsUtil from "utils/AnalyticsUtil";
-import BackButton from "./BackButton";
 import InputTextControl, {
   StyledInfo,
 } from "components/formControls/InputTextControl";
@@ -42,6 +40,7 @@ import {
 } from "transformers/RestAPIDatasourceFormTransformer";
 import {
   ApiDatasourceForm,
+  ApiKeyAuthType,
   AuthType,
   GrantType,
 } from "entities/Datasource/RestAPIForm";
@@ -56,6 +55,8 @@ import _ from "lodash";
 import FormLabel from "components/editorComponents/FormLabel";
 import CopyToClipBoard from "components/designSystems/appsmith/CopyToClipBoard";
 import Callout from "components/ads/Callout";
+import CloseEditor from "components/editorComponents/CloseEditor";
+
 interface DatasourceRestApiEditorProps {
   updateDatasource: (
     formValues: Datasource,
@@ -86,7 +87,10 @@ const RestApiForm = styled.div`
   padding: 20px;
   margin-left: 10px;
   margin-right: 0px;
-  height: calc(100vh - ${(props) => props.theme.headerHeight});
+  height: calc(
+    100vh - ${(props) => props.theme.headerHeight} -
+      ${(props) => props.theme.backBanner}
+  );
   overflow: auto;
   .backBtn {
     padding-bottom: 1px;
@@ -123,7 +127,7 @@ export const Header = styled.div`
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-top: 16px;
+  //margin-top: 16px;
 `;
 
 const SaveButtonContainer = styled.div`
@@ -140,12 +144,15 @@ const ActionButton = styled(BaseButton)`
   }
 `;
 
-const CreateApiButton = styled(BaseButton)`
-  &&& {
-    max-width: 120px;
-    margin-right: 9px;
-    align-self: center;
-    min-height: 32px;
+const CreateApiButton = styled(AdsButton)`
+  padding: 10px 20px;
+  &&&& {
+    height: 36px;
+    //max-width: 120px;
+    width: auto;
+  }
+  span > svg > path {
+    stroke: white;
   }
 `;
 
@@ -194,7 +201,15 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
   };
 
   componentDidUpdate() {
-    this.ensureOAuthDefaultsAreCorrect();
+    if (!this.props.formData) return;
+
+    const { authType } = this.props.formData;
+
+    if (authType === AuthType.OAuth2) {
+      this.ensureOAuthDefaultsAreCorrect();
+    } else if (authType === AuthType.apiKey) {
+      this.ensureAPIKeyDefaultsAreCorrect();
+    }
   }
 
   isDirty(prop: any) {
@@ -202,36 +217,39 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
     return _.get(formMeta, prop + ".visited", false);
   }
 
+  ensureAPIKeyDefaultsAreCorrect = () => {
+    if (!this.props.formData) return;
+    const { authentication } = this.props.formData;
+    if (!authentication || !_.get(authentication, "addTo")) {
+      this.props.change("authentication.addTo", ApiKeyAuthType.Header);
+    }
+  };
+
   ensureOAuthDefaultsAreCorrect = () => {
     if (!this.props.formData) return;
     const { authentication } = this.props.formData;
 
-    if (!authentication || !authentication.grantType) {
+    if (!authentication || !_.get(authentication, "grantType")) {
       this.props.change(
         "authentication.grantType",
         GrantType.ClientCredentials,
       );
-      return false;
     }
     if (_.get(authentication, "isTokenHeader") === undefined) {
       this.props.change("authentication.isTokenHeader", true);
-      return false;
     }
     if (
       !this.isDirty("authentication.headerPrefix") &&
       _.get(authentication, "headerPrefix") === undefined
     ) {
-      this.props.change("authentication.headerPrefix", "Bearer ");
-      return false;
+      this.props.change("authentication.headerPrefix", "Bearer");
     }
 
-    if (authentication.grantType === GrantType.AuthorizationCode) {
+    if (_.get(authentication, "grantType") === GrantType.AuthorizationCode) {
       if (_.get(authentication, "isAuthorizationHeader") === undefined) {
         this.props.change("authentication.isAuthorizationHeader", true);
-        return false;
       }
     }
-    return true;
   };
 
   disableSave = (): boolean => {
@@ -253,7 +271,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
   };
 
   createApiAction = () => {
-    const { datasource, actions, pageId } = this.props;
+    const { actions, datasource, pageId } = this.props;
     if (
       !datasource ||
       !datasource.datasourceConfiguration ||
@@ -263,6 +281,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
         text: "Unable to create API. Try adding a url to the datasource",
         variant: Variant.danger,
       });
+      return;
     }
     const newApiName = createNewApiName(actions, pageId || "");
 
@@ -291,60 +310,47 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
   };
 
   render = () => {
-    return (
-      <RestApiForm>
-        <form
-          onSubmit={(e) => {
-            e.preventDefault();
-          }}
-        >
-          {this.renderHeader()}
-          {this.renderEditor()}
-          {this.renderSave()}
-        </form>
-      </RestApiForm>
-    );
-  };
-
-  renderHeader = () => {
-    const {
-      isSaving,
-      isNewDatasource,
-      pluginImage,
-      applicationId,
-      pageId,
-    } = this.props;
     return (
       <>
-        <BackButton
-          onClick={() =>
-            history.push(DATA_SOURCES_EDITOR_URL(applicationId, pageId))
-          }
-        />
-        <br />
-        <Header>
-          <FormTitleContainer>
-            <PluginImage alt="Datasource" src={pluginImage} />
-            <FormTitle focusOnMount={isNewDatasource} />
-          </FormTitleContainer>
-
-          <CreateApiButton
-            accent="primary"
-            className="t--create-query"
-            disabled={this.disableSave()}
-            filled
-            icon={"plus"}
-            loading={isSaving}
-            onClick={() => this.createApiAction()}
-            text="New API"
-          />
-        </Header>
+        <CloseEditor />
+        <RestApiForm>
+          <form
+            onSubmit={(e) => {
+              e.preventDefault();
+            }}
+          >
+            {this.renderHeader()}
+            {this.renderEditor()}
+            {this.renderSave()}
+          </form>
+        </RestApiForm>
       </>
     );
   };
 
+  renderHeader = () => {
+    const { isNewDatasource, isSaving, pluginImage } = this.props;
+    return (
+      <Header>
+        <FormTitleContainer>
+          <PluginImage alt="Datasource" src={pluginImage} />
+          <FormTitle focusOnMount={isNewDatasource} />
+        </FormTitleContainer>
+
+        <CreateApiButton
+          className="t--create-query"
+          disabled={this.disableSave()}
+          icon="plus"
+          isLoading={isSaving}
+          onClick={this.createApiAction}
+          text="New API"
+        />
+      </Header>
+    );
+  };
+
   renderSave = () => {
-    const { isDeleting, isSaving, datasourceId, deleteDatasource } = this.props;
+    const { datasourceId, deleteDatasource, isDeleting, isSaving } = this.props;
     return (
       <SaveButtonContainer>
         <ActionButton
@@ -435,10 +441,22 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
                 label: "None",
                 value: AuthType.NONE,
               },
+              {
+                label: "Basic",
+                value: AuthType.basic,
+              },
               {
                 label: "OAuth 2.0",
                 value: AuthType.OAuth2,
               },
+              {
+                label: "API Key",
+                value: AuthType.apiKey,
+              },
+              {
+                label: "Bearer Token",
+                value: AuthType.bearerToken,
+              },
             ]}
             placeholderText=""
             propertyValue=""
@@ -455,6 +473,12 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
     let content;
     if (authType === AuthType.OAuth2) {
       content = this.renderOauth2();
+    } else if (authType === AuthType.basic) {
+      content = this.renderBasic();
+    } else if (authType === AuthType.apiKey) {
+      content = this.renderApiKey();
+    } else if (authType === AuthType.bearerToken) {
+      content = this.renderBearerToken();
     }
     if (content) {
       return (
@@ -465,11 +489,91 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
     }
   };
 
+  renderApiKey = () => {
+    return (
+      <>
+        <FormInputContainer>
+          <InputTextControl
+            {...COMMON_INPUT_PROPS}
+            configProperty="authentication.label"
+            label="Key"
+            placeholderText="api_key"
+          />
+        </FormInputContainer>
+        <FormInputContainer>
+          <InputTextControl
+            {...COMMON_INPUT_PROPS}
+            configProperty="authentication.value"
+            label="Value"
+            placeholderText="value"
+          />
+        </FormInputContainer>
+        <FormInputContainer>
+          <DropDownControl
+            {...COMMON_INPUT_PROPS}
+            configProperty="authentication.addTo"
+            label="Add To"
+            options={[
+              {
+                label: "Query Params",
+                value: ApiKeyAuthType.QueryParams,
+              },
+              {
+                label: "Header",
+                value: ApiKeyAuthType.Header,
+              },
+            ]}
+            placeholderText=""
+            propertyValue=""
+          />
+        </FormInputContainer>
+      </>
+    );
+  };
+
+  renderBearerToken = () => {
+    return (
+      <FormInputContainer>
+        <InputTextControl
+          {...COMMON_INPUT_PROPS}
+          configProperty="authentication.bearerToken"
+          label="Bearer Token"
+          placeholderText="Bearer Token"
+        />
+      </FormInputContainer>
+    );
+  };
+
+  renderBasic = () => {
+    return (
+      <>
+        <FormInputContainer>
+          <InputTextControl
+            {...COMMON_INPUT_PROPS}
+            configProperty="authentication.username"
+            label="Username"
+            placeholderText="Username"
+          />
+        </FormInputContainer>
+        <FormInputContainer>
+          <InputTextControl
+            {...COMMON_INPUT_PROPS}
+            configProperty="authentication.password"
+            dataType="PASSWORD"
+            encrypted
+            label="Password"
+            placeholderText="Password"
+          />
+        </FormInputContainer>
+      </>
+    );
+  };
+
   renderOauth2 = () => {
     const { authentication } = this.props.formData;
     if (!authentication) return;
     let content;
-    switch (authentication?.grantType) {
+    switch (_.get(authentication, "grantType")) {
       case GrantType.AuthorizationCode:
         content = this.renderOauth2AuthorizationCode();
         break;
@@ -525,7 +629,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
             ]}
           />
         </FormInputContainer>
-        {formData.authentication?.isTokenHeader && (
+        {_.get(formData.authentication, "isTokenHeader") && (
           <FormInputContainer>
             <InputTextControl
               {...COMMON_INPUT_PROPS}
@@ -573,12 +677,40 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
     );
   };
 
+  renderOauth2CommonAdvanced = () => {
+    return (
+      <>
+        <FormInputContainer>
+          <InputTextControl
+            {...COMMON_INPUT_PROPS}
+            configProperty="authentication.audience"
+            label="Audience"
+            placeholderText="https://example.com/oauth/audience"
+          />
+        </FormInputContainer>
+        <FormInputContainer>
+          <InputTextControl
+            {...COMMON_INPUT_PROPS}
+            configProperty="authentication.resource"
+            label="Resource"
+            placeholderText="https://example.com/oauth/resource"
+          />
+        </FormInputContainer>
+      </>
+    );
+  };
+
   renderOauth2ClientCredentials = () => {
-    return this.renderOauth2Common();
+    return (
+      <>
+        {this.renderOauth2Common()}
+        {this.renderOauth2CommonAdvanced()}
+      </>
+    );
   };
 
   renderOauth2AuthorizationCode = () => {
-    const { pageId, datasourceId, isSaving, datasource } = this.props;
+    const { datasource, datasourceId, formData, isSaving, pageId } = this.props;
     const isAuthorized = _.get(
       datasource,
       "datasourceConfiguration.authentication.isAuthorized",
@@ -633,6 +765,8 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
             ]}
           />
         </FormInputContainer>
+        {!_.get(formData.authentication, "isAuthorizationHeader", true) &&
+          this.renderOauth2CommonAdvanced()}
         <FormInputContainer>
           <AuthorizeButton
             disabled={this.disableSave()}
diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
index 272c1313cd..be06b120a9 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
@@ -16,7 +16,6 @@ import {
   setDatsourceEditorMode,
 } from "actions/datasourceActions";
 import { DATASOURCE_DB_FORM } from "constants/forms";
-import DatasourceHome from "./DatasourceHome";
 import DataSourceEditorForm from "./DBForm";
 import RestAPIDatasourceForm from "./RestAPIDatasourceForm";
 import { Datasource } from "entities/Datasource";
@@ -26,6 +25,7 @@ import { ReduxAction } from "constants/ReduxActionConstants";
 import { SAAS_EDITOR_DATASOURCE_ID_URL } from "../SaaSEditor/constants";
 import { setGlobalSearchQuery } from "actions/globalSearchActions";
 import { toggleShowGlobalSearchModal } from "actions/globalSearchActions";
+import { redirectToNewIntegrations } from "actions/apiPaneActions";
 
 interface ReduxStateProps {
   formData: Datasource;
@@ -70,27 +70,31 @@ class DataSourceEditor extends React.Component<Props> {
   };
 
   handleSave = (formData: Datasource) => {
-    this.props.updateDatasource(formData);
+    const { applicationId, pageId } = this.props.match.params;
+    this.props.updateDatasource(
+      formData,
+      this.props.redirectToNewIntegrations(applicationId, pageId),
+    );
   };
 
   render() {
     const {
+      deleteDatasource,
+      formConfig,
+      formData,
+      isDeleting,
+      isNewDatasource,
+      isSaving,
+      isTesting,
       match: {
         params: { datasourceId },
       },
-      isSaving,
-      formData,
-      isTesting,
-      formConfig,
-      isDeleting,
-      deleteDatasource,
-      isNewDatasource,
-      pluginImages,
-      pluginId,
-      viewMode,
-      setDatasourceEditorMode,
-      pluginType,
       openOmnibarReadMore,
+      pluginId,
+      pluginImages,
+      pluginType,
+      setDatasourceEditorMode,
+      viewMode,
     } = this.props;
 
     return (
@@ -149,6 +153,9 @@ const mapDispatchToProps = (dispatch: any): DatasourcePaneFunctions => ({
   updateDatasource: (formData: any, onSuccess?: ReduxAction<unknown>) => {
     dispatch(updateDatasource(formData, onSuccess));
   },
+  redirectToNewIntegrations: (applicationId: string, pageId: string) => {
+    dispatch(redirectToNewIntegrations(applicationId, pageId));
+  },
   testDatasource: (data: Datasource) => dispatch(testDatasource(data)),
   deleteDatasource: (id: string) => dispatch(deleteDatasource({ id })),
   switchDatasource: (id: string) => dispatch(switchDatasource(id)),
@@ -162,44 +169,34 @@ const mapDispatchToProps = (dispatch: any): DatasourcePaneFunctions => ({
 
 export interface DatasourcePaneFunctions {
   submitForm: (name: string) => void;
-  updateDatasource: (formData: any, onSuccess?: ReduxAction<unknown>) => void;
+  updateDatasource: (formData: any, onSuccess?: any) => void;
   testDatasource: (data: Datasource) => void;
   deleteDatasource: (id: string) => void;
   switchDatasource: (id: string) => void;
   setDatasourceEditorMode: (id: string, viewMode: boolean) => void;
   openOmnibarReadMore: (text: string) => void;
+  redirectToNewIntegrations: (applicationId: string, pageId: string) => void;
 }
 
 class DatasourceEditorRouter extends React.Component<Props> {
   render() {
     const {
-      match: {
-        params: { datasourceId, applicationId, pageId },
-      },
-      isSaving,
       history,
       isDeleting,
-      location,
       isNewDatasource,
-      pluginImages,
-      pluginId,
+      isSaving,
+      location,
+      match: {
+        params: { applicationId, datasourceId, pageId },
+      },
       pluginDatasourceForm,
+      pluginId,
+      pluginImages,
       pluginPackageName,
     } = this.props;
     if (!pluginId && datasourceId) {
       return <EntityNotFoundPane />;
     }
-    if (!datasourceId) {
-      return (
-        <DatasourceHome
-          applicationId={applicationId}
-          history={history}
-          isSaving={isSaving}
-          location={location}
-          pageId={pageId}
-        />
-      );
-    }
 
     // Check for specific form types first
     if (pluginDatasourceForm === "RestAPIDatasourceForm") {
diff --git a/app/client/src/pages/Editor/EditableAppName.tsx b/app/client/src/pages/Editor/EditableAppName.tsx
index 8de2a2f11a..5f9c14f6df 100644
--- a/app/client/src/pages/Editor/EditableAppName.tsx
+++ b/app/client/src/pages/Editor/EditableAppName.tsx
@@ -8,6 +8,7 @@ import { getTypographyByKey } from "constants/DefaultTheme";
 
 type EditableTextWrapperProps = EditableTextProps & {
   isNewApp: boolean;
+  isError: boolean;
 };
 
 const Container = styled.div`
@@ -44,29 +45,32 @@ export default function EditableTextWrapper(props: EditableTextWrapperProps) {
 
   return (
     <Container>
-      <EditableText
-        className={props.className}
-        defaultValue={props.defaultValue}
-        editInteractionKind={props.editInteractionKind}
-        fill={props.fill}
-        hideEditIcon
-        isEditingDefault={isEditingDefault}
-        isInvalid={(value: string) => {
-          if (value.trim() === "") {
-            Toaster.show({
-              text: "Application name can't be empty",
-              variant: Variant.danger,
-            });
-          }
-          return false;
-        }}
-        onBlur={(value) => {
-          if (props.onBlur) props.onBlur(value);
-          setIsEditingDefault(false);
-        }}
-        placeholder={props.placeholder}
-        savingState={props.savingState}
-      />
+      {props.defaultValue && (
+        <EditableText
+          className={props.className}
+          defaultValue={props.defaultValue}
+          editInteractionKind={props.editInteractionKind}
+          fill={props.fill}
+          hideEditIcon
+          isEditingDefault={isEditingDefault}
+          isError={props.isError}
+          isInvalid={(value: string) => {
+            if (value.trim() === "") {
+              Toaster.show({
+                text: "Application name can't be empty",
+                variant: Variant.danger,
+              });
+            }
+            return false;
+          }}
+          onBlur={(value) => {
+            if (props.onBlur) props.onBlur(value);
+            setIsEditingDefault(false);
+          }}
+          placeholder={props.placeholder}
+          savingState={props.savingState}
+        />
+      )}
     </Container>
   );
 }
diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx
index ff6e3674f0..86c90d9d21 100644
--- a/app/client/src/pages/Editor/EditorHeader.tsx
+++ b/app/client/src/pages/Editor/EditorHeader.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 import styled, { ThemeProvider } from "styled-components";
 import {
   ApplicationPayload,
@@ -32,6 +32,8 @@ import { updateApplication } from "actions/applicationActions";
 import {
   getApplicationList,
   getIsSavingAppName,
+  getIsErroredSavingAppName,
+  showAppInviteUsersDialogSelector,
 } from "selectors/applicationSelectors";
 import EditableAppName from "./EditableAppName";
 import Boxed from "components/editorComponents/Onboarding/Boxed";
@@ -50,7 +52,9 @@ import HelpBar from "components/editorComponents/GlobalSearch/HelpBar";
 import HelpButton from "./HelpButton";
 import OnboardingIndicator from "components/editorComponents/Onboarding/Indicator";
 import { getThemeDetails, ThemeMode } from "selectors/themeSelectors";
-import ToggleCommentModeButton from "comments/ToggleCommentModeButton";
+import ToggleModeButton from "pages/Editor/ToggleModeButton";
+import TooltipComponent from "components/ads/Tooltip";
+import moment from "moment/moment";
 
 const HeaderWrapper = styled(StyledHeader)`
   width: 100%;
@@ -90,10 +94,11 @@ const HeaderSection = styled.div`
   top: -1px;
   display: flex;
   flex: 1;
-  overflow: hidden;
+  overflow: visible;
   align-items: center;
   :nth-child(1) {
     justify-content: flex-start;
+    max-width: 30%;
   }
   :nth-child(2) {
     justify-content: center;
@@ -142,24 +147,49 @@ type EditorHeaderProps = {
   isSaving: boolean;
   publishApplication: (appId: string) => void;
   darkTheme: any;
+  lastUpdatedTime?: number;
 };
 
 export function EditorHeader(props: EditorHeaderProps) {
   const {
-    currentApplication,
-    isSaving,
-    pageSaveError,
-    pageId,
-    orgId,
     applicationId,
-    publishApplication,
+    currentApplication,
     isPublishing,
+    isSaving,
+    lastUpdatedTime,
+    orgId,
+    pageId,
+    pageSaveError,
+    publishApplication,
   } = props;
 
   const dispatch = useDispatch();
   const isSavingName = useSelector(getIsSavingAppName);
+  const isErroredSavingName = useSelector(getIsErroredSavingAppName);
   const applicationList = useSelector(getApplicationList);
   const user = useSelector(getCurrentUser);
+  const [lastUpdatedTimeMessage, setLastUpdatedTimeMessage] = useState<string>(
+    "",
+  );
+
+  const findLastUpdatedTimeMessage = () => {
+    setLastUpdatedTimeMessage(
+      lastUpdatedTime
+        ? `Saved ${moment(lastUpdatedTime * 1000).fromNow()}`
+        : "",
+    );
+  };
+
+  useEffect(() => {
+    findLastUpdatedTimeMessage();
+    const interval = setInterval(
+      findLastUpdatedTimeMessage,
+      (moment.relativeTimeThreshold("ss") as number) * 1000,
+    );
+    return () => {
+      clearInterval(interval);
+    };
+  }, [lastUpdatedTime]);
 
   const handlePublish = () => {
     if (applicationId) {
@@ -179,12 +209,14 @@ export function EditorHeader(props: EditorHeaderProps) {
   } else {
     if (!pageSaveError) {
       saveStatusIcon = (
-        <HeaderIcons.SAVE_SUCCESS
-          className="t--save-status-success"
-          color={"#36AB80"}
-          height={20}
-          width={20}
-        />
+        <TooltipComponent content={lastUpdatedTimeMessage} hoverOpenDelay={200}>
+          <HeaderIcons.SAVE_SUCCESS
+            className="t--save-status-success"
+            color={"#36AB80"}
+            height={20}
+            width={20}
+          />
+        </TooltipComponent>
       );
     } else {
       saveStatusIcon = (
@@ -205,6 +237,10 @@ export function EditorHeader(props: EditorHeaderProps) {
     dispatch(updateApplication(id, data));
   };
 
+  const showAppInviteUsersDialog = useSelector(
+    showAppInviteUsersDialogSelector,
+  );
+
   return (
     <ThemeProvider theme={props.darkTheme}>
       <HeaderWrapper>
@@ -217,27 +253,27 @@ export function EditorHeader(props: EditorHeaderProps) {
             />
           </Link>
           <Boxed step={OnboardingStep.FINISH}>
-            {currentApplication && (
-              <EditableAppName
-                className="t--application-name editable-application-name"
-                defaultValue={currentApplication.name || ""}
-                editInteractionKind={EditInteractionKind.SINGLE}
-                fill
-                isNewApp={
-                  applicationList.filter((el) => el.id === applicationId)
-                    .length > 0
-                }
-                onBlur={(value: string) =>
-                  updateApplicationDispatch(applicationId || "", {
-                    name: value,
-                    currentApp: true,
-                  })
-                }
-                savingState={
-                  isSavingName ? SavingState.STARTED : SavingState.NOT_STARTED
-                }
-              />
-            )}
+            <EditableAppName
+              className="t--application-name editable-application-name"
+              defaultValue={currentApplication?.name || ""}
+              editInteractionKind={EditInteractionKind.SINGLE}
+              fill
+              isError={isErroredSavingName}
+              isNewApp={
+                applicationList.filter((el) => el.id === applicationId).length >
+                0
+              }
+              onBlur={(value: string) =>
+                updateApplicationDispatch(applicationId || "", {
+                  name: value,
+                  currentApp: true,
+                })
+              }
+              savingState={
+                isSavingName ? SavingState.STARTED : SavingState.NOT_STARTED
+              }
+            />
+            <ToggleModeButton />
           </Boxed>
         </HeaderSection>
         <HeaderSection>
@@ -246,7 +282,6 @@ export function EditorHeader(props: EditorHeaderProps) {
         </HeaderSection>
         <HeaderSection>
           <Boxed step={OnboardingStep.FINISH}>
-            <ToggleCommentModeButton />
             <SaveStatusContainer className={"t--save-status-container"}>
               {saveStatusIcon}
             </SaveStatusContainer>
@@ -254,6 +289,7 @@ export function EditorHeader(props: EditorHeaderProps) {
               Form={AppInviteUsersForm}
               applicationId={applicationId}
               canOutsideClickClose
+              isOpen={showAppInviteUsersDialog}
               orgId={orgId}
               title={
                 currentApplication
@@ -282,7 +318,6 @@ export function EditorHeader(props: EditorHeaderProps) {
               >
                 <StyledDeployButton
                   className="t--application-publish-btn"
-                  fill
                   isLoading={isPublishing}
                   onClick={handlePublish}
                   size={Size.small}
@@ -316,6 +351,7 @@ export function EditorHeader(props: EditorHeaderProps) {
 }
 
 const mapStateToProps = (state: AppState) => ({
+  lastUpdatedTime: state.ui.editor.lastUpdatedTime,
   pageName: state.ui.editor.currentPageName,
   isSaving: getIsPageSaving(state),
   pageSaveError: getPageSavingError(state),
diff --git a/app/client/src/pages/Editor/EditorSidebar.tsx b/app/client/src/pages/Editor/EditorSidebar.tsx
index 38e56d3518..7668e7b0f4 100644
--- a/app/client/src/pages/Editor/EditorSidebar.tsx
+++ b/app/client/src/pages/Editor/EditorSidebar.tsx
@@ -296,11 +296,11 @@ class EditorSidebar extends React.Component<Props, State> {
 
   render() {
     const {
+      createButtonTitle,
       isLoading,
       itemRender,
-      selectedItemId,
       location,
-      createButtonTitle,
+      selectedItemId,
     } = this.props;
 
     const { search } = this.state;
diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
index 2689a1f8bd..5bf3101135 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
@@ -12,9 +12,12 @@ import {
 } from "actions/actionActions";
 
 import { initExplorerEntityNameEdit } from "actions/explorerActions";
-import { ContextMenuPopoverModifiers } from "../helpers";
+import { ContextMenuPopoverModifiers, ExplorerURLParams } from "../helpers";
 import { noop } from "lodash";
 import { useNewActionName } from "./helpers";
+import { useParams } from "react-router";
+import { BUILDER_PAGE_URL } from "constants/routes";
+import history from "utils/history";
 
 type EntityContextMenuProps = {
   id: string;
@@ -24,7 +27,7 @@ type EntityContextMenuProps = {
 };
 export function ActionEntityContextMenu(props: EntityContextMenuProps) {
   const nextEntityName = useNewActionName();
-
+  const params = useParams<ExplorerURLParams>();
   const dispatch = useDispatch();
   const copyActionToPage = useCallback(
     (actionId: string, actionName: string, pageId: string) =>
@@ -32,7 +35,7 @@ export function ActionEntityContextMenu(props: EntityContextMenuProps) {
         copyActionRequest({
           id: actionId,
           destinationPageId: pageId,
-          name: nextEntityName(`${actionName}Copy`, pageId),
+          name: nextEntityName(actionName, pageId, true),
         }),
       ),
     [dispatch, nextEntityName],
@@ -50,8 +53,8 @@ export function ActionEntityContextMenu(props: EntityContextMenuProps) {
     [dispatch, nextEntityName, props.pageId],
   );
   const deleteActionFromPage = useCallback(
-    (actionId: string, actionName: string) =>
-      dispatch(deleteAction({ id: actionId, name: actionName })),
+    (actionId: string, actionName: string, onSuccess?: () => void) =>
+      dispatch(deleteAction({ id: actionId, name: actionName, onSuccess })),
     [dispatch],
   );
 
@@ -110,9 +113,14 @@ export function ActionEntityContextMenu(props: EntityContextMenuProps) {
         },
         {
           value: "delete",
-          onSelect: () => deleteActionFromPage(props.id, props.name),
           label: "Delete",
           intent: "danger",
+          onSelect: () =>
+            deleteActionFromPage(props.id, props.name, () => {
+              history.push(
+                BUILDER_PAGE_URL(params.applicationId, params.pageId),
+              );
+            }),
         },
       ]}
       selectedValue=""
diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionsGroup.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionsGroup.tsx
index ab9779bcd4..85371dc187 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/ActionsGroup.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/ActionsGroup.tsx
@@ -23,13 +23,16 @@ export const ExplorerActionsGroup = memo((props: ExplorerActionsGroupProps) => {
           params.applicationId,
           props.page.pageId,
           action.config.id,
+          action.config.pluginType,
         );
         const actionId = getActionIdFromURL();
         const active = actionId === action.config.id;
 
         const icon = props.config?.getIcon(
           action.config,
-          props.plugins[action.config.datasource.pluginId],
+          props.plugins[
+            action.config.pluginId || action.config.datasource.pluginId
+          ],
         );
         return (
           <ExplorerActionEntity
diff --git a/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx b/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx
index 6c84e74c27..13d4c48eed 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx
@@ -2,12 +2,13 @@ import React, { ReactNode, useMemo } from "react";
 import { apiIcon, dbQueryIcon, MethodTag, QueryIcon } from "../ExplorerIcons";
 import { PluginType } from "entities/Action";
 import { generateReactKey } from "utils/generators";
-import { QUERIES_EDITOR_URL, API_EDITOR_URL } from "constants/routes";
 import {
   API_EDITOR_ID_URL,
   QUERIES_EDITOR_ID_URL,
-  API_EDITOR_URL_WITH_SELECTED_PAGE_ID,
-  QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID,
+  INTEGRATION_EDITOR_URL,
+  API_EDITOR_URL,
+  QUERIES_EDITOR_URL,
+  INTEGRATION_TABS,
 } from "constants/routes";
 
 import { Page } from "constants/ReduxActionConstants";
@@ -34,12 +35,14 @@ export type ActionGroupConfig = {
     applicationId: string,
     pageId: string,
     id: string,
+    pluginType: PluginType,
     plugin?: Plugin,
   ) => string;
   generateCreatePageURL: (
     applicationId: string,
     pageId: string,
-    selectedPageId: string,
+    selectedTab: string,
+    mode?: string,
   ) => string;
   getIcon: (action: any, plugin: Plugin) => ReactNode;
   isGroupActive: (params: ExplorerURLParams, pageId: string) => boolean;
@@ -49,80 +52,84 @@ export type ActionGroupConfig = {
 // When we have new action plugins, we can just add it to this map
 // There should be no other place where we refer to the PluginType in entity explorer.
 /*eslint-disable react/display-name */
-export const ACTION_PLUGIN_MAP: Array<
-  ActionGroupConfig | undefined
-> = Object.keys(PluginType).map((type: string) => {
-  switch (type) {
-    case PluginType.API:
-      return {
-        groupName: "APIs",
-        types: [PluginType.API, PluginType.SAAS],
-        icon: apiIcon,
-        key: generateReactKey(),
-        getURL: (
-          applicationId: string,
-          pageId: string,
-          id: string,
-          plugin?: Plugin,
-        ) => {
-          if (!plugin || plugin.type === PluginType.API) {
-            return `${API_EDITOR_ID_URL(applicationId, pageId, id)}`;
-          }
-          return `${SAAS_EDITOR_API_ID_URL(
-            applicationId,
-            pageId,
-            plugin.packageName,
-            id,
-          )}`;
-        },
-        getIcon: (action: any, plugin: Plugin) => {
-          if (plugin && plugin.type === PluginType.SAAS && plugin.iconLocation)
-            return <QueryIcon plugin={plugin} />;
-          const method = action.actionConfiguration.httpMethod;
+export const ACTION_PLUGIN_MAP: Array<ActionGroupConfig | undefined> = [
+  {
+    groupName: "Datasources",
+    types: [PluginType.API, PluginType.SAAS, PluginType.DB],
+    icon: dbQueryIcon,
+    key: generateReactKey(),
+    getURL: (
+      applicationId: string,
+      pageId: string,
+      id: string,
+      pluginType: PluginType,
+      plugin?: Plugin,
+    ) => {
+      if (!!plugin && pluginType === PluginType.SAAS) {
+        return `${SAAS_EDITOR_API_ID_URL(
+          applicationId,
+          pageId,
+          plugin.packageName,
+          id,
+        )}`;
+      } else if (pluginType === PluginType.DB) {
+        return `${QUERIES_EDITOR_ID_URL(applicationId, pageId, id)}`;
+      } else {
+        return `${API_EDITOR_ID_URL(applicationId, pageId, id)}`;
+      }
+    },
+    getIcon: (action: any, plugin: Plugin) => {
+      if (plugin && plugin.type !== PluginType.API && plugin.iconLocation)
+        return <QueryIcon plugin={plugin} />;
+      else if (plugin && plugin.type === PluginType.DB) return dbQueryIcon;
 
-          if (!method) return apiIcon;
-          return <MethodTag type={method} />;
-        },
-        generateCreatePageURL: API_EDITOR_URL_WITH_SELECTED_PAGE_ID,
-        isGroupActive: (params: ExplorerURLParams, pageId: string) =>
-          [
-            API_EDITOR_URL(params.applicationId, pageId),
-            SAAS_BASE_URL(params.applicationId, pageId),
-          ].includes(window.location.pathname),
-        isGroupExpanded: (params: ExplorerURLParams, pageId: string) =>
-          window.location.pathname.indexOf(
-            API_EDITOR_URL(params.applicationId, pageId),
-          ) > -1 ||
-          window.location.pathname.indexOf(
-            SAAS_BASE_URL(params.applicationId, pageId),
-          ) > -1,
-      };
-    case PluginType.DB:
-      return {
-        groupName: "DB Queries",
-        types: [PluginType.DB],
-        icon: dbQueryIcon,
-        key: generateReactKey(),
-        getURL: (applicationId: string, pageId: string, id: string) =>
-          `${QUERIES_EDITOR_ID_URL(applicationId, pageId, id)}`,
-        getIcon: (action: any, plugin: Plugin) => {
-          if (plugin && plugin.iconLocation)
-            return <QueryIcon plugin={plugin} />;
-          return dbQueryIcon;
-        },
-        generateCreatePageURL: QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID,
-        isGroupActive: (params: ExplorerURLParams, pageId: string) =>
-          window.location.pathname ===
-          QUERIES_EDITOR_URL(params.applicationId, pageId),
-        isGroupExpanded: (params: ExplorerURLParams, pageId: string) =>
-          window.location.pathname.indexOf(
-            QUERIES_EDITOR_URL(params.applicationId, pageId),
-          ) > -1,
-      };
-    default:
-      return undefined;
-  }
-});
+      const method = action.actionConfiguration.httpMethod;
+      if (!method) return apiIcon;
+      return <MethodTag type={method} />;
+    },
+    generateCreatePageURL: INTEGRATION_EDITOR_URL,
+    isGroupActive: (params: ExplorerURLParams, pageId: string) =>
+      [
+        INTEGRATION_EDITOR_URL(
+          params.applicationId,
+          pageId,
+          INTEGRATION_TABS.NEW,
+        ),
+        INTEGRATION_EDITOR_URL(
+          params.applicationId,
+          pageId,
+          INTEGRATION_TABS.ACTIVE,
+        ),
+        API_EDITOR_URL(params.applicationId, pageId),
+        SAAS_BASE_URL(params.applicationId, pageId),
+        QUERIES_EDITOR_URL(params.applicationId, pageId),
+      ].includes(window.location.pathname),
+    isGroupExpanded: (params: ExplorerURLParams, pageId: string) =>
+      window.location.pathname.indexOf(
+        INTEGRATION_EDITOR_URL(
+          params.applicationId,
+          pageId,
+          INTEGRATION_TABS.NEW,
+        ),
+      ) > -1 ||
+      window.location.pathname.indexOf(
+        INTEGRATION_EDITOR_URL(
+          params.applicationId,
+          pageId,
+          INTEGRATION_TABS.ACTIVE,
+        ),
+      ) > -1 ||
+      window.location.pathname.indexOf(
+        API_EDITOR_URL(params.applicationId, pageId),
+      ) > -1 ||
+      window.location.pathname.indexOf(
+        SAAS_BASE_URL(params.applicationId, pageId),
+      ) > -1 ||
+      window.location.pathname.indexOf(
+        QUERIES_EDITOR_URL(params.applicationId, pageId),
+      ) > -1,
+  },
+];
 
 export const getActionConfig = (type: PluginType) =>
   ACTION_PLUGIN_MAP.find((configByType: ActionGroupConfig | undefined) =>
@@ -141,10 +148,25 @@ export const getPluginGroups = (
   return actionPluginMap?.map((config?: ActionGroupConfig) => {
     if (!config) return null;
 
-    const entries = actions?.filter((entry: any) =>
+    let entries = actions?.filter((entry: any) =>
       config.types.includes(entry.config.pluginType),
     );
 
+    // To show properly ordered entries in integrations tab
+    entries = Array.isArray(entries)
+      ? [
+          ...entries.filter(
+            (entry: any) => entry.config.pluginType === PluginType.API,
+          ),
+          ...entries.filter(
+            (entry: any) => entry.config.pluginType === PluginType.SAAS,
+          ),
+          ...entries.filter(
+            (entry: any) => entry.config.pluginType === PluginType.DB,
+          ),
+        ]
+      : entries;
+
     const filteredPlugins = plugins.filter((plugin) =>
       config.types.includes(plugin.type),
     );
@@ -185,7 +207,11 @@ export const useNewActionName = () => {
   const groupedActions = useMemo(() => {
     return groupBy(actions, "config.pageId");
   }, [actions]);
-  return (name: string, destinationPageId: string) => {
+  return (
+    name: string,
+    destinationPageId: string,
+    isCopyOperation?: boolean,
+  ) => {
     const pageActions = groupedActions[destinationPageId];
     // Get action names of the destination page only
     const actionNames = pageActions
@@ -193,7 +219,11 @@ export const useNewActionName = () => {
       : [];
 
     return actionNames.indexOf(name) > -1
-      ? getNextEntityName(name, actionNames)
+      ? getNextEntityName(
+          isCopyOperation ? `${name}Copy` : name,
+          actionNames,
+          true,
+        )
       : name;
   };
 };
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx
index 9a95ee51db..3fb14c4f28 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx
@@ -16,6 +16,7 @@ import {
   fetchDatasourceStructure,
   saveDatasourceName,
   expandDatasourceEntity,
+  setDatsourceEditorMode,
 } from "actions/datasourceActions";
 import { useDispatch, useSelector } from "react-redux";
 import { AppState } from "reducers";
@@ -44,9 +45,15 @@ export function ExplorerDatasourceEntity(props: ExplorerDatasourceEntityProps) {
           params.pageId,
           props.plugin.packageName,
           props.datasource.id,
+          {
+            viewMode: true,
+          },
         ),
       );
     } else {
+      dispatch(
+        setDatsourceEditorMode({ id: props.datasource.id, viewMode: true }),
+      );
       history.push(
         DATA_SOURCES_EDITOR_ID_URL(
           params.applicationId,
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/QueryTemplates.tsx b/app/client/src/pages/Editor/Explorer/Datasources/QueryTemplates.tsx
index 838cf7408c..27ea53c14f 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/QueryTemplates.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/QueryTemplates.tsx
@@ -12,7 +12,7 @@ import history from "utils/history";
 import { Datasource, QueryTemplate } from "entities/Datasource";
 import { useParams } from "react-router";
 import { ExplorerURLParams } from "../helpers";
-import { QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID } from "constants/routes";
+import { INTEGRATION_EDITOR_URL, INTEGRATION_TABS } from "constants/routes";
 import { getDatasource } from "selectors/entitiesSelector";
 
 const Container = styled.div`
@@ -50,6 +50,7 @@ export function QueryTemplates(props: QueryTemplatesProps) {
       const queryactionConfiguration: Partial<QueryAction> = {
         actionConfiguration: {
           body: template.body,
+          pluginSpecifiedTemplates: template.pluginSpecifiedTemplates,
         },
       };
 
@@ -69,10 +70,10 @@ export function QueryTemplates(props: QueryTemplatesProps) {
         }),
       );
       history.push(
-        QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID(
+        INTEGRATION_EDITOR_URL(
           params.applicationId,
           currentPageId,
-          currentPageId,
+          INTEGRATION_TABS.ACTIVE,
         ),
       );
     },
diff --git a/app/client/src/pages/Editor/Explorer/Entity/CollapseToggle.tsx b/app/client/src/pages/Editor/Explorer/Entity/CollapseToggle.tsx
index 4184636cfb..dfa4db366e 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/CollapseToggle.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/CollapseToggle.tsx
@@ -6,12 +6,12 @@ import { Colors } from "constants/Colors";
 export function CollapseToggle(props: {
   isOpen: boolean;
   isVisible: boolean;
-  onClick: () => void;
+  onClick: (e: any) => void;
   disabled: boolean;
   className: string;
 }) {
   const handleClick = (e: any) => {
-    props.onClick();
+    props.onClick(e);
     e.stopPropagation();
   };
   const icon: IconName = props.isOpen
diff --git a/app/client/src/pages/Editor/Explorer/Entity/Name.tsx b/app/client/src/pages/Editor/Explorer/Entity/Name.tsx
index c68dd2eefc..c58b3440be 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/Name.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/Name.tsx
@@ -71,7 +71,7 @@ export interface EntityNameProps {
 
 export const EntityName = forwardRef(
   (props: EntityNameProps, ref: React.Ref<HTMLDivElement>) => {
-    const { name, updateEntityName, searchKeyword } = props;
+    const { name, searchKeyword, updateEntityName } = props;
     const tabs:
       | Array<{ id: string; widgetId: string; label: string }>
       | undefined = useSelector((state: AppState) => {
diff --git a/app/client/src/pages/Editor/Explorer/Entity/index.tsx b/app/client/src/pages/Editor/Explorer/Entity/index.tsx
index 508daf0760..e64bba1604 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/index.tsx
@@ -35,9 +35,13 @@ export const EntityItem = styled.div<{
   active: boolean;
   step: number;
   spaced: boolean;
+  highlight: boolean;
 }>`
   position: relative;
+  border-top: ${(props) => (props.highlight ? "1px solid #e7e7e7" : "none")};
+  border-bottom: ${(props) => (props.highlight ? "1px solid #e7e7e7" : "none")};
   font-size: 12px;
+  user-select: none;
   padding-left: ${(props) =>
     props.step * props.theme.spaces[2] + props.theme.spaces[2]}px;
   background: ${(props) => (props.active ? Colors.TUNDORA : "none")};
@@ -91,10 +95,11 @@ export type EntityProps = {
   className?: string;
   name: string;
   children?: ReactNode;
+  highlight?: boolean;
   icon: ReactNode;
   rightIcon?: ReactNode;
   disabled?: boolean;
-  action?: () => void;
+  action?: (e: any) => void;
   active?: boolean;
   isDefaultExpanded?: boolean;
   onCreate?: () => void;
@@ -127,11 +132,11 @@ export const Entity = forwardRef(
     }, [props.searchKeyword]);
     /* eslint-enable react-hooks/exhaustive-deps */
 
-    const toggleChildren = () => {
+    const toggleChildren = (e: any) => {
       // Make sure this entity is enabled before toggling the collpse of children.
       !props.disabled && open(!isOpen);
       if (props.runActionOnExpand && !isOpen) {
-        props.action && props.action();
+        props.action && props.action(e);
       }
 
       if (props.onToggle) {
@@ -145,9 +150,9 @@ export const Entity = forwardRef(
       );
     };
 
-    const handleClick = () => {
-      if (props.action) props.action();
-      else toggleChildren();
+    const handleClick = (e: any) => {
+      if (props.action) props.action(e);
+      else toggleChildren(e);
     };
 
     const itemRef = useRef<HTMLDivElement | null>(null);
@@ -161,6 +166,10 @@ export const Entity = forwardRef(
       >
         <EntityItem
           active={!!props.active}
+          className={`${props.highlight ? "highlighted" : ""} ${
+            props.active ? "active" : ""
+          }`}
+          highlight={!!props.highlight}
           spaced={!!props.children}
           step={props.step}
         >
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
new file mode 100644
index 0000000000..d6ba906d44
--- /dev/null
+++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
@@ -0,0 +1,229 @@
+import { act, fireEvent, render } from "test/testUtils";
+import {
+  buildChildren,
+  widgetCanvasFactory,
+} from "test/factories/WidgetFactoryUtils";
+import React from "react";
+import { MockPageDSL } from "test/testCommon";
+import Sidebar from "components/editorComponents/Sidebar";
+import { generateReactKey } from "utils/generators";
+jest.useFakeTimers();
+describe("Entity Explorer tests", () => {
+  it("Should render Widgets tree in entity explorer", () => {
+    const children: any = buildChildren([{ type: "TABS_WIDGET" }]);
+    const dsl: any = widgetCanvasFactory.build({
+      children,
+    });
+    const component = render(
+      <MockPageDSL dsl={dsl}>
+        <Sidebar />
+      </MockPageDSL>,
+    );
+    const widgetsTree: any = component.queryByText("Widgets");
+    act(() => {
+      fireEvent.click(widgetsTree);
+      jest.runAllTimers();
+    });
+    const tabsWidget = component.queryByText(children[0].widgetName);
+    expect(tabsWidget).toBeTruthy();
+  });
+
+  it("Select widget on entity explorer", () => {
+    const children: any = buildChildren([{ type: "TABS_WIDGET" }]);
+    const dsl: any = widgetCanvasFactory.build({
+      children,
+    });
+    const component = render(
+      <MockPageDSL dsl={dsl}>
+        <Sidebar />
+      </MockPageDSL>,
+    );
+    const widgetsTree: any = component.queryByText("Widgets");
+    act(() => {
+      fireEvent.click(widgetsTree);
+      jest.runAllTimers();
+    });
+    const tabsWidget: any = component.queryByText(children[0].widgetName);
+    act(() => {
+      fireEvent.click(tabsWidget);
+      jest.runAllTimers();
+    });
+    const highlighted = component.container.getElementsByClassName(
+      "highlighted active",
+    );
+    expect(highlighted.length).toBe(1);
+  });
+
+  it("CMD + click Multi Select widget on entity explorer", () => {
+    const children: any = buildChildren([
+      { type: "CHECKBOX_WIDGET", parentId: "0" },
+      { type: "SWITCH_WIDGET", parentId: "0" },
+    ]);
+    const dsl: any = widgetCanvasFactory.build({
+      children,
+    });
+    const component = render(
+      <MockPageDSL dsl={dsl}>
+        <Sidebar />
+      </MockPageDSL>,
+    );
+    const widgetsTree: any = component.queryByText("Widgets");
+    act(() => {
+      fireEvent.click(widgetsTree);
+      jest.runAllTimers();
+    });
+    const checkBox: any = component.queryByText(children[0].widgetName);
+    act(() => {
+      fireEvent.click(checkBox);
+      jest.runAllTimers();
+    });
+    const switchWidget: any = component.queryByText(children[1].widgetName);
+
+    act(() => {
+      fireEvent.click(switchWidget, {
+        ctrlKey: true,
+      });
+      jest.runAllTimers();
+    });
+    const highlighted = component.container.querySelectorAll(
+      "div.widget > .highlighted.active",
+    );
+    const active = component.container.querySelectorAll("div.widget > .active");
+    expect(highlighted.length).toBe(1);
+    expect(active.length).toBe(2);
+  });
+
+  it("Shift + Click Multi Select widget on entity explorer", () => {
+    const children: any = buildChildren([
+      { type: "CHECKBOX_WIDGET", parentId: "0" },
+      { type: "SWITCH_WIDGET", parentId: "0" },
+      { type: "BUTTON_WIDGET", parentId: "0" },
+    ]);
+    const dsl: any = widgetCanvasFactory.build({
+      children,
+    });
+    const component = render(
+      <MockPageDSL dsl={dsl}>
+        <Sidebar />
+      </MockPageDSL>,
+    );
+    const widgetsTree: any = component.queryByText("Widgets");
+    act(() => {
+      fireEvent.click(widgetsTree);
+      jest.runAllTimers();
+    });
+    const buttonWidget: any = component.queryByText(children[2].widgetName);
+
+    act(() => {
+      fireEvent.click(buttonWidget, {
+        shiftKey: true,
+      });
+      jest.runAllTimers();
+    });
+    const highlighted = component.container.querySelectorAll(
+      "div.widget > .highlighted.active",
+    );
+    const active = component.container.querySelectorAll("div.widget > .active");
+    expect(highlighted.length).toBe(1);
+    expect(active.length).toBe(3);
+  });
+
+  it("Shift + Click Deselect Non Siblings", () => {
+    const containerId = generateReactKey();
+    const canvasId = generateReactKey();
+    const children: any = buildChildren([
+      { type: "CHECKBOX_WIDGET", parentId: canvasId },
+      { type: "SWITCH_WIDGET", parentId: canvasId },
+      { type: "BUTTON_WIDGET", parentId: canvasId },
+    ]);
+    const canvasWidget = buildChildren([
+      {
+        type: "CANVAS_WIDGET",
+        parentId: containerId,
+        children,
+        widgetId: canvasId,
+      },
+    ]);
+    const containerChildren: any = buildChildren([
+      {
+        type: "CONTAINER_WIDGET",
+        children: canvasWidget,
+        widgetId: containerId,
+        parentId: "0",
+      },
+      { type: "CHART_WIDGET" },
+    ]);
+    const dsl: any = widgetCanvasFactory.build({
+      children: containerChildren,
+    });
+    const component = render(
+      <MockPageDSL dsl={dsl}>
+        <Sidebar />
+      </MockPageDSL>,
+    );
+    const widgetsTree: any = component.queryByText("Widgets");
+    act(() => {
+      fireEvent.click(widgetsTree);
+      jest.runAllTimers();
+    });
+    const containerWidget: any = component.queryByText(
+      containerChildren[0].widgetName,
+    );
+
+    act(() => {
+      fireEvent.click(containerWidget);
+      jest.runAllTimers();
+    });
+    let highlighted = component.container.querySelectorAll(
+      "div.widget > .highlighted.active",
+    );
+    let active = component.container.querySelectorAll("div.widget > .active");
+    expect(highlighted.length).toBe(1);
+    expect(active.length).toBe(1);
+    const collapsible: any = active[0].parentElement?.querySelector(
+      ".bp3-icon.bp3-icon-caret-right",
+    );
+    fireEvent.click(collapsible);
+    const buttonWidget: any = component.queryByText(children[2].widgetName);
+    act(() => {
+      fireEvent.click(buttonWidget, {
+        shiftKey: true,
+      });
+      jest.runAllTimers();
+    });
+    highlighted = component.container.querySelectorAll(
+      "div.widget > .highlighted.active",
+    );
+    active = component.container.querySelectorAll("div.widget > .active");
+    expect(highlighted.length).toBe(1);
+    expect(active.length).toBe(1);
+    const checkBoxWidget: any = component.queryByText(children[0].widgetName);
+    act(() => {
+      fireEvent.click(checkBoxWidget, {
+        shiftKey: true,
+      });
+      jest.runAllTimers();
+    });
+    highlighted = component.container.querySelectorAll(
+      "div.widget > .highlighted.active",
+    );
+    active = component.container.querySelectorAll("div.widget > .active");
+    expect(highlighted.length).toBe(1);
+    expect(active.length).toBe(3);
+    const chartWidget: any = component.queryByText(
+      containerChildren[1].widgetName,
+    );
+    act(() => {
+      fireEvent.click(chartWidget, {
+        shiftKey: true,
+      });
+      jest.runAllTimers();
+    });
+    highlighted = component.container.querySelectorAll(
+      "div.widget > .highlighted.active",
+    );
+    active = component.container.querySelectorAll("div.widget > .active");
+    expect(highlighted.length).toBe(1);
+    expect(active.length).toBe(1);
+  });
+});
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
index f2fafbe660..6c24de0fe6 100644
--- a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
+++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
@@ -55,7 +55,7 @@ function EntityExplorer(props: IPanelProps) {
     PerformanceTracker.stopTracking();
   });
   const explorerRef = useRef<HTMLDivElement | null>(null);
-  const { searchKeyword, clearSearch } = useFilteredEntities(searchInputRef);
+  const { clearSearch, searchKeyword } = useFilteredEntities(searchInputRef);
   const datasources = useFilteredDatasources(searchKeyword);
 
   const plugins = useSelector(getPlugins);
@@ -86,7 +86,7 @@ function EntityExplorer(props: IPanelProps) {
 
   return (
     <Wrapper ref={explorerRef}>
-      <Search clear={clearSearch} ref={searchInputRef} />
+      <Search clear={clearSearch} isHidden ref={searchInputRef} />
       <ExplorerPageGroup
         actions={actions}
         datasources={datasources}
diff --git a/app/client/src/pages/Editor/Explorer/ExplorerSearch.tsx b/app/client/src/pages/Editor/Explorer/ExplorerSearch.tsx
index 895d8c98e4..6aa98946b3 100644
--- a/app/client/src/pages/Editor/Explorer/ExplorerSearch.tsx
+++ b/app/client/src/pages/Editor/Explorer/ExplorerSearch.tsx
@@ -4,8 +4,8 @@ import styled from "styled-components";
 import { Colors } from "constants/Colors";
 import { ENTITY_EXPLORER_SEARCH_ID } from "constants/Explorer";
 
-const ExplorerSearchWrapper = styled.div`
-  display: grid;
+const ExplorerSearchWrapper = styled.div<{ isHidden?: boolean }>`
+  display: ${(props) => (props.isHidden ? "none" : "grid")};
   grid-template-columns: 30px 1fr 30px;
   margin-bottom: 5px;
   height: 48px;
@@ -64,11 +64,16 @@ const Underline = styled.div`
 /*eslint-disable react/display-name */
 export const ExplorerSearch = forwardRef(
   (
-    props: { clear: () => void; placeholder?: string; autoFocus?: boolean },
+    props: {
+      clear: () => void;
+      placeholder?: string;
+      autoFocus?: boolean;
+      isHidden?: boolean;
+    },
     ref: Ref<HTMLInputElement>,
   ) => {
     return (
-      <ExplorerSearchWrapper>
+      <ExplorerSearchWrapper isHidden={props.isHidden}>
         <Icon icon="search" iconSize={12} />
         <input
           autoComplete="off"
diff --git a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
index 7fe9728784..c00c31c147 100644
--- a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
@@ -102,6 +102,7 @@ export function PageContextMenu(props: {
       label: "Set as Home Page",
     });
   }
+
   if (!props.isDefaultPage) {
     optionTree.push({
       value: "delete",
diff --git a/app/client/src/pages/Editor/Explorer/PluginGroup/PluginGroup.tsx b/app/client/src/pages/Editor/Explorer/PluginGroup/PluginGroup.tsx
index 80afc5161c..fb79abc30f 100644
--- a/app/client/src/pages/Editor/Explorer/PluginGroup/PluginGroup.tsx
+++ b/app/client/src/pages/Editor/Explorer/PluginGroup/PluginGroup.tsx
@@ -12,6 +12,7 @@ import ExplorerDatasourceEntity from "../Datasources/DatasourceEntity";
 import Entity from "../Entity";
 import EntityPlaceholder from "../Entity/Placeholder";
 import { ExplorerURLParams } from "../helpers";
+import { INTEGRATION_TABS, INTEGRATION_EDITOR_MODES } from "constants/routes";
 
 type ExplorerPluginGroupProps = {
   step: number;
@@ -28,7 +29,8 @@ const ExplorerPluginGroup = memo((props: ExplorerPluginGroupProps) => {
     const path = props.actionConfig?.generateCreatePageURL(
       params?.applicationId,
       props.page.pageId,
-      props.page.pageId,
+      INTEGRATION_TABS.NEW,
+      INTEGRATION_EDITOR_MODES.AUTO,
     );
     history.push(path);
   }, [props.actionConfig, props.page.pageId, params]);
diff --git a/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx b/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx
index bcb0adbf3c..c859a1583c 100644
--- a/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx
+++ b/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx
@@ -68,13 +68,13 @@ function getSelectedOption(
 
 export default function TreeDropdown(props: TreeDropdownProps) {
   const {
-    selectedValue,
     defaultText,
-    optionTree,
-    onSelect,
-    getDefaults,
-    selectedLabelModifier,
     displayValue,
+    getDefaults,
+    onSelect,
+    optionTree,
+    selectedLabelModifier,
+    selectedValue,
     toggle,
   } = props;
   const selectedOption = getSelectedOption(
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx
index c721c3533e..da5a32c456 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx
@@ -1,6 +1,8 @@
 import React, { useCallback } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import TreeDropdown from "pages/Editor/Explorer/TreeDropdown";
+import TreeDropdown, {
+  TreeDropdownOption,
+} from "pages/Editor/Explorer/TreeDropdown";
 import ContextMenuTrigger from "../ContextMenuTrigger";
 import { ContextMenuPopoverModifiers } from "../helpers";
 import { ReduxActionTypes } from "constants/ReduxActionConstants";
@@ -17,7 +19,6 @@ export function WidgetContextMenu(props: {
 }) {
   const { widgetId } = props;
   const parentId = useSelector((state: AppState) => {
-    // console.log(state.ui.pageWidgets[props.pageId], props.widgetId);
     return state.ui.pageWidgets[props.pageId][props.widgetId].parentId;
   });
   const widget = useSelector((state: AppState) => {
@@ -64,25 +65,31 @@ export function WidgetContextMenu(props: {
     [dispatch, widgetId],
   );
 
+  const optionTree: TreeDropdownOption[] = [
+    {
+      value: "rename",
+      onSelect: editWidgetName,
+      label: "Edit Name",
+    },
+  ];
+
+  if (widget.isDeletable !== false) {
+    const option: TreeDropdownOption = {
+      value: "delete",
+      onSelect: dispatchDelete,
+      label: "Delete",
+      intent: "danger",
+    };
+
+    optionTree.push(option);
+  }
   return (
     <TreeDropdown
       className={props.className}
       defaultText=""
       modifiers={ContextMenuPopoverModifiers}
       onSelect={noop}
-      optionTree={[
-        {
-          value: "rename",
-          onSelect: editWidgetName,
-          label: "Edit Name",
-        },
-        {
-          value: "delete",
-          onSelect: dispatchDelete,
-          label: "Delete",
-          intent: "danger",
-        },
-      ]}
+      optionTree={optionTree}
       selectedValue=""
       toggle={<ContextMenuTrigger />}
     />
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
index aec72768e8..a94ebaf13b 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
@@ -4,16 +4,7 @@ import { WidgetProps } from "widgets/BaseWidget";
 import { WidgetTypes, WidgetType } from "constants/WidgetConstants";
 import { useParams } from "react-router";
 import { ExplorerURLParams } from "../helpers";
-import { BUILDER_PAGE_URL } from "constants/routes";
-import history from "utils/history";
-import { flashElementById } from "utils/helpers";
-import { useDispatch, useSelector } from "react-redux";
-import {
-  forceOpenPropertyPane,
-  showModal,
-  closeAllModals,
-} from "actions/widgetActions";
-import { useWidgetSelection } from "utils/hooks/dragResizeHooks";
+import { useSelector } from "react-redux";
 import { AppState } from "reducers";
 import { getWidgetIcon } from "../ExplorerIcons";
 
@@ -23,85 +14,63 @@ import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
 import EntityProperties from "../Entity/EntityProperties";
 import { CanvasStructure } from "reducers/uiReducers/pageCanvasStructureReducer";
 import CurrentPageEntityProperties from "../Entity/CurrentPageEntityProperties";
+import { getSelectedWidget, getSelectedWidgets } from "selectors/ui";
+import { useNavigateToWidget } from "./useNavigateToWidget";
 
 export type WidgetTree = WidgetProps & { children?: WidgetTree[] };
 
 const UNREGISTERED_WIDGETS: WidgetType[] = [WidgetTypes.ICON_WIDGET];
 
-export const navigateToCanvas = (
-  params: ExplorerURLParams,
-  currentPath: string,
-  widgetPageId: string,
-  widgetId: string,
-) => {
-  const canvasEditorURL = `${BUILDER_PAGE_URL(
-    params.applicationId,
-    widgetPageId,
-  )}`;
-  if (currentPath !== canvasEditorURL) {
-    history.push(`${canvasEditorURL}#${widgetId}`);
-  }
-};
-
-export const useNavigateToWidget = () => {
-  const params = useParams<ExplorerURLParams>();
-  const dispatch = useDispatch();
-  const { selectWidget } = useWidgetSelection();
-
-  const navigateToWidget = useCallback(
-    (
-      widgetId: string,
-      widgetType: WidgetType,
-      pageId: string,
-      isWidgetSelected?: boolean,
-      parentModalId?: string,
-    ) => {
-      if (widgetType === WidgetTypes.MODAL_WIDGET) {
-        dispatch(showModal(widgetId));
-        return;
-      }
-      if (parentModalId) dispatch(showModal(parentModalId));
-      else dispatch(closeAllModals());
-      navigateToCanvas(params, window.location.pathname, pageId, widgetId);
-      flashElementById(widgetId);
-      if (!isWidgetSelected) selectWidget(widgetId);
-      dispatch(forceOpenPropertyPane(widgetId));
-    },
-    [dispatch, params, selectWidget],
-  );
-
-  return { navigateToWidget };
-};
-
 const useWidget = (
   widgetId: string,
   widgetType: WidgetType,
   pageId: string,
+  widgetsInStep: string[],
   parentModalId?: string,
 ) => {
-  const selectedWidget = useSelector(
-    (state: AppState) => state.ui.widgetDragResize.selectedWidget,
+  const selectedWidgets = useSelector(getSelectedWidgets);
+  const lastSelectedWidget = useSelector(getSelectedWidget);
+  const isWidgetSelected = useMemo(
+    () => selectedWidgets && selectedWidgets.includes(widgetId),
+    [selectedWidgets, widgetId],
   );
-  const isWidgetSelected = useMemo(() => selectedWidget === widgetId, [
-    selectedWidget,
-    widgetId,
-  ]);
+
+  const multipleWidgetsSelected = selectedWidgets && selectedWidgets.length > 1;
 
   const { navigateToWidget } = useNavigateToWidget();
 
   const boundNavigateToWidget = useCallback(
-    () =>
+    (e: any) => {
+      const isMultiSelect = e.metaKey || e.ctrlKey;
+      const isShiftSelect = e.shiftKey;
       navigateToWidget(
         widgetId,
         widgetType,
         pageId,
         isWidgetSelected,
         parentModalId,
-      ),
-    [widgetId, widgetType, pageId, isWidgetSelected, parentModalId],
+        isMultiSelect,
+        isShiftSelect,
+        widgetsInStep,
+      );
+    },
+    [
+      widgetId,
+      widgetType,
+      pageId,
+      isWidgetSelected,
+      parentModalId,
+      widgetsInStep,
+      navigateToWidget,
+    ],
   );
 
-  return { navigateToWidget: boundNavigateToWidget, isWidgetSelected };
+  return {
+    navigateToWidget: boundNavigateToWidget,
+    isWidgetSelected,
+    multipleWidgetsSelected,
+    lastSelectedWidget,
+  };
 };
 
 export type WidgetEntityProps = {
@@ -114,6 +83,7 @@ export type WidgetEntityProps = {
   parentModalId?: string;
   searchKeyword?: string;
   isDefaultExpanded?: boolean;
+  widgetsInStep: string[];
 };
 
 export const WidgetEntity = memo((props: WidgetEntityProps) => {
@@ -123,14 +93,20 @@ export const WidgetEntity = memo((props: WidgetEntityProps) => {
   );
   let shouldExpand = false;
   if (widgetsToExpand.includes(props.widgetId)) shouldExpand = true;
-  const { navigateToWidget, isWidgetSelected } = useWidget(
+  const {
+    isWidgetSelected,
+    lastSelectedWidget,
+    multipleWidgetsSelected,
+    navigateToWidget,
+  } = useWidget(
     props.widgetId,
     props.widgetType,
     props.pageId,
+    props.widgetsInStep,
     props.parentModalId,
   );
 
-  const { widgetType, widgetId, parentModalId } = props;
+  const { parentModalId, widgetId, widgetType } = props;
   /**
    * While navigating to a widget we need to show a modal if the widget is nested within it
    * Since the immediate parent for the widget would be a canvas instead of the modal,
@@ -150,13 +126,19 @@ export const WidgetEntity = memo((props: WidgetEntityProps) => {
     />
   );
 
+  const showContextMenu = props.pageId === pageId && !multipleWidgetsSelected;
+  const widgetsInStep = props?.childWidgets
+    ? props?.childWidgets?.map((child) => child.widgetId)
+    : [];
+
   return (
     <Entity
       action={navigateToWidget}
       active={isWidgetSelected}
       className="widget"
-      contextMenu={props.pageId === pageId && contextMenu}
+      contextMenu={showContextMenu && contextMenu}
       entityId={props.widgetId}
+      highlight={lastSelectedWidget === props.widgetId}
       icon={getWidgetIcon(props.widgetType)}
       isDefaultExpanded={
         shouldExpand ||
@@ -182,6 +164,7 @@ export const WidgetEntity = memo((props: WidgetEntityProps) => {
             widgetId={child.widgetId}
             widgetName={child.widgetName}
             widgetType={child.type}
+            widgetsInStep={widgetsInStep}
           />
         ))}
       {!(props.childWidgets && props.childWidgets.length > 0) &&
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx
index 4b42a13ced..f2c5fefd47 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx
+++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx
@@ -9,8 +9,8 @@ import { ExplorerURLParams } from "../helpers";
 import { BUILDER_PAGE_URL } from "constants/routes";
 import { Link } from "react-router-dom";
 import styled from "styled-components";
-import { AppState } from "reducers";
 import { CanvasStructure } from "reducers/uiReducers/pageCanvasStructureReducer";
+import { getSelectedWidgets } from "selectors/ui";
 
 type ExplorerWidgetGroupProps = {
   pageId: string;
@@ -31,9 +31,7 @@ const StyledLink = styled(Link)`
 
 export const ExplorerWidgetGroup = memo((props: ExplorerWidgetGroupProps) => {
   const params = useParams<ExplorerURLParams>();
-  const selectedWidget = useSelector(
-    (state: AppState) => state.ui.widgetDragResize.selectedWidget,
-  );
+  const selectedWidgets = useSelector(getSelectedWidgets);
 
   const childNode = (
     <EntityPlaceholder step={props.step + 1}>
@@ -53,6 +51,9 @@ export const ExplorerWidgetGroup = memo((props: ExplorerWidgetGroupProps) => {
     </EntityPlaceholder>
   );
 
+  const widgetsInStep =
+    props.widgets?.children?.map((child) => child.widgetId) || [];
+
   return (
     <Entity
       className={`group widgets ${props.addWidgetsFn ? "current" : ""}`}
@@ -61,7 +62,8 @@ export const ExplorerWidgetGroup = memo((props: ExplorerWidgetGroupProps) => {
       icon={widgetIcon}
       isDefaultExpanded={
         !!props.searchKeyword ||
-        (params.pageId === props.pageId && !!selectedWidget)
+        (params.pageId === props.pageId &&
+          !!(selectedWidgets && selectedWidgets.length))
       }
       key={props.pageId + "_widgets"}
       name="Widgets"
@@ -79,6 +81,7 @@ export const ExplorerWidgetGroup = memo((props: ExplorerWidgetGroupProps) => {
           widgetId={child.widgetId}
           widgetName={child.widgetName}
           widgetType={child.type}
+          widgetsInStep={widgetsInStep}
         />
       ))}
       {(!props.widgets?.children || props.widgets?.children.length === 0) &&
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts b/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts
new file mode 100644
index 0000000000..e445204aa6
--- /dev/null
+++ b/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts
@@ -0,0 +1,75 @@
+import { useCallback } from "react";
+import { WidgetTypes, WidgetType } from "constants/WidgetConstants";
+import { useParams } from "react-router";
+import { ExplorerURLParams } from "../helpers";
+import { flashElementById } from "utils/helpers";
+import { useDispatch, useSelector } from "react-redux";
+import {
+  forceOpenPropertyPane,
+  showModal,
+  closeAllModals,
+} from "actions/widgetActions";
+import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
+import { navigateToCanvas } from "./utils";
+import { getCurrentPageWidgets } from "selectors/entitiesSelector";
+
+export const useNavigateToWidget = () => {
+  const params = useParams<ExplorerURLParams>();
+  const allWidgets = useSelector(getCurrentPageWidgets);
+  const dispatch = useDispatch();
+  const {
+    selectWidget,
+    shiftSelectWidgetEntityExplorer,
+  } = useWidgetSelection();
+  const multiSelectWidgets = (widgetId: string, pageId: string) => {
+    navigateToCanvas(params, window.location.pathname, pageId, widgetId);
+    flashElementById(widgetId);
+    selectWidget(widgetId, true);
+  };
+
+  const selectSingleWidget = (
+    widgetId: string,
+    widgetType: WidgetType,
+    pageId: string,
+    parentModalId?: string,
+  ) => {
+    if (widgetType === WidgetTypes.MODAL_WIDGET) {
+      dispatch(showModal(widgetId));
+      return;
+    }
+    if (parentModalId) dispatch(showModal(parentModalId));
+    else dispatch(closeAllModals());
+    selectWidget(widgetId, false);
+    navigateToCanvas(params, window.location.pathname, pageId, widgetId);
+    flashElementById(widgetId);
+    dispatch(forceOpenPropertyPane(widgetId));
+  };
+
+  const navigateToWidget = useCallback(
+    (
+      widgetId: string,
+      widgetType: WidgetType,
+      pageId: string,
+      isWidgetSelected?: boolean,
+      parentModalId?: string,
+      isMultiSelect?: boolean,
+      isShiftSelect?: boolean,
+      widgetsInStep?: string[],
+    ) => {
+      // restrict multi-select across pages
+      if (widgetId && (isMultiSelect || isShiftSelect) && !allWidgets[widgetId])
+        return;
+
+      if (isShiftSelect) {
+        shiftSelectWidgetEntityExplorer(widgetId, widgetsInStep || []);
+      } else if (isMultiSelect) {
+        multiSelectWidgets(widgetId, pageId);
+      } else {
+        selectSingleWidget(widgetId, widgetType, pageId, parentModalId);
+      }
+    },
+    [dispatch, params, selectWidget, allWidgets],
+  );
+
+  return { navigateToWidget };
+};
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/utils.ts b/app/client/src/pages/Editor/Explorer/Widgets/utils.ts
new file mode 100644
index 0000000000..a4dfd4bf4f
--- /dev/null
+++ b/app/client/src/pages/Editor/Explorer/Widgets/utils.ts
@@ -0,0 +1,18 @@
+import { ExplorerURLParams } from "../helpers";
+import { BUILDER_PAGE_URL } from "constants/routes";
+import history from "utils/history";
+
+export const navigateToCanvas = (
+  params: ExplorerURLParams,
+  currentPath: string,
+  widgetPageId: string,
+  widgetId: string,
+) => {
+  const canvasEditorURL = `${BUILDER_PAGE_URL(
+    params.applicationId,
+    widgetPageId,
+  )}`;
+  if (currentPath !== canvasEditorURL) {
+    history.push(`${canvasEditorURL}#${widgetId}`);
+  }
+};
diff --git a/app/client/src/pages/Editor/GlobalHotKeys.test.tsx b/app/client/src/pages/Editor/GlobalHotKeys.test.tsx
new file mode 100644
index 0000000000..507c40715f
--- /dev/null
+++ b/app/client/src/pages/Editor/GlobalHotKeys.test.tsx
@@ -0,0 +1,329 @@
+import React from "react";
+import {
+  buildChildren,
+  widgetCanvasFactory,
+} from "test/factories/WidgetFactoryUtils";
+import { act, render, fireEvent } from "test/testUtils";
+import GlobalHotKeys from "./GlobalHotKeys";
+import MainContainer from "./MainContainer";
+import { MemoryRouter } from "react-router-dom";
+import * as utilities from "selectors/editorSelectors";
+import store from "store";
+import { sagasToRunForTests } from "test/sagas";
+import { all } from "@redux-saga/core/effects";
+import {
+  dispatchTestKeyboardEventWithCode,
+  MockApplication,
+  mockGetCanvasWidgetDsl,
+  MockPageDSL,
+  useMockDsl,
+} from "test/testCommon";
+import { MockCanvas } from "test/testMockedWidgets";
+import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
+describe("Select all hotkey", () => {
+  const mockGetIsFetchingPage = jest.spyOn(utilities, "getIsFetchingPage");
+  const spyGetCanvasWidgetDsl = jest.spyOn(utilities, "getCanvasWidgetDsl");
+  function UpdatedMainContainer({ dsl }: any) {
+    useMockDsl(dsl);
+    return <MainContainer />;
+  }
+  // These need to be at the top to avoid imports not being mocked. ideally should be in setup.ts but will override for all other tests
+  beforeAll(() => {
+    const mockGenerator = function*() {
+      yield all([]);
+    };
+
+    // top avoid the first middleware run which wud initiate all sagas.
+    jest.mock("sagas", () => ({
+      rootSaga: mockGenerator,
+    }));
+
+    // only the deafault exports are mocked to avoid overriding utilities exported out of them. defaults are marked to avoid worker initiation and page api calls in tests.
+    jest.mock("sagas/EvaluationsSaga", () => ({
+      ...jest.requireActual("sagas/EvaluationsSaga"),
+      default: mockGenerator,
+    }));
+    jest.mock("sagas/PageSagas", () => ({
+      ...jest.requireActual("sagas/PageSagas"),
+      default: mockGenerator,
+    }));
+  });
+
+  it("Cmd + A - select all widgets on canvas", () => {
+    const children: any = buildChildren([
+      { type: "TABS_WIDGET" },
+      { type: "SWITCH_WIDGET" },
+    ]);
+    const dsl: any = widgetCanvasFactory.build({
+      children,
+    });
+    spyGetCanvasWidgetDsl.mockImplementation(mockGetCanvasWidgetDsl);
+    mockGetIsFetchingPage.mockImplementation(() => false);
+
+    const component = render(
+      <MemoryRouter
+        initialEntries={["/applications/app_id/pages/page_id/edit"]}
+      >
+        <MockApplication>
+          <GlobalHotKeys>
+            <UpdatedMainContainer dsl={dsl} />
+          </GlobalHotKeys>
+        </MockApplication>
+      </MemoryRouter>,
+      { initialState: store.getState(), sagasToRun: sagasToRunForTests },
+    );
+    let propPane = component.queryByTestId("t--propertypane");
+    expect(propPane).toBeNull();
+    const canvasWidgets = component.queryAllByTestId("test-widget");
+    expect(canvasWidgets.length).toBe(2);
+    if (canvasWidgets[1].firstChild) {
+      fireEvent.mouseOver(canvasWidgets[1].firstChild);
+      fireEvent.click(canvasWidgets[1].firstChild);
+    }
+    propPane = component.queryByTestId("t--propertypane");
+    expect(propPane).not.toBeNull();
+
+    const artBoard: any = component.queryByTestId("t--canvas-artboard");
+    // deselect all other widgets
+    fireEvent.click(artBoard);
+
+    dispatchTestKeyboardEventWithCode(
+      component.container,
+      "keydown",
+      "A",
+      65,
+      false,
+      true,
+    );
+    let selectedWidgets = component.queryAllByTestId(
+      "t--widget-propertypane-toggle",
+    );
+    expect(selectedWidgets.length).toBe(2);
+    dispatchTestKeyboardEventWithCode(
+      component.container,
+      "keydown",
+      "escape",
+      27,
+      false,
+      false,
+    );
+    selectedWidgets = component.queryAllByTestId(
+      "t--widget-propertypane-toggle",
+    );
+    expect(selectedWidgets.length).toBe(0);
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "A",
+        65,
+        false,
+        true,
+      );
+    });
+
+    selectedWidgets = component.queryAllByTestId(
+      "t--widget-propertypane-toggle",
+    );
+    expect(selectedWidgets.length).toBe(2);
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "C",
+        67,
+        false,
+        true,
+      );
+    });
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "V",
+        86,
+        false,
+        true,
+      );
+    });
+    selectedWidgets = component.queryAllByTestId(
+      "t--widget-propertypane-toggle",
+    );
+    expect(selectedWidgets.length).toBe(2);
+  });
+  afterAll(() => jest.resetModules());
+});
+
+describe("Cut/Copy/Paste hotkey", () => {
+  it("Should copy and paste all selected widgets with hotkey cmd + c and cmd + v ", async () => {
+    const children: any = buildChildren([
+      {
+        type: "TABS_WIDGET",
+        topRow: 5,
+        bottomRow: 30,
+        leftColumn: 5,
+        rightColumn: 30,
+      },
+      {
+        type: "SWITCH_WIDGET",
+        topRow: 5,
+        bottomRow: 10,
+        leftColumn: 40,
+        rightColumn: 48,
+      },
+    ]);
+    const dsl: any = widgetCanvasFactory.build({
+      children,
+    });
+    const component = render(
+      <MockPageDSL dsl={dsl}>
+        <GlobalHotKeys>
+          <MockCanvas />
+        </GlobalHotKeys>
+      </MockPageDSL>,
+    );
+    const artBoard: any = await component.queryByTestId("t--canvas-artboard");
+    // deselect all other widgets
+    fireEvent.click(artBoard);
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "A",
+        65,
+        false,
+        true,
+      );
+    });
+
+    let selectedWidgets = await component.queryAllByTestId(
+      "t--widget-propertypane-toggle",
+    );
+    expect(selectedWidgets.length).toBe(2);
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "C",
+        67,
+        false,
+        true,
+      );
+    });
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "V",
+        86,
+        false,
+        true,
+      );
+    });
+    await component.findByText(children[0].widgetName + "Copy");
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "A",
+        65,
+        false,
+        true,
+      );
+    });
+
+    selectedWidgets = await component.queryAllByTestId(
+      "t--widget-propertypane-toggle",
+    );
+    expect(selectedWidgets.length).toBe(4);
+  });
+  it("Should cut and paste all selected widgets with hotkey cmd + x and cmd + v ", async () => {
+    const children: any = buildChildren([
+      {
+        type: "TABS_WIDGET",
+        topRow: 5,
+        bottomRow: 30,
+        leftColumn: 5,
+        rightColumn: 30,
+        parentId: MAIN_CONTAINER_WIDGET_ID,
+      },
+      {
+        type: "SWITCH_WIDGET",
+        topRow: 5,
+        bottomRow: 10,
+        leftColumn: 40,
+        rightColumn: 48,
+        parentId: MAIN_CONTAINER_WIDGET_ID,
+      },
+    ]);
+    const dsl: any = widgetCanvasFactory.build({
+      children,
+    });
+    const component = render(
+      <MockPageDSL dsl={dsl}>
+        <GlobalHotKeys>
+          <MockCanvas />
+        </GlobalHotKeys>
+      </MockPageDSL>,
+    );
+    const artBoard: any = await component.queryByTestId("t--canvas-artboard");
+    // deselect all other widgets
+    fireEvent.click(artBoard);
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "A",
+        65,
+        false,
+        true,
+      );
+    });
+
+    let selectedWidgets = await component.queryAllByTestId(
+      "t--widget-propertypane-toggle",
+    );
+    expect(selectedWidgets.length).toBe(2);
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "X",
+        88,
+        false,
+        true,
+      );
+    });
+    await component.findByTestId("canvas-0");
+    selectedWidgets = await component.queryAllByTestId(
+      "t--widget-propertypane-toggle",
+    );
+    expect(selectedWidgets.length).toBe(0);
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "V",
+        86,
+        false,
+        true,
+      );
+    });
+    await component.findByText(children[0].widgetName);
+    act(() => {
+      dispatchTestKeyboardEventWithCode(
+        component.container,
+        "keydown",
+        "A",
+        65,
+        false,
+        true,
+      );
+    });
+
+    selectedWidgets = await component.queryAllByTestId(
+      "t--widget-propertypane-toggle",
+    );
+    expect(selectedWidgets.length).toBe(2);
+  });
+});
diff --git a/app/client/src/pages/Editor/GlobalHotKeys.tsx b/app/client/src/pages/Editor/GlobalHotKeys.tsx
index 616fc39d59..e29910838a 100644
--- a/app/client/src/pages/Editor/GlobalHotKeys.tsx
+++ b/app/client/src/pages/Editor/GlobalHotKeys.tsx
@@ -4,24 +4,29 @@ import { AppState } from "reducers";
 import { Hotkey, Hotkeys } from "@blueprintjs/core";
 import { HotkeysTarget } from "@blueprintjs/core/lib/esnext/components/hotkeys/hotkeysTarget.js";
 import {
+  closePropertyPane,
   copyWidget,
   cutWidget,
   deleteSelectedWidget,
   pasteWidget,
 } from "actions/widgetActions";
+import {
+  selectAllWidgetsInCanvasInitAction,
+  selectMultipleWidgetsAction,
+} from "actions/widgetSelectionActions";
 import { toggleShowGlobalSearchModal } from "actions/globalSearchActions";
 import { isMac } from "utils/helpers";
-import { getSelectedWidget } from "selectors/ui";
+import { getSelectedWidget, getSelectedWidgets } from "selectors/ui";
 import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
 import { getSelectedText } from "utils/helpers";
 import AnalyticsUtil from "utils/AnalyticsUtil";
-import {
-  ENTITY_EXPLORER_SEARCH_ID,
-  WIDGETS_SEARCH_ID,
-} from "constants/Explorer";
+import { WIDGETS_SEARCH_ID } from "constants/Explorer";
 import { setCommentMode as setCommentModeAction } from "actions/commentActions";
 import { showDebugger } from "actions/debuggerActions";
 
+import { setCommentModeInUrl } from "pages/Editor/ToggleModeButton";
+import { runActionViaShortcut } from "actions/actionActions";
+
 type Props = {
   copySelectedWidget: () => void;
   pasteCopiedWidget: () => void;
@@ -30,7 +35,12 @@ type Props = {
   toggleShowGlobalSearchModal: () => void;
   resetCommentMode: () => void;
   openDebugger: () => void;
+  closeProppane: () => void;
+  executeAction: () => void;
+  selectAllWidgetsInit: () => void;
+  deselectAllWidgets: () => void;
   selectedWidget?: string;
+  selectedWidgets: string[];
   isDebuggerOpen: boolean;
   children: React.ReactNode;
 };
@@ -38,9 +48,13 @@ type Props = {
 @HotkeysTarget
 class GlobalHotKeys extends React.Component<Props> {
   public stopPropagationIfWidgetSelected(e: KeyboardEvent): boolean {
-    if (
+    const multipleWidgetsSelected =
+      this.props.selectedWidgets && this.props.selectedWidgets.length;
+    const singleWidgetSelected =
       this.props.selectedWidget &&
-      this.props.selectedWidget != MAIN_CONTAINER_WIDGET_ID &&
+      this.props.selectedWidget != MAIN_CONTAINER_WIDGET_ID;
+    if (
+      (singleWidgetSelected || multipleWidgetsSelected) &&
       !getSelectedText()
     ) {
       e.preventDefault();
@@ -50,6 +64,12 @@ class GlobalHotKeys extends React.Component<Props> {
     return false;
   }
 
+  public onOnmnibarHotKeyDown(e: KeyboardEvent) {
+    e.preventDefault();
+    this.props.toggleShowGlobalSearchModal();
+    AnalyticsUtil.logEvent("OPEN_OMNIBAR", { source: "HOTKEY_COMBO" });
+  }
+
   public renderHotkeys() {
     return (
       <Hotkeys>
@@ -58,16 +78,14 @@ class GlobalHotKeys extends React.Component<Props> {
           global
           label="Search entities"
           onKeyDown={(e: any) => {
-            const entitySearchInput = document.getElementById(
-              ENTITY_EXPLORER_SEARCH_ID,
-            );
             const widgetSearchInput = document.getElementById(
               WIDGETS_SEARCH_ID,
             );
-            if (entitySearchInput) entitySearchInput.focus();
-            if (widgetSearchInput) widgetSearchInput.focus();
-            e.preventDefault();
-            e.stopPropagation();
+            if (widgetSearchInput) {
+              widgetSearchInput.focus();
+              e.preventDefault();
+              e.stopPropagation();
+            }
           }}
         />
         <Hotkey
@@ -75,12 +93,14 @@ class GlobalHotKeys extends React.Component<Props> {
           combo="mod + k"
           global
           label="Show omnibar"
-          onKeyDown={(e: KeyboardEvent) => {
-            console.log("toggleShowGlobalSearchModal");
-            e.preventDefault();
-            this.props.toggleShowGlobalSearchModal();
-            AnalyticsUtil.logEvent("OPEN_OMNIBAR", { source: "HOTKEY_COMBO" });
-          }}
+          onKeyDown={(e) => this.onOnmnibarHotKeyDown(e)}
+        />
+        <Hotkey
+          allowInInput={false}
+          combo="mod + p"
+          global
+          label="Show omnibar"
+          onKeyDown={(e) => this.onOnmnibarHotKeyDown(e)}
         />
         <Hotkey
           combo="mod + d"
@@ -150,12 +170,49 @@ class GlobalHotKeys extends React.Component<Props> {
             }
           }}
         />
+        <Hotkey
+          combo="mod + a"
+          global
+          group="Canvas"
+          label="Select all Widget"
+          onKeyDown={(e: any) => {
+            this.props.selectAllWidgetsInit();
+            e.preventDefault();
+          }}
+        />
         <Hotkey
           combo="esc"
           global
-          label="Escape"
+          group="Canvas"
+          label="Deselect all Widget"
+          onKeyDown={(e: any) => {
+            this.props.resetCommentMode();
+            this.props.deselectAllWidgets();
+            this.props.closeProppane();
+            e.preventDefault();
+          }}
+        />
+        <Hotkey
+          combo="v"
+          global
+          label="Edit Mode"
           onKeyDown={this.props.resetCommentMode}
         />
+        <Hotkey
+          combo="c"
+          global
+          label="Comment Mode"
+          onKeyDown={() => setCommentModeInUrl(true)}
+        />
+        <Hotkey
+          allowInInput
+          combo="mod + enter"
+          global
+          label="Execute Action"
+          onKeyDown={this.props.executeAction}
+          preventDefault
+          stopPropagation
+        />
       </Hotkeys>
     );
   }
@@ -167,6 +224,7 @@ class GlobalHotKeys extends React.Component<Props> {
 
 const mapStateToProps = (state: AppState) => ({
   selectedWidget: getSelectedWidget(state),
+  selectedWidgets: getSelectedWidgets(state),
   isDebuggerOpen: state.ui.debugger.isOpen,
 });
 
@@ -179,6 +237,10 @@ const mapDispatchToProps = (dispatch: any) => {
     toggleShowGlobalSearchModal: () => dispatch(toggleShowGlobalSearchModal()),
     resetCommentMode: () => dispatch(setCommentModeAction(false)),
     openDebugger: () => dispatch(showDebugger()),
+    closeProppane: () => dispatch(closePropertyPane()),
+    selectAllWidgetsInit: () => dispatch(selectAllWidgetsInCanvasInitAction()),
+    deselectAllWidgets: () => dispatch(selectMultipleWidgetsAction([])),
+    executeAction: () => dispatch(runActionViaShortcut()),
   };
 };
 
diff --git a/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx
new file mode 100644
index 0000000000..e6abf8d931
--- /dev/null
+++ b/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx
@@ -0,0 +1,163 @@
+import React from "react";
+import styled from "styled-components";
+import { connect } from "react-redux";
+import { AppState } from "reducers";
+import { createNewQueryName } from "utils/AppsmithUtils";
+import { ActionDataState } from "reducers/entityReducers/actionsReducer";
+import { Datasource } from "entities/Datasource";
+import { createActionRequest } from "actions/actionActions";
+import { Action, ApiActionConfig, PluginType } from "entities/Action";
+import DatasourceCard from "./DatasourceCard";
+import Text, { TextType } from "components/ads/Text";
+import Button, { Category, Size } from "components/ads/Button";
+import { thinScrollbar } from "constants/DefaultTheme";
+import { Toaster } from "../../../components/ads/Toast";
+import { Variant } from "../../../components/ads/common";
+import { DEFAULT_API_ACTION_CONFIG } from "../../../constants/ApiEditorConstants";
+
+const QueryHomePage = styled.div`
+  ${thinScrollbar};
+  padding: 5px;
+  overflow: auto;
+  display: flex;
+  flex-direction: column;
+  height: calc(
+    100vh - ${(props) => props.theme.integrationsPageUnusableHeight}
+  );
+
+  .sectionHeader {
+    font-weight: ${(props) => props.theme.fontWeights[2]};
+    font-size: ${(props) => props.theme.fontSizes[4]}px;
+    margin-top: 10px;
+  }
+`;
+
+const CreateButton = styled(Button)`
+  display: inline;
+  padding: 4px 8px;
+`;
+
+const EmptyActiveDatasource = styled.div`
+  height: calc(
+    100vh - ${(props) => props.theme.integrationsPageUnusableHeight}
+  );
+  display: flex;
+  align-items: center;
+  justify-content: center;
+`;
+
+type ActiveDataSourceProps = {
+  dataSources: Datasource[];
+  applicationId: string;
+  pageId: string;
+  createAction: (data: Partial<Action> & { eventData: any }) => void;
+  actions: ActionDataState;
+  isCreating: boolean;
+  location: {
+    search: string;
+  };
+  history: {
+    replace: (data: string) => void;
+    push: (data: string) => void;
+  };
+  onCreateNew: () => void;
+};
+
+class ActiveDataSources extends React.Component<ActiveDataSourceProps> {
+  handleCreateNewQuery = (dataSource: Datasource, pluginType: PluginType) => {
+    const { actions, pageId } = this.props;
+
+    if (
+      pluginType === "API" &&
+      (!dataSource ||
+        !dataSource.datasourceConfiguration ||
+        !dataSource.datasourceConfiguration.url)
+    ) {
+      Toaster.show({
+        text: "Unable to create API. Try adding a url to the datasource",
+        variant: Variant.danger,
+      });
+      return;
+    }
+    if (pageId) {
+      const newQueryName = createNewQueryName(actions, pageId);
+
+      const headers = dataSource?.datasourceConfiguration?.headers ?? [];
+      const defaultApiActionConfig: ApiActionConfig = {
+        ...DEFAULT_API_ACTION_CONFIG,
+        headers: headers.length ? headers : DEFAULT_API_ACTION_CONFIG.headers,
+      };
+
+      this.props.createAction({
+        name: newQueryName,
+        pageId,
+        datasource: {
+          id: dataSource.id,
+        },
+        eventData: {
+          actionType: "Query",
+          from: "datasources",
+          dataSource: dataSource.name,
+        },
+        pluginId: dataSource.pluginId,
+        actionConfiguration: pluginType === "API" ? defaultApiActionConfig : {},
+      });
+    }
+  };
+
+  render() {
+    const { dataSources, isCreating } = this.props;
+
+    // if (isCreating) {
+    //   return (
+    //     <LoadingContainer>
+    //       <Spinner size={30} />
+    //     </LoadingContainer>
+    //   );
+    // }
+
+    if (dataSources.length === 0) {
+      return (
+        <EmptyActiveDatasource>
+          <Text cypressSelector="t--empty-datasource-list" type={TextType.H3}>
+            No active datasources found.{" "}
+            <CreateButton
+              category={Category.primary}
+              onClick={this.props.onCreateNew}
+              size={Size.medium}
+              tag="button"
+              text="Create New"
+            />
+          </Text>
+        </EmptyActiveDatasource>
+      );
+    }
+
+    return (
+      <QueryHomePage className="t--active-datasource-list">
+        {dataSources.map((datasource, idx) => {
+          return (
+            <DatasourceCard
+              datasource={datasource}
+              isCreating={isCreating}
+              key={`${datasource.id}_${idx}`}
+              onCreateQuery={this.handleCreateNewQuery}
+            />
+          );
+        })}
+      </QueryHomePage>
+    );
+  }
+}
+
+const mapStateToProps = (state: AppState) => ({
+  actions: state.entities.actions,
+});
+
+const mapDispatchToProps = (dispatch: any) => ({
+  createAction: (data: Partial<Action> & { eventData: any }) => {
+    dispatch(createActionRequest(data));
+  },
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ActiveDataSources);
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryHomeScreen.tsx b/app/client/src/pages/Editor/IntegrationEditor/ActiveQuery.tsx
similarity index 60%
rename from app/client/src/pages/Editor/QueryEditor/QueryHomeScreen.tsx
rename to app/client/src/pages/Editor/IntegrationEditor/ActiveQuery.tsx
index 33a67966b5..3eff9fb6a1 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryHomeScreen.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/ActiveQuery.tsx
@@ -1,26 +1,18 @@
 import React from "react";
 import styled from "styled-components";
-import { Spinner, Button } from "@blueprintjs/core";
+import { Spinner } from "@blueprintjs/core";
 import { connect } from "react-redux";
 import { AppState } from "reducers";
 import { createNewQueryName } from "utils/AppsmithUtils";
-import { getPluginImages } from "selectors/entitiesSelector";
 import { ActionDataState } from "reducers/entityReducers/actionsReducer";
 import { Datasource } from "entities/Datasource";
 import { createActionRequest } from "actions/actionActions";
-import { Page } from "constants/ReduxActionConstants";
-import {
-  QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID,
-  DATA_SOURCES_EDITOR_URL,
-} from "constants/routes";
-import AddDatasourceSecurely from "./AddDatasourceSecurely";
 import { QueryAction } from "entities/Action";
 import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
 import DatasourceCard from "./DatasourceCard";
-import CloseEditor from "components/editorComponents/CloseEditor";
 
 const QueryHomePage = styled.div`
-  padding: 20px;
+  padding: 5px;
   overflow: auto;
   display: flex;
   flex-direction: column;
@@ -37,19 +29,6 @@ const LoadingContainer = styled(CenteredWrapper)`
   height: 50%;
 `;
 
-const AddDatasource = styled(Button)`
-  padding: 23px;
-  border: 2px solid #d6d6d6;
-  justify-content: flex-start;
-  font-size: 16px;
-  font-weight: 500;
-`;
-
-const Boundary = styled.hr`
-  border: 1px solid #d0d7dd;
-  margin-top: 16px;
-`;
-
 type QueryHomeScreenProps = {
   dataSources: Datasource[];
   applicationId: string;
@@ -64,8 +43,6 @@ type QueryHomeScreenProps = {
     replace: (data: string) => void;
     push: (data: string) => void;
   };
-  pages: Page[];
-  pluginImages: Record<string, string>;
 };
 
 class QueryHomeScreen extends React.Component<QueryHomeScreenProps> {
@@ -94,24 +71,7 @@ class QueryHomeScreen extends React.Component<QueryHomeScreenProps> {
   };
 
   render() {
-    const {
-      dataSources,
-      applicationId,
-      pageId,
-      history,
-      isCreating,
-      location,
-    } = this.props;
-
-    const destinationPageId = new URLSearchParams(location.search).get(
-      "importTo",
-    );
-
-    if (!destinationPageId) {
-      history.push(
-        QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID(applicationId, pageId, pageId),
-      );
-    }
+    const { dataSources, isCreating } = this.props;
 
     if (isCreating) {
       return (
@@ -123,29 +83,6 @@ class QueryHomeScreen extends React.Component<QueryHomeScreenProps> {
 
     return (
       <QueryHomePage>
-        <CloseEditor />
-        <p className="sectionHeader">
-          Select a datasource to query or create a new one
-        </p>
-        <Boundary />
-        {dataSources.length < 2 ? (
-          <AddDatasourceSecurely
-            onAddDatasource={() => {
-              history.push(DATA_SOURCES_EDITOR_URL(applicationId, pageId));
-            }}
-          />
-        ) : (
-          <AddDatasource
-            className="t--add-datasource"
-            fill
-            icon={"plus"}
-            minimal
-            onClick={() => {
-              history.push(DATA_SOURCES_EDITOR_URL(applicationId, pageId));
-            }}
-            text="New Datasource"
-          />
-        )}
         {dataSources.map((datasource) => {
           return (
             <DatasourceCard
@@ -161,9 +98,7 @@ class QueryHomeScreen extends React.Component<QueryHomeScreenProps> {
 }
 
 const mapStateToProps = (state: AppState) => ({
-  pluginImages: getPluginImages(state),
   actions: state.entities.actions,
-  pages: state.entities.pageList.pages,
 });
 
 const mapDispatchToProps = (dispatch: any) => ({
diff --git a/app/client/src/pages/Editor/QueryEditor/AddDatasourceSecurely.tsx b/app/client/src/pages/Editor/IntegrationEditor/AddDatasourceSecurely.tsx
similarity index 53%
rename from app/client/src/pages/Editor/QueryEditor/AddDatasourceSecurely.tsx
rename to app/client/src/pages/Editor/IntegrationEditor/AddDatasourceSecurely.tsx
index 1adb20e084..983386fb04 100644
--- a/app/client/src/pages/Editor/QueryEditor/AddDatasourceSecurely.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/AddDatasourceSecurely.tsx
@@ -2,7 +2,6 @@ import React from "react";
 import styled from "styled-components";
 import Secure from "assets/images/secure.svg";
 import AppsmithDatasource from "assets/images/appsmith-datasource.svg";
-import { BaseButton } from "components/designSystems/blueprint/ButtonComponent";
 import { Colors } from "constants/Colors";
 
 const Wrapper = styled.div`
@@ -10,54 +9,52 @@ const Wrapper = styled.div`
   padding: 23px;
   flex-direction: row;
   display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .datasource-img {
+    height: 108px;
+  }
+`;
+
+const HeadWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  & > img {
+    margin-right: 10px;
+  }
 `;
 
 const Header = styled.div`
   font-weight: 600;
   font-size: 24px;
+  line-height: 32px;
   color: ${Colors.OXFORD_BLUE};
-  margin-top: 8px;
 `;
 
-const Content = styled.div`
+const Content = styled.p`
   margin-top: 8px;
   color: ${Colors.OXFORD_BLUE};
-  max-width: 65%;
+  max-width: 360px;
+  font-size: 14px;
+  line-height: 20px;
 `;
 
-const ActionButton = styled(BaseButton)`
-  &&& {
-    max-width: 155px;
-    max-height: 36px;
-    margin-top: 18px;
-  }
-`;
-
-type AddDatasourceSecurelyProps = {
-  onAddDatasource: () => void;
-};
-
-function AddDatasourceSecurely(props: AddDatasourceSecurelyProps) {
+function AddDatasourceSecurely() {
   return (
     <Wrapper>
       <div>
-        <img src={Secure} />
-        <Header>Secure & fast database connection</Header>
+        <HeadWrapper>
+          <img src={Secure} />
+          <Header>Secure & fast database connection</Header>
+        </HeadWrapper>
         <Content>
           Connect your database to start building read/write workflows. Your
           Passwords are fully encrypted and we never store any of your data.
           That’s a promise.
         </Content>
-        <ActionButton
-          accent="primary"
-          className="t--add-datasource"
-          filled
-          icon={"plus"}
-          onClick={props.onAddDatasource}
-          text="New Datasource"
-        />
       </div>
-      <img src={AppsmithDatasource} />
+      <img className="datasource-img" src={AppsmithDatasource} />
     </Wrapper>
   );
 }
diff --git a/app/client/src/pages/Editor/QueryEditor/DatasourceCard.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
similarity index 54%
rename from app/client/src/pages/Editor/QueryEditor/DatasourceCard.tsx
rename to app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
index e385797791..36fc8f9a68 100644
--- a/app/client/src/pages/Editor/QueryEditor/DatasourceCard.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
@@ -1,12 +1,12 @@
 import { Datasource } from "entities/Datasource";
-import { isStoredDatasource } from "entities/Action";
-import { BaseButton } from "components/designSystems/blueprint/ButtonComponent";
-import React from "react";
-import { isNil } from "lodash";
+import { isStoredDatasource, PluginType } from "entities/Action";
+import Button, { Category } from "components/ads/Button";
+import React, { useCallback, useMemo, useState } from "react";
+import { isNil, keyBy } from "lodash";
 import { useDispatch, useSelector } from "react-redux";
 import { Colors } from "constants/Colors";
 import { useParams } from "react-router";
-
+import CollapseComponent from "components/utils/CollapseComponent";
 import {
   getPluginImages,
   getQueryActionsForCurrentPage,
@@ -18,19 +18,30 @@ import history from "utils/history";
 import { renderDatasourceSection } from "pages/Editor/DataSourceEditor/DatasourceSection";
 import { DATA_SOURCES_EDITOR_ID_URL } from "constants/routes";
 import { setDatsourceEditorMode } from "actions/datasourceActions";
+import { SAAS_EDITOR_DATASOURCE_ID_URL } from "../SaaSEditor/constants";
 
 const Wrapper = styled.div`
-  border: 2px solid #d6d6d6;
   padding: 18px;
-  margin-top: 18px;
+  /* margin-top: 18px; */
+
+  &:hover {
+    background: ${Colors.Gallery};
+    .bp3-collapse-body {
+      background: ${Colors.Gallery};
+    }
+  }
 `;
 
-const ActionButton = styled(BaseButton)`
+const ActionButton = styled(Button)`
+  padding: 10px 20px;
   &&&& {
     height: 36px;
-    max-width: 120px;
+    //max-width: 120px;
     width: auto;
   }
+  span > svg > path {
+    stroke: white;
+  }
 `;
 
 const DatasourceImage = styled.img`
@@ -38,11 +49,12 @@ const DatasourceImage = styled.img`
   width: auto;
 `;
 
-const EditDatasourceButton = styled(BaseButton)`
+const EditDatasourceButton = styled(Button)`
+  padding: 10px 20px;
   &&&& {
     height: 36px;
     max-width: 160px;
-    border: 1px solid ${Colors.GEYSER_LIGHT};
+    border: 1px solid ${Colors.HIT_GRAY};
     width: auto;
   }
 `;
@@ -64,6 +76,10 @@ const DatasourceNameWrapper = styled.div`
   display: flex;
 `;
 
+const DatasourceInfo = styled.div`
+  padding: 0 10px;
+`;
+
 const Queries = styled.div`
   color: ${Colors.DOVE_GRAY};
   font-size: 14px;
@@ -78,14 +94,16 @@ const ButtonsWrapper = styled.div`
 
 type DatasourceCardProps = {
   datasource: Datasource;
-  onCreateQuery: (datasource: Datasource) => void;
+  onCreateQuery: (datasource: Datasource, pluginType: PluginType) => void;
+  isCreating?: boolean;
 };
 
 function DatasourceCard(props: DatasourceCardProps) {
   const dispatch = useDispatch();
+  const [isSelected, setIsSelected] = useState(false);
   const pluginImages = useSelector(getPluginImages);
   const params = useParams<{ applicationId: string; pageId: string }>();
-  const { datasource } = props;
+  const { datasource, isCreating } = props;
   const datasourceFormConfigs = useSelector(
     (state: AppState) => state.entities.plugins.formConfigs,
   );
@@ -99,20 +117,47 @@ function DatasourceCard(props: DatasourceCardProps) {
   const currentFormConfig: Array<any> =
     datasourceFormConfigs[datasource?.pluginId ?? ""];
   const QUERY = queriesWithThisDatasource > 1 ? "queries" : "query";
+  const plugins = useSelector((state: AppState) => {
+    return state.entities.plugins.list;
+  });
+  const pluginGroups = useMemo(() => keyBy(plugins, "id"), [plugins]);
+  const editDatasource = useCallback(() => {
+    const plugin = pluginGroups[datasource.pluginId];
+    if (plugin && plugin.type === PluginType.SAAS) {
+      history.push(
+        SAAS_EDITOR_DATASOURCE_ID_URL(
+          params.applicationId,
+          params.pageId,
+          plugin.packageName,
+          datasource.id,
+          {
+            from: "datasources",
+          },
+        ),
+      );
+    } else {
+      dispatch(setDatsourceEditorMode({ id: datasource.id, viewMode: false }));
+      history.push(
+        DATA_SOURCES_EDITOR_ID_URL(
+          params.applicationId,
+          params.pageId,
+          datasource.id,
+          {
+            from: "datasources",
+          },
+        ),
+      );
+    }
+  }, [datasource.id, params]);
 
-  const editDatasource = () => {
-    dispatch(setDatsourceEditorMode({ id: datasource.id, viewMode: false }));
-    history.push(
-      DATA_SOURCES_EDITOR_ID_URL(
-        params.applicationId,
-        params.pageId,
-        datasource.id,
-      ),
-    );
-  };
+  const onCreateNewQuery = useCallback(() => {
+    setIsSelected(true);
+    const plugin = pluginGroups[datasource.pluginId];
+    props.onCreateQuery(datasource, plugin.type);
+  }, []);
 
   return (
-    <Wrapper>
+    <Wrapper className="t--datasource">
       <DatasourceCardHeader className="t--datasource-name">
         <div style={{ flex: 1 }}>
           <DatasourceNameWrapper>
@@ -129,26 +174,29 @@ function DatasourceCard(props: DatasourceCardProps) {
               : "No query is using this datasource"}
           </Queries>
         </div>
-        <ButtonsWrapper>
+        <ButtonsWrapper className="action-wrapper">
           <EditDatasourceButton
+            category={Category.tertiary}
             className="t--edit-datasource"
-            icon={"edit"}
             onClick={editDatasource}
-            text="Edit Datasource"
+            text="Edit"
           />
           <ActionButton
-            accent="primary"
             className="t--create-query"
-            filled
-            icon={"plus"}
-            onClick={() => props.onCreateQuery(datasource)}
+            icon="plus"
+            isLoading={isCreating && isSelected}
+            onClick={onCreateNewQuery}
             text="New Query"
           />
         </ButtonsWrapper>
       </DatasourceCardHeader>
-      {!isNil(currentFormConfig)
-        ? renderDatasourceSection(currentFormConfig[0], datasource)
-        : undefined}
+      {!isNil(currentFormConfig) && (
+        <CollapseComponent title="Show More">
+          <DatasourceInfo>
+            {renderDatasourceSection(currentFormConfig[0], datasource)}
+          </DatasourceInfo>
+        </CollapseComponent>
+      )}
     </Wrapper>
   );
 }
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceHome.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
similarity index 54%
rename from app/client/src/pages/Editor/DataSourceEditor/DatasourceHome.tsx
rename to app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
index 3ae1eecb05..bec3d4aeb1 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceHome.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
@@ -2,94 +2,92 @@ import React from "react";
 import styled from "styled-components";
 import { connect } from "react-redux";
 import { initialize } from "redux-form";
-import { Card, Spinner } from "@blueprintjs/core";
 import { getDBPlugins, getPluginImages } from "selectors/entitiesSelector";
-import history from "utils/history";
 import { Plugin } from "api/PluginApi";
 import { DATASOURCE_DB_FORM } from "constants/forms";
 import { createDatasourceFromForm } from "actions/datasourceActions";
 import { AppState } from "reducers";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { getCurrentApplication } from "selectors/applicationSelectors";
-import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
 import { ApplicationPayload } from "constants/ReduxActionConstants";
-import { QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID } from "constants/routes";
-import BackButton from "./BackButton";
+import { Colors } from "constants/Colors";
 
 const DatasourceHomePage = styled.div`
-  padding: 20px;
-  margin-left: 10px;
   max-height: 95vh;
-  overflow: auto;
-  padding-bottom: 50px;
   .textBtn {
-    font-size: 14px;
     justify-content: center;
     text-align: center;
-    letter-spacing: -0.17px;
     color: #2e3d49;
     font-weight: 500;
     text-decoration: none !important;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-  }
-`;
 
-const StyledContainer = styled.div`
-  flex: 1;
-  padding-top: 12px;
-  padding-bottom: 12px;
-
-  .sectionHeadings {
     font-weight: 500;
     font-size: 16px;
+    line-height: 24px;
+    letter-spacing: -0.17px;
+    margin: 0;
   }
 `;
 
-const CardsWrapper = styled.div`
-  flex: 1;
-  display: -webkit-box;
-  flex-wrap: wrap;
-  -webkit-box-pack: start !important;
-  justify-content: center;
-  text-align: center;
-  min-width: 140px;
-  border-radius: 4px;
-`;
-
 const DatasourceCardsContainer = styled.div`
-  flex: 1;
-  display: inline-flex;
-  flex-wrap: wrap;
-  margin-left: -10px;
-  justify-content: flex-start;
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  gap: 16px;
   text-align: center;
   min-width: 150px;
   border-radius: 4px;
+  align-items: center;
+`;
 
-  .eachDatasourceCard {
-    margin: 10px;
-    width: 140px;
-    height: 110px;
-    padding-bottom: 0px;
+const DatasourceCard = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 64px;
+  &:hover {
+    background: ${Colors.Gallery};
     cursor: pointer;
   }
-  .dataSourceImage {
-    height: 52px;
-    width: auto;
-    margin-top: -5px;
-    max-width: 100%;
-    margin-bottom: 2px;
+
+  .dataSourceImageWrapper {
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    margin: 0 8px;
+    background: #f0f0f0;
+    display: flex;
+    align-items: center;
+
+    .dataSourceImage {
+      height: 28px;
+      width: auto;
+      margin: 0 auto;
+      max-width: 100%;
+      margin-bottom: 2px;
+    }
+  }
+
+  .cta {
+    display: none;
+    margin-right: 32px;
+  }
+
+  &:hover {
+    .cta {
+      display: flex;
+    }
   }
 `;
 
-const LoadingContainer = styled(CenteredWrapper)`
-  height: 50%;
+const DatasourceContentWrapper = styled.div`
+  display: flex;
+  align-items: center;
 `;
 
 interface DatasourceHomeScreenProps {
-  isSaving: boolean;
   pageId: string;
   applicationId: string;
   location: {
@@ -110,6 +108,7 @@ interface ReduxStateProps {
   plugins: Plugin[];
   currentApplication?: ApplicationPayload;
   pluginImages: Record<string, string>;
+  isSaving: boolean;
 }
 
 type Props = ReduxStateProps & DatasourceHomeScreenProps & ReduxDispatchProps;
@@ -129,69 +128,46 @@ class DatasourceHomeScreen extends React.Component<Props> {
   };
 
   render() {
-    const {
-      plugins,
-      isSaving,
-      pluginImages,
-      applicationId,
-      pageId,
-    } = this.props;
+    const { pluginImages, plugins } = this.props;
 
     return (
       <DatasourceHomePage>
-        <BackButton
-          onClick={() =>
-            history.push(
-              QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID(
-                applicationId,
-                pageId,
-                pageId,
-              ),
-            )
-          }
-        />
-        <StyledContainer>
-          <p className="sectionHeadings">Select Datasource Type</p>
-        </StyledContainer>
-        <CardsWrapper>
-          {isSaving ? (
-            <LoadingContainer>
-              <Spinner size={30} />
-            </LoadingContainer>
-          ) : (
-            <DatasourceCardsContainer>
-              {plugins.map((plugin) => {
-                return (
-                  <Card
-                    className="eachDatasourceCard"
-                    interactive={false}
-                    key={plugin.id}
-                    onClick={() =>
-                      this.goToCreateDatasource(plugin.id, plugin.name)
-                    }
-                  >
+        <DatasourceCardsContainer>
+          {plugins.map((plugin, idx) => {
+            return (
+              <DatasourceCard
+                className="eachDatasourceCard"
+                key={`${plugin.id}_${idx}`}
+                onClick={() =>
+                  this.goToCreateDatasource(plugin.id, plugin.name)
+                }
+              >
+                <DatasourceContentWrapper>
+                  <div className="dataSourceImageWrapper">
                     <img
                       alt="Datasource"
                       className="dataSourceImage"
                       src={pluginImages[plugin.id]}
                     />
-                    <p className="t--plugin-name textBtn">{plugin.name}</p>
-                  </Card>
-                );
-              })}
-            </DatasourceCardsContainer>
-          )}
-        </CardsWrapper>
+                  </div>
+                  <p className="t--plugin-name textBtn">{plugin.name}</p>
+                </DatasourceContentWrapper>
+              </DatasourceCard>
+            );
+          })}
+        </DatasourceCardsContainer>
       </DatasourceHomePage>
     );
   }
 }
 
 const mapStateToProps = (state: AppState): ReduxStateProps => {
+  const { datasources } = state.entities;
   return {
     pluginImages: getPluginImages(state),
     plugins: getDBPlugins(state),
     currentApplication: getCurrentApplication(state),
+    isSaving: datasources.loading,
   };
 };
 
diff --git a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
new file mode 100644
index 0000000000..3fc3c78c82
--- /dev/null
+++ b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
@@ -0,0 +1,504 @@
+import React, { useEffect, useRef } from "react";
+import { connect } from "react-redux";
+import { reduxForm, InjectedFormProps } from "redux-form";
+import styled from "styled-components";
+import { AppState } from "reducers";
+import { API_HOME_SCREEN_FORM } from "constants/forms";
+import { Colors } from "constants/Colors";
+import { TabComponent, TabProp } from "components/ads/Tabs";
+import { IconSize } from "components/ads/Icon";
+import NewApiScreen from "./NewApi";
+import NewQueryScreen from "./NewQuery";
+import ActiveDataSource from "./ActiveDataSources";
+import MockDataSources from "./MockDataSources";
+import AddDatasourceSecurely from "./AddDatasourceSecurely";
+import { getDatasources, getMockDatasources } from "selectors/entitiesSelector";
+import { Datasource, MockDatasource } from "entities/Datasource";
+import Text, { TextType } from "components/ads/Text";
+import scrollIntoView from "scroll-into-view-if-needed";
+import {
+  INTEGRATION_TABS,
+  INTEGRATION_EDITOR_URL,
+  INTEGRATION_EDITOR_MODES,
+} from "constants/routes";
+import { thinScrollbar } from "constants/DefaultTheme";
+import BackButton from "../DataSourceEditor/BackButton";
+
+const HeaderFlex = styled.div`
+  display: flex;
+  align-items: center;
+`;
+
+const ApiHomePage = styled.div`
+  font-size: 20px;
+  padding: 20px 20px 0 20px;
+  /* margin-left: 10px; */
+  min-height: calc(100vh - 66px);
+  max-height: calc(100vh - 66px);
+  overflow: hidden !important;
+  .closeBtn {
+    position: absolute;
+    left: 70%;
+  }
+  .bp3-collapse-body {
+    position: absolute;
+    z-index: 99999;
+    background-color: ${Colors.WHITE};
+    border: 1px solid ${Colors.ALTO};
+    box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
+    width: 100%;
+    padding: 20px;
+  }
+  .fontSize16 {
+    font-size: 16px;
+  }
+`;
+
+const MainTabsContainer = styled.div`
+  width: 100%;
+  height: 100%;
+`;
+
+const SectionGrid = styled.div`
+  margin-top: 16px;
+  display: grid;
+  grid-template-columns: 1fr 180px;
+  gap: 10px 16px;
+`;
+const NewIntegrationsContainer = styled.div`
+  ${thinScrollbar};
+  scrollbar-width: thin;
+  overflow: auto;
+  max-height: calc(
+    100vh - ${(props) => props.theme.integrationsPageUnusableHeight}
+  );
+  /* padding-bottom: 300px; */
+  /* margin-top: 16px; */
+  & > div {
+    margin-bottom: 20px;
+  }
+`;
+
+type IntegrationsHomeScreenProps = {
+  pageId: string;
+  applicationId: string;
+  selectedTab: string;
+  location: {
+    search: string;
+  };
+  history: {
+    replace: (data: string) => void;
+    push: (data: string) => void;
+  };
+  isCreating: boolean;
+  dataSources: Datasource[];
+  mockDatasources: MockDatasource[];
+};
+
+type IntegrationsHomeScreenState = {
+  page: number;
+  activePrimaryMenuId: number;
+  activeSecondaryMenuId: number;
+};
+
+type Props = IntegrationsHomeScreenProps &
+  InjectedFormProps<{ category: string }, IntegrationsHomeScreenProps>;
+
+const PRIMARY_MENU: TabProp[] = [
+  {
+    key: "ACTIVE",
+    title: "Active",
+    panelComponent: <div />,
+  },
+  {
+    key: "CREATE_NEW",
+    title: "Create New",
+    panelComponent: <div />,
+    icon: "plus",
+    iconSize: IconSize.XS,
+  },
+];
+
+const PRIMARY_MENU_IDS = {
+  ACTIVE: 0,
+  CREATE_NEW: 1,
+};
+
+const SECONDARY_MENU: TabProp[] = [
+  {
+    key: "API",
+    title: "API",
+    panelComponent: <div />,
+  },
+  {
+    key: "DATABASE",
+    title: "Database",
+    panelComponent: <div />,
+  },
+];
+
+const getSecondaryMenu = (hasActiveSources: boolean) => {
+  const mockDbMenu = {
+    key: "MOCK_DATABASE",
+    title: "Mock Databases",
+    panelComponent: <div />,
+  };
+  return hasActiveSources
+    ? [...SECONDARY_MENU, mockDbMenu]
+    : [mockDbMenu, ...SECONDARY_MENU];
+};
+
+const getSecondaryMenuIds = (hasActiveSources = false) => {
+  return {
+    API: 0 + (hasActiveSources ? 0 : 1),
+    DATABASE: 1 + (hasActiveSources ? 0 : 1),
+    MOCK_DATABASE: 2 - (hasActiveSources ? 0 : 2),
+  };
+};
+
+// const TERTIARY_MENU: TabProp[] = [
+//   {
+//     key: "ACTIVE_CONNECTIONS",
+//     title: "Active Connections",
+//     panelComponent: <div />,
+//   },
+//   {
+//     key: "MOCK_DATABASE",
+//     title: "Mock Databases",
+//     panelComponent: <div />,
+//   },
+// ];
+
+const TERTIARY_MENU_IDS = {
+  ACTIVE_CONNECTIONS: 0,
+  MOCK_DATABASE: 1,
+};
+
+interface MockDataSourcesProps {
+  mockDatasources: MockDatasource[];
+  active: boolean;
+}
+
+function UseMockDatasources({ active, mockDatasources }: MockDataSourcesProps) {
+  const useMockRef = useRef<HTMLDivElement>(null);
+  const isMounted = useRef(false);
+  useEffect(() => {
+    if (active && useMockRef.current) {
+      isMounted.current &&
+        scrollIntoView(useMockRef.current, {
+          behavior: "smooth",
+          scrollMode: "always",
+          block: "start",
+          boundary: document.getElementById("new-integrations-wrapper"),
+        });
+    } else {
+      isMounted.current = true;
+    }
+  }, [active]);
+  return (
+    <div id="mock-database" ref={useMockRef}>
+      <Text type={TextType.H2}>Mock Databases</Text>
+      <MockDataSources mockDatasources={mockDatasources} />
+    </div>
+  );
+}
+
+function CreateNewAPI({
+  active,
+  applicationId,
+  history,
+  isCreating,
+  pageId,
+}: any) {
+  const newAPIRef = useRef<HTMLDivElement>(null);
+  const isMounted = useRef(false);
+  useEffect(() => {
+    if (active && newAPIRef.current) {
+      isMounted.current &&
+        scrollIntoView(newAPIRef.current, {
+          behavior: "smooth",
+          scrollMode: "always",
+          block: "start",
+          boundary: document.getElementById("new-integrations-wrapper"),
+        });
+    } else {
+      isMounted.current = true;
+    }
+  }, [active]);
+  return (
+    <div id="new-api" ref={newAPIRef}>
+      <Text type={TextType.H2}>APIs</Text>
+      <NewApiScreen
+        applicationId={applicationId}
+        history={history}
+        isCreating={isCreating}
+        location={location}
+        pageId={pageId}
+      />
+    </div>
+  );
+}
+
+function CreateNewDatasource({
+  active,
+  applicationId,
+  history,
+  isCreating,
+  pageId,
+}: any) {
+  const newDatasourceRef = useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    if (active && newDatasourceRef.current) {
+      scrollIntoView(newDatasourceRef.current, {
+        behavior: "smooth",
+        scrollMode: "always",
+        block: "start",
+        boundary: document.getElementById("new-integrations-wrapper"),
+      });
+    }
+  }, [active]);
+  return (
+    <div id="new-datasources" ref={newDatasourceRef}>
+      <Text type={TextType.H2}>Databases</Text>
+      <NewQueryScreen
+        applicationId={applicationId}
+        history={history}
+        isCreating={isCreating}
+        location={location}
+        pageId={pageId}
+      />
+    </div>
+  );
+}
+
+class IntegrationsHomeScreen extends React.Component<
+  Props,
+  IntegrationsHomeScreenState
+> {
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      page: 1,
+      activePrimaryMenuId: PRIMARY_MENU_IDS.CREATE_NEW,
+      activeSecondaryMenuId: getSecondaryMenuIds(
+        props.mockDatasources.length > 0,
+      ).API,
+    };
+  }
+
+  syncActivePrimaryMenu = () => {
+    // on mount/update if syncing the primary active menu.
+    const { selectedTab } = this.props;
+    if (
+      (selectedTab === INTEGRATION_TABS.NEW &&
+        this.state.activePrimaryMenuId !== PRIMARY_MENU_IDS.CREATE_NEW) ||
+      (selectedTab === INTEGRATION_TABS.ACTIVE &&
+        this.state.activePrimaryMenuId !== PRIMARY_MENU_IDS.ACTIVE)
+    ) {
+      this.setState({
+        activePrimaryMenuId:
+          selectedTab === INTEGRATION_TABS.NEW
+            ? PRIMARY_MENU_IDS.CREATE_NEW
+            : PRIMARY_MENU_IDS.ACTIVE,
+      });
+    }
+  };
+
+  componentDidMount() {
+    const {
+      applicationId,
+      dataSources,
+      history,
+      location,
+      pageId,
+    } = this.props;
+    const params: string = location.search;
+    const redirectMode = new URLSearchParams(params).get("mode");
+    if (
+      dataSources.length > 0 &&
+      redirectMode === INTEGRATION_EDITOR_MODES.AUTO
+    ) {
+      // User will be taken to active tab if there are datasources
+      history.replace(
+        INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.ACTIVE),
+      );
+    } else if (redirectMode === INTEGRATION_EDITOR_MODES.MOCK) {
+      // If there are no datasources -> new user
+      history.replace(
+        INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.NEW),
+      );
+      this.onSelectSecondaryMenu(
+        getSecondaryMenuIds(dataSources.length > 0).MOCK_DATABASE,
+      );
+    } else {
+      this.syncActivePrimaryMenu();
+    }
+  }
+
+  componentDidUpdate(prevProps: Props) {
+    this.syncActivePrimaryMenu();
+    const { applicationId, dataSources, history, pageId } = this.props;
+    if (dataSources.length === 0 && prevProps.dataSources.length > 0) {
+      history.replace(
+        INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.NEW),
+      );
+      this.onSelectSecondaryMenu(
+        getSecondaryMenuIds(dataSources.length > 0).MOCK_DATABASE,
+      );
+    }
+  }
+
+  onSelectPrimaryMenu = (activePrimaryMenuId: number) => {
+    const { applicationId, dataSources, history, pageId } = this.props;
+    if (activePrimaryMenuId === this.state.activePrimaryMenuId) {
+      return;
+    }
+    history.push(
+      INTEGRATION_EDITOR_URL(
+        applicationId,
+        pageId,
+        activePrimaryMenuId === PRIMARY_MENU_IDS.ACTIVE
+          ? INTEGRATION_TABS.ACTIVE
+          : INTEGRATION_TABS.NEW,
+      ),
+    );
+    this.setState({
+      activeSecondaryMenuId:
+        activePrimaryMenuId === PRIMARY_MENU_IDS.ACTIVE
+          ? TERTIARY_MENU_IDS.ACTIVE_CONNECTIONS
+          : getSecondaryMenuIds(dataSources.length > 0).API,
+    });
+  };
+
+  onSelectSecondaryMenu = (activeSecondaryMenuId: number) => {
+    this.setState({ activeSecondaryMenuId });
+  };
+
+  render() {
+    const {
+      applicationId,
+      dataSources,
+      history,
+      isCreating,
+      location,
+      pageId,
+    } = this.props;
+
+    let currentScreen = null;
+    const { activePrimaryMenuId, activeSecondaryMenuId } = this.state;
+
+    const mockDataSection =
+      this.props.mockDatasources.length > 0 ? (
+        <UseMockDatasources
+          active={
+            activeSecondaryMenuId ===
+            getSecondaryMenuIds(dataSources.length > 0).MOCK_DATABASE
+          }
+          mockDatasources={this.props.mockDatasources}
+        />
+      ) : null;
+
+    if (activePrimaryMenuId === PRIMARY_MENU_IDS.CREATE_NEW) {
+      currentScreen = (
+        <NewIntegrationsContainer id="new-integrations-wrapper">
+          {dataSources.length === 0 && <AddDatasourceSecurely />}
+          {dataSources.length === 0 &&
+            this.props.mockDatasources.length > 0 &&
+            mockDataSection}
+          <CreateNewAPI
+            active={
+              activeSecondaryMenuId ===
+              getSecondaryMenuIds(dataSources.length > 0).API
+            }
+            applicationId={applicationId}
+            history={history}
+            isCreating={isCreating}
+            location={location}
+            pageId={pageId}
+          />
+          <CreateNewDatasource
+            active={
+              activeSecondaryMenuId ===
+              getSecondaryMenuIds(dataSources.length > 0).DATABASE
+            }
+            applicationId={applicationId}
+            history={history}
+            isCreating={isCreating}
+            location={location}
+            pageId={pageId}
+          />
+          {dataSources.length > 0 &&
+            this.props.mockDatasources.length > 0 &&
+            mockDataSection}
+        </NewIntegrationsContainer>
+      );
+    } else {
+      currentScreen = (
+        <ActiveDataSource
+          applicationId={applicationId}
+          dataSources={dataSources}
+          history={this.props.history}
+          isCreating={isCreating}
+          location={location}
+          onCreateNew={() =>
+            this.onSelectPrimaryMenu(PRIMARY_MENU_IDS.CREATE_NEW)
+          }
+          pageId={pageId}
+        />
+      );
+    }
+    return (
+      <>
+        <BackButton />
+        <ApiHomePage
+          className="t--integrationsHomePage"
+          style={{ overflow: "auto" }}
+        >
+          <HeaderFlex>
+            <p className="sectionHeadings">Datasources</p>
+          </HeaderFlex>
+          <SectionGrid>
+            <MainTabsContainer>
+              <TabComponent
+                onSelect={this.onSelectPrimaryMenu}
+                selectedIndex={this.state.activePrimaryMenuId}
+                tabs={PRIMARY_MENU}
+              />
+            </MainTabsContainer>
+            <div />
+
+            {currentScreen}
+            {activePrimaryMenuId === PRIMARY_MENU_IDS.CREATE_NEW && (
+              <TabComponent
+                onSelect={this.onSelectSecondaryMenu}
+                selectedIndex={this.state.activeSecondaryMenuId}
+                tabs={
+                  this.props.mockDatasources.length > 0
+                    ? getSecondaryMenu(dataSources.length > 0)
+                    : SECONDARY_MENU
+                }
+                vertical
+              />
+            )}
+          </SectionGrid>
+        </ApiHomePage>
+      </>
+    );
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    dataSources: getDatasources(state),
+    mockDatasources: getMockDatasources(state),
+    isCreating: state.ui.apiPane.isCreating,
+  };
+};
+
+export default connect(mapStateToProps)(
+  reduxForm<{ category: string }, IntegrationsHomeScreenProps>({
+    form: API_HOME_SCREEN_FORM,
+  })(IntegrationsHomeScreen),
+);
diff --git a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
new file mode 100644
index 0000000000..cf72bd5ef0
--- /dev/null
+++ b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
@@ -0,0 +1,132 @@
+import React from "react";
+import styled from "styled-components";
+import { useDispatch, useSelector } from "react-redux";
+import { MockDatasource } from "entities/Datasource";
+import { getPluginImages } from "selectors/entitiesSelector";
+import { Colors } from "constants/Colors";
+import { addMockDatasourceToOrg } from "actions/datasourceActions";
+import { getCurrentOrgId } from "selectors/organizationSelectors";
+import { AppState } from "../../../reducers";
+
+const MockDataSourceWrapper = styled.div`
+  overflow: auto;
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  gap: 16px;
+  /* height: calc(
+    100vh - ${(props) => props.theme.integrationsPageUnusableHeight}
+  ); */
+
+  .sectionHeader {
+    font-weight: ${(props) => props.theme.fontWeights[2]};
+    font-size: ${(props) => props.theme.fontSizes[4]}px;
+    margin-top: 10px;
+  }
+`;
+
+const Description = styled.div`
+  color: ${Colors.DOVE_GRAY};
+  font-size: 14px;
+  display: inline-block;
+  margin-top: 11px;
+`;
+function MockDataSources(props: { mockDatasources: MockDatasource[] }) {
+  const orgId = useSelector(getCurrentOrgId);
+  return (
+    <MockDataSourceWrapper className="t--mock-datasource-list">
+      {props.mockDatasources.map((datasource: MockDatasource, idx) => {
+        return (
+          <MockDatasourceCard
+            datasource={datasource}
+            key={`${datasource.name}_${datasource.packageName}_${idx}`}
+            orgId={orgId}
+          />
+        );
+      })}
+    </MockDataSourceWrapper>
+  );
+}
+
+export default MockDataSources;
+
+const CardWrapper = styled.div`
+  padding: 18px;
+  /* margin-top: 18px; */
+
+  &:hover {
+    background: ${Colors.Gallery};
+    cursor: pointer;
+    .bp3-collapse-body {
+      background: ${Colors.Gallery};
+    }
+  }
+`;
+
+const DatasourceImage = styled.img`
+  height: 24px;
+  width: auto;
+`;
+
+const DatasourceName = styled.span`
+  margin-left: 10px;
+  font-size: 16px;
+  font-weight: 500;
+`;
+
+const DatasourceCardHeader = styled.div`
+  justify-content: space-between;
+  display: flex;
+`;
+
+const DatasourceNameWrapper = styled.div`
+  flex-direction: row;
+  align-items: center;
+  display: flex;
+`;
+
+type MockDatasourceCardProps = {
+  datasource: MockDatasource;
+  orgId: string;
+};
+
+function MockDatasourceCard(props: MockDatasourceCardProps) {
+  const { datasource, orgId } = props;
+  const dispatch = useDispatch();
+  const pluginImages = useSelector(getPluginImages);
+  const plugins = useSelector((state: AppState) => {
+    return state.entities.plugins.list;
+  });
+  const currentPlugin = plugins.find(
+    (eachPlugin) => eachPlugin.packageName === datasource.packageName,
+  );
+  if (!currentPlugin) {
+    return null;
+  }
+
+  const addMockDataSource = () =>
+    dispatch(
+      addMockDatasourceToOrg(
+        datasource.name,
+        orgId,
+        currentPlugin.id,
+        currentPlugin.packageName,
+      ),
+    );
+  return (
+    <CardWrapper className="t--mock-datasource" onClick={addMockDataSource}>
+      <DatasourceCardHeader className="t--datasource-name">
+        <div style={{ flex: 1 }}>
+          <DatasourceNameWrapper>
+            <DatasourceImage
+              alt="Datasource"
+              className="dataSourceImage"
+              src={pluginImages[currentPlugin.id]}
+            />
+            <DatasourceName>{datasource.name}</DatasourceName>
+          </DatasourceNameWrapper>
+          <Description>{datasource.description}</Description>
+        </div>
+      </DatasourceCardHeader>
+    </CardWrapper>
+  );
+}
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
new file mode 100644
index 0000000000..405a61f360
--- /dev/null
+++ b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
@@ -0,0 +1,236 @@
+import React from "react";
+import { connect } from "react-redux";
+import styled from "styled-components";
+import { getCurlImportPageURL } from "constants/routes";
+import { createDatasourceFromForm } from "actions/datasourceActions";
+import { AppState } from "reducers";
+import { Colors } from "constants/Colors";
+import CurlLogo from "assets/images/Curl-logo.svg";
+import PlusLogo from "assets/images/Plus-logo.svg";
+import { Plugin } from "api/PluginApi";
+import { createNewApiAction } from "actions/apiPaneActions";
+import AnalyticsUtil, { EventLocation } from "utils/AnalyticsUtil";
+import { CURL } from "constants/AppsmithActionConstants/ActionConstants";
+import { PluginType } from "entities/Action";
+import { Spinner } from "@blueprintjs/core";
+
+const StyledContainer = styled.div`
+  flex: 1;
+  margin-top: 8px;
+  .textBtn {
+    font-size: 16px;
+    line-height: 24px;
+    margin: 0;
+    justify-content: center;
+    text-align: center;
+    letter-spacing: -0.17px;
+    color: ${Colors.OXFORD_BLUE};
+    font-weight: 500;
+    text-decoration: none !important;
+    flex-wrap: wrap;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  @media (min-width: 2500px) {
+    .textBtn {
+      font-size: 18px;
+    }
+  }
+  @media (min-width: 2500px) {
+    .eachCard {
+      width: 240px;
+      height: 200px;
+    }
+    .apiImage {
+      margin-top: 25px;
+      margin-bottom: 20px;
+      height: 80px;
+    }
+    .curlImage {
+      width: 100px;
+    }
+    .createIcon {
+      height: 70px;
+    }
+  }
+`;
+
+const ApiCardsContainer = styled.div`
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  gap: 16px;
+  text-align: center;
+  min-width: 150px;
+  border-radius: 4px;
+  align-items: center;
+
+  .create-new-api {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+`;
+
+const ApiCard = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 64px;
+  &:hover {
+    background: ${Colors.Gallery};
+    cursor: pointer;
+  }
+
+  .content-icon-wrapper {
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    margin: 0 8px;
+    background: #f0f0f0;
+    display: flex;
+    align-items: center;
+
+    .content-icon {
+      height: 28px;
+      width: auto;
+      margin: 0 auto;
+      max-width: 100%;
+      margin-bottom: 2px;
+    }
+  }
+
+  .cta {
+    display: none;
+    margin-right: 32px;
+  }
+
+  &:hover {
+    .cta {
+      display: flex;
+    }
+  }
+`;
+
+const CardContentWrapper = styled.div`
+  display: flex;
+  align-items: center;
+`;
+
+type ApiHomeScreenProps = {
+  applicationId: string;
+  createNewApiAction: (pageId: string, from: EventLocation) => void;
+  history: {
+    replace: (data: string) => void;
+    push: (data: string) => void;
+  };
+  location: {
+    search: string;
+  };
+  pageId: string;
+  plugins: Plugin[];
+  createDatasourceFromForm: (data: any) => void;
+  isCreating: boolean;
+};
+
+type Props = ApiHomeScreenProps;
+
+function NewApiScreen(props: Props) {
+  const {
+    applicationId,
+    createNewApiAction,
+    history,
+    isCreating,
+    location,
+    pageId,
+    plugins,
+  } = props;
+
+  const handleCreateNew = () => {
+    if (pageId) {
+      createNewApiAction(pageId, "API_PANE");
+    }
+  };
+  const curlImportURL =
+    getCurlImportPageURL(applicationId, pageId) +
+    "?from=datasources" +
+    location.search;
+
+  return (
+    <StyledContainer>
+      <ApiCardsContainer>
+        <ApiCard
+          className="t--createBlankApiCard create-new-api"
+          onClick={handleCreateNew}
+        >
+          <CardContentWrapper>
+            <div className="content-icon-wrapper">
+              <img
+                alt="New"
+                className="curlImage t--plusImage content-icon"
+                src={PlusLogo}
+              />
+            </div>
+            <p className="textBtn">Create new</p>
+          </CardContentWrapper>
+          {isCreating && <Spinner className="cta" size={25} />}
+        </ApiCard>
+        <ApiCard
+          className="t--createBlankCurlCard"
+          onClick={() => {
+            AnalyticsUtil.logEvent("IMPORT_API_CLICK", {
+              importSource: CURL,
+            });
+            history.push(curlImportURL);
+          }}
+        >
+          <CardContentWrapper>
+            <div className="content-icon-wrapper">
+              <img
+                alt="CURL"
+                className="curlImage t--curlImage content-icon"
+                src={CurlLogo}
+              />
+            </div>
+            <p className="textBtn">CURL</p>
+          </CardContentWrapper>
+        </ApiCard>
+        {plugins
+          .filter((p) => p.type === PluginType.SAAS)
+          .map((p) => (
+            <ApiCard
+              className={`t--createBlankApi-${p.packageName}`}
+              key={p.id}
+              onClick={() => props.createDatasourceFromForm({ pluginId: p.id })}
+            >
+              <CardContentWrapper>
+                <div className="content-icon-wrapper">
+                  <img
+                    alt={p.name}
+                    className={
+                      "content-icon saasImage t--saas-" +
+                      p.packageName +
+                      "-image"
+                    }
+                    src={p.iconLocation}
+                  />
+                </div>
+                <p className="textBtn">{p.name}</p>
+              </CardContentWrapper>
+            </ApiCard>
+          ))}
+      </ApiCardsContainer>
+    </StyledContainer>
+  );
+}
+
+const mapStateToProps = (state: AppState) => ({
+  plugins: state.entities.plugins.list,
+});
+
+const mapDispatchToProps = {
+  createNewApiAction,
+  createDatasourceFromForm,
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(NewApiScreen);
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
new file mode 100644
index 0000000000..a57c00cb04
--- /dev/null
+++ b/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
@@ -0,0 +1,56 @@
+import React from "react";
+import styled from "styled-components";
+import { connect } from "react-redux";
+import { createActionRequest } from "actions/actionActions";
+import { QueryAction } from "entities/Action";
+import DataSourceHome from "./DatasourceHome";
+
+const QueryHomePage = styled.div`
+  display: flex;
+  flex-direction: column;
+  margin-top: 8px;
+  .sectionHeader {
+    font-weight: ${(props) => props.theme.fontWeights[2]};
+    font-size: ${(props) => props.theme.fontSizes[4]}px;
+    margin-top: 10px;
+  }
+`;
+
+type QueryHomeScreenProps = {
+  applicationId: string;
+  pageId: string;
+  createAction: (data: Partial<QueryAction> & { eventData: any }) => void;
+  isCreating: boolean;
+  location: {
+    search: string;
+  };
+  history: {
+    replace: (data: string) => void;
+    push: (data: string) => void;
+  };
+};
+
+class QueryHomeScreen extends React.Component<QueryHomeScreenProps> {
+  render() {
+    const { applicationId, history, location, pageId } = this.props;
+
+    return (
+      <QueryHomePage>
+        <DataSourceHome
+          applicationId={applicationId}
+          history={history}
+          location={location}
+          pageId={pageId}
+        />
+      </QueryHomePage>
+    );
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => ({
+  createAction: (data: Partial<QueryAction> & { eventData: any }) => {
+    dispatch(createActionRequest(data));
+  },
+});
+
+export default connect(null, mapDispatchToProps)(QueryHomeScreen);
diff --git a/app/client/src/pages/Editor/IntegrationEditor/index.tsx b/app/client/src/pages/Editor/IntegrationEditor/index.tsx
new file mode 100644
index 0000000000..8c13eddd37
--- /dev/null
+++ b/app/client/src/pages/Editor/IntegrationEditor/index.tsx
@@ -0,0 +1,32 @@
+import React from "react";
+import IntegrationsHomeScreen from "./IntegrationsHomeScreen";
+import { RouteComponentProps } from "react-router";
+import * as Sentry from "@sentry/react";
+
+type Props = RouteComponentProps<{
+  applicationId: string;
+  pageId: string;
+  selectedTab: string;
+}>;
+
+const integrationsEditor = (props: Props) => {
+  const { history, location, match } = props;
+  return (
+    <div
+      style={{
+        position: "relative",
+        height: "100%",
+      }}
+    >
+      <IntegrationsHomeScreen
+        applicationId={match.params.applicationId}
+        history={history}
+        location={location}
+        pageId={match.params.pageId}
+        selectedTab={match.params.selectedTab}
+      />
+    </div>
+  );
+};
+
+export default Sentry.withProfiler(integrationsEditor);
diff --git a/app/client/src/pages/Editor/MainContainerLayoutControl.tsx b/app/client/src/pages/Editor/MainContainerLayoutControl.tsx
index c3ccfff169..44268a9cb2 100644
--- a/app/client/src/pages/Editor/MainContainerLayoutControl.tsx
+++ b/app/client/src/pages/Editor/MainContainerLayoutControl.tsx
@@ -110,7 +110,7 @@ export function MainContainerLayoutControl() {
               <Icon
                 fillColor={Colors.BLACK}
                 name={selected.icon}
-                size={IconSize.SMALL}
+                size={selected.iconSize || IconSize.SMALL}
               />
             );
           }}
diff --git a/app/client/src/pages/Editor/Popper.tsx b/app/client/src/pages/Editor/Popper.tsx
index 689d659faa..652b5db961 100644
--- a/app/client/src/pages/Editor/Popper.tsx
+++ b/app/client/src/pages/Editor/Popper.tsx
@@ -1,14 +1,13 @@
-import React, { useRef, useEffect } from "react";
-import styled, { ThemeProvider } from "styled-components";
-import { createPortal } from "react-dom";
-import PopperJS, { Placement, PopperOptions } from "popper.js";
-import { noop } from "utils/AppsmithUtils";
-import { draggableElement } from "./utils";
 import { ReactComponent as DragHandleIcon } from "assets/icons/ads/app-icons/draghandler.svg";
-import { Colors } from "constants/Colors";
-import { getThemeDetails, ThemeMode } from "selectors/themeSelectors";
+import PopperJS, { Placement, PopperOptions } from "popper.js";
+import React, { useEffect, useMemo, useRef } from "react";
+import { createPortal } from "react-dom";
 import { AppState } from "reducers";
-import { useSelector } from "react-redux";
+import { getThemeDetails, ThemeMode } from "selectors/themeSelectors";
+import styled, { ThemeProvider } from "styled-components";
+import { noop } from "utils/AppsmithUtils";
+// import { PopperDragHandle } from "./PropertyPane/PropertyPaneConnections";
+import { draggableElement } from "./utils";
 
 export type PopperProps = {
   zIndex: number;
@@ -25,6 +24,7 @@ export type PopperProps = {
     left: number;
   };
   onPositionChange?: (position: { top: number; left: number }) => void;
+  // DraggableNode?: any;
 };
 
 const PopperWrapper = styled.div<{ zIndex: number }>`
@@ -32,14 +32,36 @@ const PopperWrapper = styled.div<{ zIndex: number }>`
   position: absolute;
 `;
 
+// const DragHandleBlock = styled.div`
+//   padding: 6px;
+//   height: 28px;
+//   background-color: ${(props) =>
+//     props.theme.colors?.propertyPane?.bg || Colors.BLACK};
+//   cursor: grab;
+//   box-shadow: 0px 0px 2px rgb(0 0 0 / 10%), 0px 2px 10px rgb(0 0 0 / 10%);
+//   clip-path: inset(-2px 0px -2px -2px);
+// `;
+
+// export function PopperDragHandle() {
+//   return (
+//     <DragHandleBlock>
+//       <DragHandleIcon />
+//     </DragHandleBlock>
+//   );
+// }
 const DragHandleBlock = styled.div`
-  padding: 6px;
-  height: 28px;
-  background-color: ${(props) =>
-    props.theme.colors?.propertyPane?.bg || Colors.BLACK};
   cursor: grab;
-  box-shadow: 0px 0px 2px rgb(0 0 0 / 10%), 0px 2px 10px rgb(0 0 0 / 10%);
-  clip-path: inset(-2px 0px -2px -2px);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 43px;
+  height: 28px;
+  z-index: 3;
+  background-color: ${(props) => props.theme.colors.propertyPane.bg};
+
+  svg {
+    transform: rotate(90deg);
+  }
 `;
 
 export function PopperDragHandle() {
@@ -60,9 +82,13 @@ export default (props: PopperProps) => {
     onPositionChange = noop,
     themeMode = props.themeMode || ThemeMode.LIGHT,
   } = props;
-  const popperTheme = useSelector((state: AppState) =>
-    getThemeDetails(state, themeMode),
+  // Meomoizing to avoid rerender of draggable icon.
+  // What is the cost of memoizing?
+  const popperTheme = useMemo(
+    () => getThemeDetails({} as AppState, themeMode),
+    [themeMode],
   );
+
   useEffect(() => {
     const parentElement = props.targetNode && props.targetNode.parentElement;
     if (
@@ -133,7 +159,7 @@ export default (props: PopperProps) => {
   }, [
     props.targetNode,
     props.isOpen,
-    props.modifiers,
+    JSON.stringify(props.modifiers),
     props.placement,
     disablePopperEvents,
   ]);
diff --git a/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx b/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx
new file mode 100644
index 0000000000..a031f02c6f
--- /dev/null
+++ b/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx
@@ -0,0 +1,94 @@
+import Button, { Category, Size } from "components/ads/Button";
+import React, { useCallback } from "react";
+import { AppState } from "reducers";
+import styled from "styled-components";
+import { useDispatch, useSelector } from "react-redux";
+import {
+  getCurrentApplicationId,
+  getCurrentPageId,
+} from "selectors/editorSelectors";
+import {
+  INTEGRATION_EDITOR_MODES,
+  INTEGRATION_EDITOR_URL,
+  INTEGRATION_TABS,
+} from "constants/routes";
+import history from "utils/history";
+import {
+  setGlobalSearchQuery,
+  toggleShowGlobalSearchModal,
+} from "actions/globalSearchActions";
+import AnalyticsUtil from "utils/AnalyticsUtil";
+import { getTypographyByKey } from "constants/DefaultTheme";
+
+const StyledDiv = styled.div`
+  color: ${(props) => props.theme.colors.propertyPane.ctaTextColor};
+  ${(props) => getTypographyByKey(props, "p1")}
+  background-color: ${(props) =>
+    props.theme.colors.propertyPane.ctaBackgroundColor};
+  padding: ${(props) => props.theme.spaces[3]}px ${(props) =>
+  props.theme.spaces[7]}px;
+  margin: ${(props) => props.theme.spaces[2]}px 0px;
+
+  a:first-child {
+    margin-top: ${(props) => props.theme.spaces[2]}px;
+  }
+  a:nth-child(2) {
+    border: none;
+    background-color: transparent;
+    text-transform: none;
+    justify-content: flex-start;
+    padding: 0px;
+    color: ${(props) => props.theme.colors.propertyPane.ctaLearnMoreTextColor};
+    ${(props) => getTypographyByKey(props, "p3")}
+    margin-top: ${(props) => props.theme.spaces[2]}px;
+
+    :hover {
+      text-decoration: underline;
+    }
+  }
+`;
+
+export const actionsExist = (state: AppState): boolean =>
+  !!state.entities.actions.length;
+
+function ConnectDataCTA() {
+  const applicationId = useSelector(getCurrentApplicationId);
+  const pageId = useSelector(getCurrentPageId);
+  const dispatch = useDispatch();
+
+  const openHelpModal = useCallback(() => {
+    dispatch(setGlobalSearchQuery("Connecting to Data Sources"));
+    dispatch(toggleShowGlobalSearchModal());
+    AnalyticsUtil.logEvent("OPEN_OMNIBAR", {
+      source: "PROPERTY_PANE_CONNECT_DATA",
+    });
+  }, []);
+
+  return (
+    <StyledDiv className="t--propertypane-connect-cta">
+      Data Required
+      <Button
+        category={Category.primary}
+        onClick={() =>
+          history.push(
+            INTEGRATION_EDITOR_URL(
+              applicationId,
+              pageId,
+              INTEGRATION_TABS.NEW,
+              INTEGRATION_EDITOR_MODES.MOCK,
+            ),
+          )
+        }
+        size={Size.large}
+        text="CONNECT DATA"
+      />
+      <Button
+        category={Category.tertiary}
+        onClick={openHelpModal}
+        text="Learn more"
+      />
+    </StyledDiv>
+  );
+}
+
+export default ConnectDataCTA;
diff --git a/app/client/src/pages/Editor/PropertyPane/PanelPropertiesEditor.tsx b/app/client/src/pages/Editor/PropertyPane/PanelPropertiesEditor.tsx
index 3f41f5af3a..f01b42e41b 100644
--- a/app/client/src/pages/Editor/PropertyPane/PanelPropertiesEditor.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PanelPropertiesEditor.tsx
@@ -17,7 +17,7 @@ import { Icon, IPanelProps } from "@blueprintjs/core";
 import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import PropertyPaneTitle from "../PropertyPaneTitle";
 import { BindingText } from "../APIEditor/Form";
-import { PropertyControlsWrapper } from ".";
+import { PropertyControlsWrapper, PropertyPaneBodyWrapper } from ".";
 
 function PanelHeader(props: PanelHeaderProps) {
   return (
@@ -98,10 +98,10 @@ export function PanelPropertiesEditor(
   }, [dispatch, widgetProperties.type, widgetProperties.widgetId]);
 
   const {
-    panelConfig,
-    panelProps,
     closePanel,
+    panelConfig,
     panelParentPropertyPath,
+    panelProps,
     theme,
   } = props;
 
@@ -190,15 +190,17 @@ export function PanelPropertiesEditor(
         title={panelProps[panelConfig.titlePropertyName]}
         updatePropertyTitle={updatePropertyTitle}
       />
-      <PropertyControlsWrapper>
-        {panelConfigs &&
-          generatePropertyControl(panelConfigs as PropertyPaneConfig[], {
-            id: widgetProperties.widgetId,
-            type: widgetProperties.type,
-            panel,
-            theme,
-          })}
-      </PropertyControlsWrapper>
+      <PropertyPaneBodyWrapper>
+        <PropertyControlsWrapper>
+          {panelConfigs &&
+            generatePropertyControl(panelConfigs as PropertyPaneConfig[], {
+              id: widgetProperties.widgetId,
+              type: widgetProperties.type,
+              panel,
+              theme,
+            })}
+        </PropertyControlsWrapper>
+      </PropertyPaneBodyWrapper>
     </>
   );
 }
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
index c5297e4b87..2262cfa716 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
@@ -22,6 +22,7 @@ import { PropertyPaneControlConfig } from "constants/PropertyControlConstants";
 import { IPanelProps } from "@blueprintjs/core";
 import PanelPropertiesEditor from "./PanelPropertiesEditor";
 import {
+  getEvalValuePath,
   isPathADynamicProperty,
   isPathADynamicTrigger,
 } from "utils/DynamicBindingUtils";
@@ -38,6 +39,7 @@ import {
   useChildWidgetEnhancementFns,
   useParentWithEnhancementFn,
 } from "sagas/WidgetEnhancementHelpers";
+import { ControlData } from "components/propertyControls/BaseControl";
 
 type Props = PropertyPaneControlConfig & {
   panel: IPanelProps;
@@ -51,12 +53,13 @@ const PropertyControl = memo((props: Props) => {
     widgetProperties.widgetId,
   );
 
-  /** get all child enhancments functions */
+  /** get all child enhancements functions */
   const {
-    propertyPaneEnhancmentFn: childWidgetPropertyUpdateEnhancementFn,
     autoCompleteEnhancementFn: childWidgetAutoCompleteEnhancementFn,
     customJSControlEnhancementFn: childWidgetCustomJSControlEnhancementFn,
     hideEvaluatedValueEnhancementFn: childWidgetHideEvaluatedValueEnhancementFn,
+    propertyPaneEnhancementFn: childWidgetPropertyUpdateEnhancementFn,
+    updateDataTreePathFn: childWidgetDataTreePathEnhancementFn,
   } = useChildWidgetEnhancementFns(widgetProperties.widgetId);
 
   const toggleDynamicProperty = useCallback(
@@ -160,7 +163,7 @@ const PropertyControl = memo((props: Props) => {
           const allUpdates: Record<string, unknown> = {};
           const triggerPaths: string[] = [];
           hookPropertiesUpdates.forEach(
-            ({ propertyPath, propertyValue, isDynamicTrigger }) => {
+            ({ isDynamicTrigger, propertyPath, propertyValue }) => {
               allUpdates[propertyPath] = propertyValue;
               if (isDynamicTrigger) triggerPaths.push(propertyPath);
             },
@@ -188,6 +191,9 @@ const PropertyControl = memo((props: Props) => {
             type: ENTITY_TYPE.WIDGET,
             name: widgetProperties.widgetName,
             id: widgetProperties.widgetId,
+            // TODO: Check whether these properties have
+            // dependent properties
+            propertyPath: propertiesToUpdate[0].propertyPath,
           },
           state: allUpdates,
         });
@@ -208,6 +214,7 @@ const PropertyControl = memo((props: Props) => {
             type: ENTITY_TYPE.WIDGET,
             name: widgetProperties.widgetName,
             id: widgetProperties.widgetId,
+            propertyPath: propertyName,
           },
           state: {
             [propertyName]: propertyValue,
@@ -242,41 +249,25 @@ const PropertyControl = memo((props: Props) => {
     return null;
   }
 
-  const getPropertyValidation = (
-    propertyName: string,
-  ): { isValid: boolean; validationMessage?: string } => {
-    let isValid = true;
-    let validationMessage = "";
-    if (widgetProperties) {
-      isValid = widgetProperties.invalidProps
-        ? !_.has(widgetProperties.invalidProps, propertyName)
-        : true;
-      const validationMsgPresent =
-        widgetProperties.validationMessages &&
-        _.has(widgetProperties.validationMessages, propertyName);
-      validationMessage = validationMsgPresent
-        ? _.get(widgetProperties.validationMessages, propertyName)
-        : "";
-    }
-    return { isValid, validationMessage };
-  };
-
-  const { propertyName, label } = props;
+  const { label, propertyName } = props;
   if (widgetProperties) {
     const propertyValue = _.get(widgetProperties, propertyName);
-    const dataTreePath: any = `${widgetProperties.widgetName}.evaluatedValues.${propertyName}`;
+    // get the dataTreePath and apply enhancement if exists
+    let dataTreePath: string =
+      props.dataTreePath || `${widgetProperties.widgetName}.${propertyName}`;
+    if (childWidgetDataTreePathEnhancementFn) {
+      dataTreePath = childWidgetDataTreePathEnhancementFn(dataTreePath);
+    }
+
     const evaluatedValue = _.get(
       widgetProperties,
-      `evaluatedValues.${propertyName}`,
+      getEvalValuePath(dataTreePath, false),
     );
 
-    const { isValid, validationMessage } = getPropertyValidation(propertyName);
     const { additionalAutoComplete, ...rest } = props;
-    const config = {
+    const config: ControlData = {
       ...rest,
-      isValid,
       propertyValue,
-      validationMessage,
       dataTreePath,
       evaluatedValue,
       widgetProperties,
@@ -288,7 +279,6 @@ const PropertyControl = memo((props: Props) => {
       additionalDynamicData: {},
     };
     if (isPathADynamicTrigger(widgetProperties, propertyName)) {
-      config.isValid = true;
       config.validationMessage = "";
       delete config.dataTreePath;
       delete config.evaluatedValue;
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx
new file mode 100644
index 0000000000..9eaac13d6a
--- /dev/null
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx
@@ -0,0 +1,282 @@
+import React, { memo, useMemo } from "react";
+import styled from "styled-components";
+import Icon, { IconSize } from "components/ads/Icon";
+import Dropdown, {
+  DefaultDropDownValueNodeProps,
+} from "components/ads/Dropdown";
+import Tooltip from "components/ads/Tooltip";
+import { AppState } from "reducers";
+import { useSelector } from "react-redux";
+import { getDataTree } from "selectors/dataTreeSelectors";
+import { isAction, isWidget } from "workers/evaluationUtils";
+import { getPluginIcon, getWidgetIcon } from "../Explorer/ExplorerIcons";
+import { getAction, getDatasource } from "selectors/entitiesSelector";
+import { keyBy } from "lodash";
+import { isStoredDatasource } from "entities/Action";
+import Text, { TextType } from "components/ads/Text";
+import { Classes } from "components/ads/common";
+import { useEntityLink } from "components/editorComponents/Debugger/hooks";
+import { getDependenciesFromInverseDependencies } from "components/editorComponents/Debugger/helpers";
+
+const TopLayer = styled.div`
+  display: flex;
+  flex: 1;
+  justify-content: space-between;
+  border-bottom: 0.5px solid #e0dede;
+
+  .layout-control {
+    border: none;
+    box-shadow: none;
+    background-color: ${(props) => props.theme.colors.propertyPane.bg};
+  }
+`;
+
+const SelectedNodeWrapper = styled.div<{ entityCount: number }>`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #090707;
+  font-size: 12px;
+  width: 114px;
+  opacity: ${(props) => (!!props.entityCount ? 1 : 0.5)};
+
+  & > *:nth-child(2) {
+    padding: 0 4px;
+  }
+
+  .${Classes.ICON} {
+    margin-top: 1px;
+  }
+`;
+
+const OptionWrapper = styled.div`
+  padding: ${(props) => props.theme.spaces[2] + 1}px
+    ${(props) => props.theme.spaces[5]}px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  line-height: 8px;
+
+  span:first-child {
+    font-size: 10px;
+    font-weight: normal;
+  }
+
+  .${Classes.TEXT} {
+    margin-left: 6px;
+    letter-spacing: 0px;
+    overflow: hidden;
+    white-space: initial;
+    text-overflow: ellipsis;
+    color: ${(props) => props.theme.colors.propertyPane.label};
+  }
+
+  .${Classes.ICON} {
+    margin-right: ${(props) => props.theme.spaces[5]}px;
+  }
+
+  &:not(:hover) {
+    svg {
+      path {
+        fill: #6a86ce;
+      }
+    }
+  }
+
+  &:hover {
+    background-color: ${(props) => props.theme.colors.dropdown.hovered.bg};
+
+    &&& svg {
+      rect {
+        fill: ${(props) => props.theme.colors.textOnDarkBG};
+      }
+    }
+
+    .${Classes.TEXT} {
+      color: ${(props) => props.theme.colors.textOnDarkBG};
+    }
+  }
+`;
+
+type PropertyPaneConnectionsProps = {
+  widgetName: string;
+};
+
+type TriggerNodeProps = DefaultDropDownValueNodeProps & {
+  entityCount: number;
+  iconAlignment: "LEFT" | "RIGHT";
+  connectionType: "INCOMING" | "OUTGOING";
+};
+
+const useGetEntityInfo = (name: string) => {
+  const dataTree = useSelector(getDataTree);
+
+  const entity = dataTree[name];
+  const action = useSelector((state: AppState) =>
+    isAction(entity) ? getAction(state, entity.actionId) : undefined,
+  );
+
+  const plugins = useSelector((state: AppState) => {
+    return state.entities.plugins.list;
+  });
+  const pluginGroups = useMemo(() => keyBy(plugins, "id"), [plugins]);
+  const icon = action && getPluginIcon(pluginGroups[action.pluginId]);
+  const datasource = useSelector((state: AppState) =>
+    action && isStoredDatasource(action.datasource)
+      ? getDatasource(state, action.datasource.id)
+      : undefined,
+  );
+
+  if (isWidget(entity)) {
+    const icon = getWidgetIcon(entity.type);
+
+    return {
+      name,
+      icon,
+    };
+  } else if (isAction(entity)) {
+    return {
+      name,
+      icon,
+      datasourceName: datasource?.name ?? "",
+    };
+  }
+};
+
+const useDependencyList = (name: string) => {
+  const deps = useSelector((state: AppState) => state.evaluations.dependencies);
+  const entityDependencies = useMemo(() => {
+    return getDependenciesFromInverseDependencies(
+      deps.inverseDependencyMap,
+      name,
+    );
+  }, [name, deps.inverseDependencyMap]);
+  const dependencyOptions =
+    entityDependencies?.directDependencies.map((e) => ({
+      label: e,
+      value: e,
+    })) ?? [];
+  const inverseDependencyOptions =
+    entityDependencies?.inverseDependencies.map((e) => ({
+      label: e,
+      value: e,
+    })) ?? [];
+
+  return {
+    dependencyOptions,
+    inverseDependencyOptions,
+  };
+};
+
+function OptionNode(props: any) {
+  const entityInfo = useGetEntityInfo(props.option.value);
+
+  return (
+    <OptionWrapper onClick={props.optionClickHandler}>
+      <span>{entityInfo?.icon}</span>
+      <Text type={TextType.H6}>
+        {props.option.label}{" "}
+        {entityInfo?.datasourceName && (
+          <span>from {entityInfo?.datasourceName}</span>
+        )}
+      </Text>
+    </OptionWrapper>
+  );
+}
+
+const TriggerNode = memo((props: TriggerNodeProps) => {
+  const ENTITY = props.entityCount > 1 ? "entities" : "entity";
+  const tooltipText = !!props.entityCount
+    ? `See ${props.connectionType.toLowerCase()} connections`
+    : `No ${props.connectionType.toLowerCase()} connections`;
+
+  return (
+    <SelectedNodeWrapper entityCount={props.entityCount}>
+      {props.iconAlignment === "LEFT" && (
+        <Icon keepColors name="trending-flat" size={IconSize.MEDIUM} />
+      )}
+      <span>
+        <Tooltip content={tooltipText} disabled={props.isOpen}>
+          {props.entityCount ? `${props.entityCount} ${ENTITY}` : "No Entity"}
+        </Tooltip>
+      </span>
+      {props.iconAlignment === "RIGHT" && (
+        <Icon keepColors name="trending-flat" size={IconSize.MEDIUM} />
+      )}
+      <Icon keepColors name="expand-more" size={IconSize.XS} />
+    </SelectedNodeWrapper>
+  );
+});
+TriggerNode.displayName = "TriggerNode";
+
+function PropertyPaneConnections(props: PropertyPaneConnectionsProps) {
+  const dependencies = useDependencyList(props.widgetName);
+  const { navigateToEntity } = useEntityLink();
+
+  return (
+    <TopLayer>
+      <Dropdown
+        SelectedValueNode={(selectedValueProps) => (
+          <TriggerNode
+            iconAlignment={"LEFT"}
+            {...selectedValueProps}
+            connectionType="INCOMING"
+            entityCount={dependencies.dependencyOptions.length}
+          />
+        )}
+        className="layout-control"
+        disabled={!dependencies.dependencyOptions.length}
+        headerLabel="Incoming connections"
+        height="28px"
+        options={dependencies.dependencyOptions}
+        renderOption={(optionProps) => {
+          return (
+            <OptionNode
+              option={optionProps.option}
+              optionClickHandler={() =>
+                navigateToEntity(optionProps.option.value)
+              }
+            />
+          );
+        }}
+        selected={{ label: "", value: "" }}
+        showDropIcon={false}
+        showLabelOnly
+        width="114px"
+      />
+      {/* <PopperDragHandle /> */}
+      <Dropdown
+        SelectedValueNode={(selectedValueProps) => (
+          <TriggerNode
+            iconAlignment={"RIGHT"}
+            {...selectedValueProps}
+            connectionType="OUTGOING"
+            entityCount={dependencies.inverseDependencyOptions.length}
+          />
+        )}
+        className="layout-control"
+        disabled={!dependencies.inverseDependencyOptions.length}
+        headerLabel="Outgoing connections"
+        height="28px"
+        onSelect={navigateToEntity}
+        options={dependencies.inverseDependencyOptions}
+        renderOption={(optionProps) => {
+          return (
+            <OptionNode
+              option={optionProps.option}
+              optionClickHandler={() =>
+                navigateToEntity(optionProps.option.value)
+              }
+            />
+          );
+        }}
+        selected={{ label: "", value: "" }}
+        showDropIcon={false}
+        showLabelOnly
+        width="114px"
+      />
+    </TopLayer>
+  );
+}
+
+export default memo(PropertyPaneConnections);
diff --git a/app/client/src/pages/Editor/PropertyPane/index.tsx b/app/client/src/pages/Editor/PropertyPane/index.tsx
index 3382066828..6d24cf5cd6 100644
--- a/app/client/src/pages/Editor/PropertyPane/index.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/index.tsx
@@ -28,32 +28,29 @@ import PropertyControlsGenerator from "./Generator";
 import PaneWrapper from "components/editorComponents/PaneWrapper";
 import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import { ThemeMode, getCurrentThemeMode } from "selectors/themeSelectors";
-import {
-  deleteSelectedWidget,
-  copyWidget,
-  selectWidget,
-} from "actions/widgetActions";
+import { deleteSelectedWidget, copyWidget } from "actions/widgetActions";
+import { selectWidgetInitAction } from "actions/widgetSelectionActions";
 import { ControlIcons } from "icons/ControlIcons";
 import { FormIcons } from "icons/FormIcons";
 import PropertyPaneHelpButton from "pages/Editor/PropertyPaneHelpButton";
 import { getProppanePreference } from "selectors/usersSelectors";
 import { PropertyPanePositionConfig } from "reducers/uiReducers/usersReducer";
 import { get } from "lodash";
+import { Layers } from "constants/Layers";
+import ConnectDataCTA, { actionsExist } from "./ConnectDataCTA";
+import PropertyPaneConnections from "./PropertyPaneConnections";
 
 const PropertyPaneWrapper = styled(PaneWrapper)<{
   themeMode?: EditorTheme;
 }>`
-  width: 100%;
   max-height: ${(props) => props.theme.propertyPane.height}px;
   width: ${(props) => props.theme.propertyPane.width}px;
+  padding-top: 0px;
   margin-bottom: ${(props) => props.theme.spaces[2]}px;
   margin-left: ${(props) => props.theme.spaces[10]}px;
-  padding: ${(props) => props.theme.spaces[5]}px;
   padding-top: 0px;
-  padding-right: ${(props) => props.theme.spaces[5]}px;
   border-right: 0;
-  overflow-y: auto;
-  overflow-x: hidden;
+  overflow: hidden;
   text-transform: none;
 `;
 
@@ -81,7 +78,22 @@ interface PropertyPaneState {
 }
 
 export const PropertyControlsWrapper = styled.div`
+  padding: ${(props) => props.theme.spaces[5]}px;
+  padding-top: 0px;
+`;
+
+export const FixedHeader = styled.div`
+  position: fixed;
+  z-index: 3;
+`;
+
+export const PropertyPaneBodyWrapper = styled.div`
   margin-top: ${(props) => props.theme.propertyPane.titleHeight}px;
+  max-height: ${(props) =>
+    props.theme.propertyPane.height -
+    (props.theme.propertyPane.titleHeight +
+      props.theme.propertyPane.connectionsHeight)}px;
+  overflow: auto;
 `;
 
 function PropertyPaneView(
@@ -92,6 +104,7 @@ function PropertyPaneView(
 ) {
   const { hidePropertyPane, theme, ...panel } = props;
   const widgetProperties: any = useSelector(getWidgetPropsForPropertyPane);
+  const doActionsExist = useSelector(actionsExist);
 
   const dispatch = useDispatch();
   const handleDelete = useCallback(() => {
@@ -99,6 +112,8 @@ function PropertyPaneView(
   }, [dispatch]);
   const handleCopy = useCallback(() => dispatch(copyWidget(false)), [dispatch]);
 
+  if (!widgetProperties) return null;
+
   return (
     <>
       <PropertyPaneTitle
@@ -154,14 +169,17 @@ function PropertyPaneView(
         widgetId={widgetProperties.widgetId}
         widgetType={widgetProperties?.type}
       />
-      <PropertyControlsWrapper>
-        <PropertyControlsGenerator
-          id={widgetProperties.widgetId}
-          panel={panel}
-          theme={theme}
-          type={widgetProperties.type}
-        />
-      </PropertyControlsWrapper>
+      <PropertyPaneBodyWrapper>
+        {!doActionsExist && <ConnectDataCTA />}
+        <PropertyControlsWrapper>
+          <PropertyControlsGenerator
+            id={widgetProperties.widgetId}
+            panel={panel}
+            theme={theme}
+            type={widgetProperties.type}
+          />
+        </PropertyControlsWrapper>
+      </PropertyPaneBodyWrapper>
     </>
   );
 }
@@ -178,7 +196,10 @@ class PropertyPane extends Component<PropertyPaneProps, PropertyPaneState> {
   }
 
   render() {
-    if (get(this.props, "widgetProperties.disablePropertyPane")) {
+    if (
+      !get(this.props, "widgetProperties") ||
+      get(this.props, "widgetProperties.disablePropertyPane")
+    ) {
       return null;
     }
 
@@ -204,7 +225,7 @@ class PropertyPane extends Component<PropertyPaneProps, PropertyPaneState> {
           position={this.props?.propPanePreference?.position}
           targetNode={el}
           themeMode={this.getPopperTheme()}
-          zIndex={3}
+          zIndex={Layers.propertyPane}
         >
           {content}
         </Popper>
@@ -228,12 +249,14 @@ class PropertyPane extends Component<PropertyPaneProps, PropertyPaneState> {
     return (
       <PropertyPaneWrapper
         className={"t--propertypane"}
+        data-testid={"t--propertypane"}
         onClick={(e: any) => {
           e.stopPropagation();
         }}
         ref={this.panelWrapperRef}
         themeMode={this.getTheme()}
       >
+        <PropertyPaneConnections widgetName={widgetProperties.widgetName} />
         <StyledPanelStack
           initialPanel={{
             component: PropertyPaneView,
@@ -319,7 +342,7 @@ const mapDispatchToProps = (dispatch: any): PropertyPaneFunctions => {
           },
         },
       });
-      dispatch(selectWidget(widgetId));
+      dispatch(selectWidgetInitAction(widgetId));
     },
     hidePropertyPane: () =>
       dispatch({
diff --git a/app/client/src/pages/Editor/PropertyPaneTitle.tsx b/app/client/src/pages/Editor/PropertyPaneTitle.tsx
index 8e019fce89..4e5a087585 100644
--- a/app/client/src/pages/Editor/PropertyPaneTitle.tsx
+++ b/app/client/src/pages/Editor/PropertyPaneTitle.tsx
@@ -27,8 +27,8 @@ import TooltipComponent from "components/ads/Tooltip";
 const FixedTitle = styled.div`
   position: fixed;
   z-index: 3;
-  width: ${(props) =>
-    props.theme.propertyPane.width - 2 * props.theme.spaces[5]}px;
+  width: ${(props) => props.theme.propertyPane.width}px;
+  padding: 0px ${(props) => props.theme.spaces[5]}px;
 `;
 
 const Wrapper = styled.div<{ iconCount: number }>`
diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
index d3c888987a..63bf66af29 100644
--- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
@@ -10,14 +10,12 @@ import {
   SingleValueProps,
 } from "react-select";
 import { Datasource } from "entities/Datasource";
-import { BaseTabbedView } from "components/designSystems/appsmith/TabbedView";
 import { Colors } from "constants/Colors";
-import { BaseButton } from "components/designSystems/blueprint/ButtonComponent";
 import JSONViewer from "./JSONViewer";
 import FormControl from "../FormControl";
 import Table from "./Table";
-import { Action } from "entities/Action";
-import { useDispatch } from "react-redux";
+import { Action, QueryAction, SaaSAction } from "entities/Action";
+import { useDispatch, useSelector } from "react-redux";
 import ActionNameEditor from "components/editorComponents/ActionNameEditor";
 import DropdownField from "components/editorComponents/form/fields/DropdownField";
 import { ControlProps } from "components/formControls/BaseControl";
@@ -34,7 +32,7 @@ import { TabComponent } from "components/ads/Tabs";
 import AdsIcon from "components/ads/Icon";
 import { Classes } from "components/ads/common";
 import FormRow from "components/editorComponents/FormRow";
-import Button from "components/editorComponents/Button";
+import EditorButton from "components/editorComponents/Button";
 import OnboardingIndicator from "components/editorComponents/Onboarding/Indicator";
 import DebuggerLogs from "components/editorComponents/Debugger/DebuggerLogs";
 import ErrorLogs from "components/editorComponents/Debugger/Errors";
@@ -47,6 +45,20 @@ import CloseEditor from "components/editorComponents/CloseEditor";
 import { setGlobalSearchQuery } from "actions/globalSearchActions";
 import { toggleShowGlobalSearchModal } from "actions/globalSearchActions";
 import { omnibarDocumentationHelper } from "constants/OmnibarDocumentationConstants";
+import EntityDeps from "components/editorComponents/Debugger/EntityDependecies";
+import { isHidden } from "components/formControls/utils";
+import {
+  createMessage,
+  DEBUGGER_ERRORS,
+  DEBUGGER_LOGS,
+  INSPECT_ENTITY,
+} from "constants/messages";
+import { useParams } from "react-router";
+import { AppState } from "reducers";
+import { ExplorerURLParams } from "../Explorer/helpers";
+import MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu";
+import Button, { Size } from "components/ads/Button";
+import { thinScrollbar } from "constants/DefaultTheme";
 
 const QueryFormContainer = styled.form`
   display: flex;
@@ -54,7 +66,10 @@ const QueryFormContainer = styled.form`
   overflow: hidden;
   padding: 20px 0px 0px 0px;
   width: 100%;
-  height: calc(100vh - ${(props) => props.theme.smallHeaderHeight});
+  height: calc(
+    100vh - ${(props) => props.theme.smallHeaderHeight} -
+      ${(props) => props.theme.backBanner}
+  );
   .statementTextArea {
     font-size: 14px;
     line-height: 20px;
@@ -84,6 +99,7 @@ const TabbedViewContainer = styled.div`
   height: 50%;
   // Minimum height of bottom tabs as it can be resized
   min-height: 36px;
+  width: 100%;
   .react-tabs__tab-panel {
     overflow: hidden;
   }
@@ -105,9 +121,10 @@ const TabbedViewContainer = styled.div`
 `;
 
 const SettingsWrapper = styled.div`
-  padding: 5px 30px;
+  padding: 16px 30px;
   overflow-y: auto;
   height: 100%;
+  ${thinScrollbar};
 `;
 
 const GenerateWidgetButton = styled.a`
@@ -208,7 +225,7 @@ const ErrorDescriptionText = styled(Text)`
 `;
 
 const StyledFormRow = styled(FormRow)`
-  padding: 0px 24px;
+  padding: 0px 20px;
   flex: 0;
 `;
 
@@ -227,6 +244,14 @@ const ActionsWrapper = styled.div`
   align-items: center;
   flex: 1 1 50%;
   justify-content: flex-end;
+
+  & > div {
+    margin: 0 0 0 ${(props) => props.theme.spaces[7]}px;
+  }
+
+  button:last-child {
+    margin-left: ${(props) => props.theme.spaces[7]}px;
+  }
 `;
 
 const DropdownSelect = styled.div`
@@ -265,14 +290,14 @@ const Container = styled.div`
   }
 `;
 
-const ActionButton = styled(BaseButton)`
-  &&&& {
-    min-width: 72px;
-    width: auto;
-    margin: 0 5px;
-    min-height: 30px;
-  }
-`;
+// const ActionButton = styled(BaseButton)`
+//   &&&& {
+//     min-width: 72px;
+//     width: auto;
+//     margin: 0 5px;
+//     min-height: 30px;
+//   }
+// `;
 
 const NoDataSourceContainer = styled.div`
   align-items: center;
@@ -299,6 +324,8 @@ const StyledOpenDocsIcon = styled(Icon)`
 const TabContainerView = styled.div`
   flex: 1;
   overflow: auto;
+  border-top: 2px solid ${(props) => props.theme.colors.apiPane.dividerBg};
+  ${thinScrollbar}
   a {
     font-size: 14px;
     line-height: 20px;
@@ -318,6 +345,11 @@ const TabContainerView = styled.div`
   position: relative;
 `;
 
+const InlineButton = styled(Button)`
+  display: inline-flex;
+  margin: 0 4px;
+`;
+
 type QueryFormProps = {
   onDeleteClick: () => void;
   onRunClick: () => void;
@@ -338,6 +370,7 @@ type QueryFormProps = {
   editorConfig?: any;
   formName: string;
   settingConfig: any;
+  formData: SaaSAction | QueryAction;
 };
 
 type ReduxProps = {
@@ -354,29 +387,39 @@ type Props = EditorJSONtoFormProps &
 
 export function EditorJSONtoForm(props: Props) {
   const {
-    handleSubmit,
-    isDeleting,
-    isRunning,
-    onRunClick,
-    onDeleteClick,
-    onCreateDatasourceClick,
-    DATASOURCES_OPTIONS,
+    actionName,
     dataSources,
-    executedQueryData,
-    runErrorMessage,
-    responseType,
+    DATASOURCES_OPTIONS,
     documentationLink,
     editorConfig,
-    settingConfig,
+    executedQueryData,
     formName,
-    actionName,
+    handleSubmit,
+    isRunning,
+    onCreateDatasourceClick,
+    onRunClick,
+    responseType,
+    runErrorMessage,
+    settingConfig,
   } = props;
-
   let error = runErrorMessage;
   let output: Record<string, any>[] | null = null;
   let hintMessages: Array<string> = [];
   const panelRef: RefObject<HTMLDivElement> = useRef(null);
   const [selectedIndex, setSelectedIndex] = useState(0);
+  const [tableBodyHeight, setTableBodyHeightHeight] = useState(
+    window.innerHeight,
+  );
+
+  const params = useParams<{ apiId?: string; queryId?: string }>();
+
+  const actions: Action[] = useSelector((state: AppState) =>
+    state.entities.actions.map((action) => action.config),
+  );
+  const currentActionConfig: Action | undefined = actions.find(
+    (action) => action.id === params.apiId || action.id === params.queryId,
+  );
+  const { pageId } = useParams<ExplorerURLParams>();
 
   if (executedQueryData) {
     if (!executedQueryData.isExecutionSuccess) {
@@ -456,6 +499,27 @@ export function EditorJSONtoForm(props: Props) {
     }
   };
 
+  const renderEachConfig = (formName: string) => (section: any): any => {
+    return section.children.map((formControlOrSection: ControlProps) => {
+      if (isHidden(props.formData, section.hidden)) return null;
+      if (formControlOrSection.hasOwnProperty("children")) {
+        return renderEachConfig(formName)(formControlOrSection);
+      } else {
+        try {
+          const { configProperty } = formControlOrSection;
+          return (
+            <FieldWrapper key={configProperty}>
+              <FormControl config={formControlOrSection} formName={formName} />
+            </FieldWrapper>
+          );
+        } catch (e) {
+          log.error(e);
+        }
+      }
+      return null;
+    });
+  };
+
   const responseTabs = [
     {
       key: "Response",
@@ -499,14 +563,25 @@ export function EditorJSONtoForm(props: Props) {
           )}
           {output &&
             (isTableResponse ? (
-              <Table data={output} />
+              <Table data={output} tableBodyHeight={tableBodyHeight} />
             ) : (
               <JSONViewer src={output} />
             ))}
           {!output && !error && (
             <NoResponseContainer>
               <AdsIcon name="no-response" />
-              <Text type={TextType.P1}>Hit Run to get a Response</Text>
+              <Text type={TextType.P1}>
+                🙌 Click on
+                <InlineButton
+                  isLoading={isRunning}
+                  onClick={props.onRunClick}
+                  size={Size.medium}
+                  tag="button"
+                  text="Run"
+                  type="button"
+                />
+                after adding your query
+              </Text>
             </NoResponseContainer>
           )}
         </ResponseContentWrapper>
@@ -514,14 +589,19 @@ export function EditorJSONtoForm(props: Props) {
     },
     {
       key: "ERROR",
-      title: "Errors",
+      title: createMessage(DEBUGGER_ERRORS),
       panelComponent: <ErrorLogs />,
     },
     {
       key: "LOGS",
-      title: "Logs",
+      title: createMessage(DEBUGGER_LOGS),
       panelComponent: <DebuggerLogs searchQuery={actionName} />,
     },
+    {
+      key: "ENTITY_DEPENDENCIES",
+      title: createMessage(INSPECT_ENTITY),
+      panelComponent: <EntityDeps />,
+    },
   ];
 
   const onTabSelect = (index: number) => {
@@ -539,168 +619,153 @@ export function EditorJSONtoForm(props: Props) {
   };
 
   return (
-    <QueryFormContainer onSubmit={handleSubmit}>
-      <StyledFormRow>
-        <NameWrapper>
-          <CloseEditor />
-          <ActionNameEditor />
-        </NameWrapper>
-        <ActionsWrapper>
-          <DropdownSelect>
-            <DropdownField
-              className={"t--switch-datasource"}
-              components={{ MenuList, Option: CustomOption, SingleValue }}
-              maxMenuHeight={200}
-              name="datasource.id"
-              options={DATASOURCES_OPTIONS}
-              placeholder="Datasource"
-              width={232}
+    <>
+      <CloseEditor />
+      <QueryFormContainer onSubmit={handleSubmit}>
+        <StyledFormRow>
+          <NameWrapper>
+            <ActionNameEditor />
+          </NameWrapper>
+          <ActionsWrapper>
+            <MoreActionsMenu
+              className="t--more-action-menu"
+              id={currentActionConfig ? currentActionConfig.id : ""}
+              name={currentActionConfig ? currentActionConfig.name : ""}
+              pageId={pageId}
             />
-          </DropdownSelect>
-          <ActionButton
-            accent="error"
-            className="t--delete-query"
-            loading={isDeleting}
-            onClick={onDeleteClick}
-            text="Delete"
-          />
-
-          <OnboardingIndicator
-            step={OnboardingStep.EXAMPLE_DATABASE}
-            width={75}
-          >
-            <ActionButton
-              accent="primary"
-              className="t--run-query"
-              filled
-              loading={isRunning}
-              onClick={onRunClick}
-              text="Run"
-            />
-          </OnboardingIndicator>
-        </ActionsWrapper>
-      </StyledFormRow>
-      <SecondaryWrapper>
-        <TabContainerView>
-          {documentationLink && (
-            <DocumentationLink
-              className="t--datasource-documentation-link"
-              onClick={(e: React.MouseEvent) => handleDocumentationClick(e)}
+            <DropdownSelect>
+              <DropdownField
+                className={"t--switch-datasource"}
+                components={{ MenuList, Option: CustomOption, SingleValue }}
+                maxMenuHeight={200}
+                name="datasource.id"
+                options={DATASOURCES_OPTIONS}
+                placeholder="Datasource"
+                width={232}
+              />
+            </DropdownSelect>
+            <OnboardingIndicator
+              step={OnboardingStep.EXAMPLE_DATABASE}
+              width={75}
             >
-              {"Documentation "}
-              <StyledOpenDocsIcon icon="document-open" />
-            </DocumentationLink>
-          )}
-
-          <BaseTabbedView
-            tabs={[
-              {
-                key: "query",
-                title: "Query",
-                panelComponent: (
-                  <SettingsWrapper>
-                    {editorConfig && editorConfig.length > 0 ? (
-                      editorConfig.map(renderEachConfig(formName))
-                    ) : (
-                      <>
-                        <ErrorMessage>
-                          An unexpected error occurred
-                        </ErrorMessage>
-                        <Tag
-                          intent="warning"
-                          interactive
-                          minimal
-                          onClick={() => window.location.reload()}
-                          round
-                        >
-                          Refresh
-                        </Tag>
-                      </>
-                    )}
-                    {dataSources.length === 0 && (
-                      <NoDataSourceContainer>
-                        <p className="font18">
-                          Seems like you don’t have any Datasources to create a
-                          query
-                        </p>
-                        <Button
-                          filled
-                          icon="plus"
-                          intent="primary"
-                          onClick={() => onCreateDatasourceClick()}
-                          size="small"
-                          text="Add a Datasource"
-                        />
-                      </NoDataSourceContainer>
-                    )}
-                  </SettingsWrapper>
-                ),
-              },
-              {
-                key: "settings",
-                title: "Settings",
-                panelComponent: (
-                  <SettingsWrapper>
-                    <ActionSettings
-                      actionSettingsConfig={settingConfig}
-                      formName={formName}
-                    />
-                  </SettingsWrapper>
-                ),
-              },
-            ]}
-          />
-        </TabContainerView>
-
-        <TabbedViewContainer ref={panelRef}>
-          <Resizable panelRef={panelRef} />
-          {output && !!output.length && (
-            <Boxed step={OnboardingStep.SUCCESSFUL_BINDING}>
-              <ResultsCount>
-                <Text type={TextType.P3}>
-                  Result:
-                  <Text type={TextType.H5}>{`${output.length} Record${
-                    output.length > 1 ? "s" : ""
-                  }`}</Text>
-                </Text>
-              </ResultsCount>
-              <GenerateWidgetButton
-                className="t--add-widget"
-                onClick={onAddWidget}
+              <Button
+                className="t--run-query"
+                isLoading={isRunning}
+                onClick={onRunClick}
+                size={Size.medium}
+                tag="button"
+                text="Run"
+                type="button"
+              />
+            </OnboardingIndicator>
+          </ActionsWrapper>
+        </StyledFormRow>
+        <SecondaryWrapper>
+          <TabContainerView>
+            {documentationLink && (
+              <DocumentationLink
+                className="t--datasource-documentation-link"
+                onClick={(e: React.MouseEvent) => handleDocumentationClick(e)}
               >
-                <AdsIcon name="plus" />
-                &nbsp;&nbsp;Generate Widget
-              </GenerateWidgetButton>
-            </Boxed>
-          )}
+                {"Documentation "}
+                <StyledOpenDocsIcon icon="document-open" />
+              </DocumentationLink>
+            )}
+            <TabComponent
+              tabs={[
+                {
+                  key: "query",
+                  title: "Query",
+                  panelComponent: (
+                    <SettingsWrapper>
+                      {editorConfig && editorConfig.length > 0 ? (
+                        editorConfig.map(renderEachConfig(formName))
+                      ) : (
+                        <>
+                          <ErrorMessage>
+                            An unexpected error occurred
+                          </ErrorMessage>
+                          <Tag
+                            intent="warning"
+                            interactive
+                            minimal
+                            onClick={() => window.location.reload()}
+                            round
+                          >
+                            Refresh
+                          </Tag>
+                        </>
+                      )}
+                      {dataSources.length === 0 && (
+                        <NoDataSourceContainer>
+                          <p className="font18">
+                            Seems like you don’t have any Datasources to create
+                            a query
+                          </p>
+                          <EditorButton
+                            filled
+                            icon="plus"
+                            intent="primary"
+                            onClick={() => onCreateDatasourceClick()}
+                            size="small"
+                            text="Add a Datasource"
+                          />
+                        </NoDataSourceContainer>
+                      )}
+                    </SettingsWrapper>
+                  ),
+                },
+                {
+                  key: "settings",
+                  title: "Settings",
+                  panelComponent: (
+                    <SettingsWrapper>
+                      <ActionSettings
+                        actionSettingsConfig={settingConfig}
+                        formName={formName}
+                      />
+                    </SettingsWrapper>
+                  ),
+                },
+              ]}
+            />
+          </TabContainerView>
 
-          <TabComponent
-            onSelect={onTabSelect}
-            selectedIndex={selectedIndex}
-            tabs={responseTabs}
-          />
-        </TabbedViewContainer>
-      </SecondaryWrapper>
-    </QueryFormContainer>
+          <TabbedViewContainer ref={panelRef}>
+            <Resizable
+              panelRef={panelRef}
+              setContainerDimensions={(height: number) =>
+                setTableBodyHeightHeight(height)
+              }
+            />
+            {output && !!output.length && (
+              <Boxed step={OnboardingStep.SUCCESSFUL_BINDING}>
+                <ResultsCount>
+                  <Text type={TextType.P3}>
+                    Result:
+                    <Text type={TextType.H5}>{`${output.length} Record${
+                      output.length > 1 ? "s" : ""
+                    }`}</Text>
+                  </Text>
+                </ResultsCount>
+                <GenerateWidgetButton
+                  className="t--add-widget"
+                  onClick={onAddWidget}
+                >
+                  <AdsIcon name="plus" />
+                  &nbsp;&nbsp;Generate Widget
+                </GenerateWidgetButton>
+              </Boxed>
+            )}
+
+            <TabComponent
+              onSelect={onTabSelect}
+              selectedIndex={selectedIndex}
+              tabs={responseTabs}
+            />
+          </TabbedViewContainer>
+        </SecondaryWrapper>
+      </QueryFormContainer>
+    </>
   );
 }
-
-const renderEachConfig = (formName: string) => (section: any): any => {
-  return section.children.map((formControlOrSection: ControlProps) => {
-    if ("children" in formControlOrSection) {
-      return renderEachConfig(formName)(formControlOrSection);
-    } else {
-      try {
-        const { configProperty } = formControlOrSection;
-        return (
-          <FieldWrapper key={configProperty}>
-            <FormControl config={formControlOrSection} formName={formName} />
-          </FieldWrapper>
-        );
-      } catch (e) {
-        log.error(e);
-      }
-    }
-    return null;
-  });
-};
diff --git a/app/client/src/pages/Editor/QueryEditor/Form.tsx b/app/client/src/pages/Editor/QueryEditor/Form.tsx
index edce2bd59c..b3ae639728 100644
--- a/app/client/src/pages/Editor/QueryEditor/Form.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/Form.tsx
@@ -8,6 +8,8 @@ import {
   getPluginDocumentationLinks,
 } from "selectors/entitiesSelector";
 import { EditorJSONtoForm, EditorJSONtoFormProps } from "./EditorJSONtoForm";
+import { getFormValues } from "redux-form";
+import { QueryAction } from "entities/Action";
 
 const valueSelector = formValueSelector(QUERY_EDITOR_FORM_NAME);
 const mapStateToProps = (state: AppState) => {
@@ -17,6 +19,7 @@ const mapStateToProps = (state: AppState) => {
 
   const responseTypes = getPluginResponseTypes(state);
   const documentationLinks = getPluginDocumentationLinks(state);
+  const formData = getFormValues(QUERY_EDITOR_FORM_NAME)(state) as QueryAction;
 
   return {
     actionName,
@@ -25,6 +28,7 @@ const mapStateToProps = (state: AppState) => {
     responseType: responseTypes[pluginId],
     documentationLink: documentationLinks[pluginId],
     formName: QUERY_EDITOR_FORM_NAME,
+    formData: formData,
   };
 };
 
diff --git a/app/client/src/pages/Editor/QueryEditor/Table.tsx b/app/client/src/pages/Editor/QueryEditor/Table.tsx
index d56813fc8b..89c226ad84 100644
--- a/app/client/src/pages/Editor/QueryEditor/Table.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/Table.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import styled from "styled-components";
+import styled, { withTheme } from "styled-components";
 import { FixedSizeList } from "react-window";
 import { useTable, useBlockLayout } from "react-table";
 
@@ -9,9 +9,12 @@ import { getType, Types } from "utils/TypeHelpers";
 import ErrorBoundary from "components/editorComponents/ErrorBoundry";
 import { CellWrapper } from "components/designSystems/appsmith/TableComponent/TableStyledWrappers";
 import AutoToolTipComponent from "components/designSystems/appsmith/TableComponent/AutoToolTipComponent";
+import { Theme } from "constants/DefaultTheme";
 
 interface TableProps {
   data: Record<string, any>[];
+  tableBodyHeight?: number;
+  theme: Theme;
 }
 
 const TABLE_SIZES = {
@@ -19,6 +22,7 @@ const TABLE_SIZES = {
   TABLE_HEADER_HEIGHT: 42,
   ROW_HEIGHT: 40,
   ROW_FONT_SIZE: 14,
+  SCROLL_SIZE: 20,
 };
 
 export const TableWrapper = styled.div`
@@ -44,13 +48,13 @@ export const TableWrapper = styled.div`
     background: ${Colors.ATHENS_GRAY_DARKER};
     display: table;
     width: 100%;
+    height: 100%;
     .thead,
     .tbody {
       overflow: hidden;
     }
     .tbody {
-      overflow-y: scroll;
-      height: 100%;
+      height: calc(100% - ${TABLE_SIZES.COLUMN_HEADER_HEIGHT}px);
       .tr {
         width: 100%;
       }
@@ -201,6 +205,13 @@ function Table(props: TableProps) {
     return [];
   }, [data]);
 
+  const tableBodyHeightComputed =
+    (props.tableBodyHeight || window.innerHeight) -
+    TABLE_SIZES.COLUMN_HEADER_HEIGHT -
+    props.theme.tabPanelHeight -
+    TABLE_SIZES.SCROLL_SIZE -
+    2 * props.theme.spaces[5]; //top and bottom padding
+
   const defaultColumn = React.useMemo(
     () => ({
       width: 170,
@@ -209,11 +220,11 @@ function Table(props: TableProps) {
   );
 
   const {
-    getTableProps,
     getTableBodyProps,
+    getTableProps,
     headerGroups,
-    rows,
     prepareRow,
+    rows,
     totalColumnsWidth,
   } = useTable(
     {
@@ -292,7 +303,7 @@ function Table(props: TableProps) {
 
             <div {...getTableBodyProps()} className="tbody">
               <FixedSizeList
-                height={window.innerHeight}
+                height={tableBodyHeightComputed || window.innerHeight}
                 itemCount={rows.length}
                 itemSize={35}
                 width={totalColumnsWidth + scrollBarSize}
@@ -307,4 +318,4 @@ function Table(props: TableProps) {
   );
 }
 
-export default Table;
+export default withTheme(Table);
diff --git a/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx b/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx
index ac64ee3045..3023376145 100644
--- a/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx
@@ -55,7 +55,7 @@ class TemplateMenu extends React.Component<Props> {
   nameInput!: HTMLDivElement | null;
 
   fetchTemplate = (queryType: string) => {
-    const { pluginId, allPluginTemplates } = this.props;
+    const { allPluginTemplates, pluginId } = this.props;
     const pluginTemplates = allPluginTemplates[pluginId];
 
     if (pluginTemplates) {
@@ -64,7 +64,7 @@ class TemplateMenu extends React.Component<Props> {
   };
 
   render() {
-    const { createTemplate, allPluginTemplates, pluginId } = this.props;
+    const { allPluginTemplates, createTemplate, pluginId } = this.props;
     const pluginTemplates = allPluginTemplates[pluginId];
 
     return (
diff --git a/app/client/src/pages/Editor/QueryEditor/index.tsx b/app/client/src/pages/Editor/QueryEditor/index.tsx
index 62afe6e0c7..3b67e73dcb 100644
--- a/app/client/src/pages/Editor/QueryEditor/index.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/index.tsx
@@ -4,12 +4,12 @@ import { connect } from "react-redux";
 import { getFormValues } from "redux-form";
 import styled from "styled-components";
 import {
-  DATA_SOURCES_EDITOR_URL,
+  INTEGRATION_EDITOR_URL,
+  INTEGRATION_TABS,
   QueryEditorRouteParams,
 } from "constants/routes";
 import history from "utils/history";
 import QueryEditorForm from "./Form";
-import QueryHomeScreen from "./QueryHomeScreen";
 import { deleteAction, runActionInit } from "actions/actionActions";
 import { AppState } from "reducers";
 import { getIsEditorInitialized } from "selectors/editorSelectors";
@@ -84,7 +84,7 @@ class QueryEditor extends React.Component<Props> {
   };
 
   handleRunClick = () => {
-    const { match, dataSources } = this.props;
+    const { dataSources, match } = this.props;
     PerformanceTracker.startTracking(
       PerformanceTransactionName.RUN_QUERY_CLICK,
       { queryId: this.props.match.params.queryId },
@@ -110,19 +110,19 @@ class QueryEditor extends React.Component<Props> {
   render() {
     const {
       dataSources,
-      isRunning,
+      editorConfig,
+      isCreating,
       isDeleting,
+      isEditorInitialized,
+      isRunning,
       match: {
         params: { queryId },
       },
-      pluginImages,
       pluginIds,
+      pluginImages,
       responses,
-      isCreating,
       runErrorMessage,
-      editorConfig,
       settingConfig,
-      isEditorInitialized,
     } = this.props;
     const { applicationId, pageId } = this.props.match.params;
 
@@ -147,9 +147,11 @@ class QueryEditor extends React.Component<Props> {
     }));
 
     const onCreateDatasourceClick = () => {
-      history.push(DATA_SOURCES_EDITOR_URL(applicationId, pageId));
+      history.push(
+        INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.NEW),
+      );
     };
-    return queryId ? (
+    return (
       <QueryEditorForm
         DATASOURCES_OPTIONS={DATASOURCES_OPTIONS}
         dataSources={dataSources}
@@ -164,15 +166,6 @@ class QueryEditor extends React.Component<Props> {
         runErrorMessage={runErrorMessage[queryId]}
         settingConfig={settingConfig}
       />
-    ) : (
-      <QueryHomeScreen
-        applicationId={applicationId}
-        dataSources={dataSources}
-        history={this.props.history}
-        isCreating={isCreating}
-        location={this.props.location}
-        pageId={pageId}
-      />
     );
   }
 }
diff --git a/app/client/src/pages/Editor/SaaSEditor/ActionForm.tsx b/app/client/src/pages/Editor/SaaSEditor/ActionForm.tsx
index f10e3afbf1..0422180c8e 100644
--- a/app/client/src/pages/Editor/SaaSEditor/ActionForm.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/ActionForm.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import { getFormValues, InjectedFormProps, reduxForm } from "redux-form";
 import history from "utils/history";
-import { SAAS_EDITOR_URL } from "pages/Editor/SaaSEditor/constants";
 import { SAAS_EDITOR_FORM } from "constants/forms";
 import { Action, SaaSAction } from "entities/Action";
 import { connect, useDispatch } from "react-redux";
@@ -15,7 +14,6 @@ import {
   getActionResponses,
   getPlugin,
 } from "selectors/entitiesSelector";
-import { Plugin } from "api/PluginApi";
 import { RouteComponentProps } from "react-router";
 import { deleteAction, runActionInit } from "actions/actionActions";
 import {
@@ -25,6 +23,10 @@ import {
 import { getConfigInitialValues } from "components/formControls/utils";
 import { merge } from "lodash";
 import { Datasource } from "entities/Datasource";
+import {
+  INTEGRATION_EDITOR_URL,
+  INTEGRATION_TABS,
+} from "../../../constants/routes";
 
 type StateAndRouteProps = EditorJSONtoFormProps &
   RouteComponentProps<{
@@ -32,17 +34,16 @@ type StateAndRouteProps = EditorJSONtoFormProps &
     pageId: string;
     pluginPackageName: string;
     apiId: string;
-  }> & { plugin?: Plugin };
+  }>;
 
 type Props = StateAndRouteProps & InjectedFormProps<Action, StateAndRouteProps>;
 
 function ActionForm(props: Props) {
   const {
-    match: {
-      params: { pageId, applicationId, apiId },
-    },
     actionName,
-    plugin,
+    match: {
+      params: { apiId, applicationId, pageId },
+    },
   } = props;
 
   const dispatch = useDispatch();
@@ -54,7 +55,9 @@ function ActionForm(props: Props) {
     dispatch(runActionInit(apiId));
   };
   const onCreateDatasourceClick = () => {
-    history.push(SAAS_EDITOR_URL(applicationId, pageId, plugin?.packageName));
+    history.push(
+      INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.NEW),
+    );
   };
 
   const childProps: any = {
diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx
index 787a576b05..eabd3b0751 100644
--- a/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx
@@ -30,6 +30,10 @@ const ActionButton = styled(BaseButton)`
     max-width: 120px;
     width: auto;
   }
+
+  span > svg > path {
+    stroke: white;
+  }
 `;
 
 const DatasourceImage = styled.img`
diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
index 6d636d0729..66c1edb830 100644
--- a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
@@ -2,14 +2,12 @@ import React from "react";
 import styled from "styled-components";
 import _, { merge } from "lodash";
 import { DATASOURCE_SAAS_FORM } from "constants/forms";
-import { SAAS_EDITOR_URL } from "./constants";
-import history from "utils/history";
+import { SAAS_EDITOR_DATASOURCE_ID_URL } from "./constants";
 import FormTitle from "pages/Editor/DataSourceEditor/FormTitle";
 import Button from "components/editorComponents/Button";
+import AdsButton, { Category } from "components/ads/Button";
 import { Datasource } from "entities/Datasource";
 import { getFormValues, InjectedFormProps, reduxForm } from "redux-form";
-import { BaseButton } from "components/designSystems/blueprint/ButtonComponent";
-import BackButton from "pages/Editor/DataSourceEditor/BackButton";
 import { RouteComponentProps } from "react-router";
 import { connect } from "react-redux";
 import { AppState } from "reducers";
@@ -21,8 +19,7 @@ import {
   redirectAuthorizationCode,
   updateDatasource,
 } from "actions/datasourceActions";
-import { historyPush } from "actions/utilActions";
-import { createNewApiName } from "utils/AppsmithUtils";
+import { createNewQueryName } from "utils/AppsmithUtils";
 import { createActionRequest } from "actions/actionActions";
 import { ActionDataState } from "reducers/entityReducers/actionsReducer";
 import {
@@ -41,8 +38,11 @@ import {
 } from "constants/messages";
 import { Variant } from "components/ads/common";
 import { Toaster } from "components/ads/Toast";
-import { PluginType } from "entities/Action";
+import { Action, PluginType } from "entities/Action";
 import AnalyticsUtil from "utils/AnalyticsUtil";
+import Connected from "../DataSourceEditor/Connected";
+import { Colors } from "constants/Colors";
+import { redirectToNewIntegrations } from "../../../actions/apiPaneActions";
 
 interface StateProps extends JSONtoFormProps {
   isSaving: boolean;
@@ -52,12 +52,15 @@ interface StateProps extends JSONtoFormProps {
   pluginImage: string;
   pluginId: string;
   actions: ActionDataState;
+  datasource?: Datasource;
 }
 
 interface DispatchFunctions {
   updateDatasource: (formData: any, onSuccess?: ReduxAction<unknown>) => void;
   deleteDatasource: (id: string, onSuccess?: ReduxAction<unknown>) => void;
   getOAuthAccessToken: (id: string) => void;
+  createAction: (data: Partial<Action>) => void;
+  redirectToNewIntegrations: (applicationId: string, pageId: string) => void;
 }
 
 type DatasourceSaaSEditorProps = StateProps &
@@ -79,12 +82,25 @@ const StyledButton = styled(Button)`
   }
 `;
 
-const CreateApiButton = styled(BaseButton)`
-  &&& {
-    max-width: 120px;
-    margin-right: 9px;
-    align-self: center;
-    min-height: 32px;
+const EditDatasourceButton = styled(AdsButton)`
+  padding: 10px 20px;
+  &&&& {
+    height: 32px;
+    max-width: 160px;
+    border: 1px solid ${Colors.HIT_GRAY};
+    width: auto;
+  }
+`;
+
+const NewQueryBtn = styled(AdsButton)`
+  padding: 10px 20px;
+  &&&& {
+    height: 36px;
+    //max-width: 120px;
+    width: auto;
+  }
+  span > svg > path {
+    stroke: white;
   }
 `;
 
@@ -120,117 +136,139 @@ class DatasourceSaaSEditor extends JSONtoForm<Props> {
     this.props.updateDatasource(normalizedValues, onSuccess);
   };
 
-  createApiAction = () => {
-    const {
-      formData,
-      actions,
-      match: {
-        params: { pageId },
-      },
-    } = this.props;
-    const newApiName = createNewApiName(actions, pageId || "");
-
-    this.save(
-      createActionRequest({
-        name: newApiName,
-        pageId: pageId,
-        pluginId: formData.pluginId,
-        datasource: {
-          id: formData.id,
-        },
-      }),
-    );
-  };
-
   render() {
     const { formConfig } = this.props;
     const content = this.renderDataSourceConfigForm(formConfig);
     return this.renderForm(content);
   }
 
+  createQueryAction = () => {
+    const {
+      actions,
+      datasource,
+      match: {
+        params: { pageId },
+      },
+    } = this.props;
+    const newQueryName = createNewQueryName(actions, pageId || "");
+
+    const payload = {
+      name: newQueryName,
+      pageId: pageId,
+      pluginId: datasource?.pluginId,
+      datasource: {
+        id: datasource?.id,
+      },
+      actionConfiguration: {},
+      eventData: {
+        actionType: "Query",
+        from: "datasource-pane",
+      },
+    } as Partial<Action>;
+
+    this.props.createAction(payload);
+  };
+
   renderDataSourceConfigForm = (sections: any) => {
     const {
+      deleteDatasource,
+      isDeleting,
+      isSaving,
       match: {
         params: { applicationId, datasourceId, pageId, pluginPackageName },
       },
-      isSaving,
-      isDeleting,
-      deleteDatasource,
     } = this.props;
 
+    const params: string = location.search;
+    const viewMode = new URLSearchParams(params).get("viewMode");
     return (
       <form
         onSubmit={(e) => {
           e.preventDefault();
         }}
       >
-        <BackButton
-          onClick={() =>
-            history.push(
-              SAAS_EDITOR_URL(applicationId, pageId, pluginPackageName),
-            )
-          }
-        />
-        <br />
         <Header>
           <FormTitleContainer>
             <PluginImage alt="Datasource" src={this.props.pluginImage} />
             <FormTitle focusOnMount={this.props.isNewDatasource} />
           </FormTitleContainer>
-          <CreateApiButton
-            accent="primary"
-            className="t--create-query"
-            disabled={this.validate()}
-            filled
-            icon={"plus"}
-            loading={isSaving}
-            onClick={() => this.createApiAction()}
-            text="New API"
-          />
+          {viewMode ? (
+            <EditDatasourceButton
+              category={Category.tertiary}
+              className="t--edit-datasource"
+              onClick={() => {
+                this.props.history.replace(
+                  SAAS_EDITOR_DATASOURCE_ID_URL(
+                    applicationId,
+                    pageId,
+                    pluginPackageName,
+                    datasourceId,
+                    {
+                      viewMode: false,
+                    },
+                  ),
+                );
+              }}
+              text="EDIT"
+            />
+          ) : (
+            <NewQueryBtn
+              className="t--create-query"
+              icon="plus"
+              onClick={this.createQueryAction}
+              text={"New Query"}
+            />
+          )}
         </Header>
-
-        {!_.isNil(sections)
-          ? _.map(sections, this.renderMainSection)
-          : undefined}
-        <SaveButtonContainer>
-          <ActionButton
-            accent="error"
-            className="t--delete-datasource"
-            loading={isDeleting}
-            onClick={() =>
-              deleteDatasource(
-                datasourceId,
-                historyPush(
-                  SAAS_EDITOR_URL(applicationId, pageId, pluginPackageName),
-                ),
-              )
-            }
-            text="Delete"
-          />
-          <StyledButton
-            className="t--save-datasource"
-            disabled={this.validate()}
-            filled
-            intent="primary"
-            loading={isSaving}
-            onClick={() => {
-              AnalyticsUtil.logEvent("GSHEET_AUTH_INIT", {
-                applicationId,
-                datasourceId,
-                pageId,
-              });
-              this.save(
-                redirectAuthorizationCode(
-                  pageId,
-                  datasourceId,
-                  PluginType.SAAS,
-                ),
-              );
-            }}
-            size="small"
-            text="Continue"
-          />
-        </SaveButtonContainer>
+        {!viewMode ? (
+          <>
+            {!_.isNil(sections)
+              ? _.map(sections, this.renderMainSection)
+              : null}
+            <SaveButtonContainer>
+              <ActionButton
+                accent="error"
+                className="t--delete-datasource"
+                loading={isDeleting}
+                onClick={() =>
+                  deleteDatasource(
+                    datasourceId,
+                    this.props.redirectToNewIntegrations(
+                      applicationId,
+                      pageId,
+                    ) as any,
+                  )
+                }
+                text="Delete"
+              />
+              <StyledButton
+                className="t--save-datasource"
+                disabled={this.validate()}
+                filled
+                intent="primary"
+                loading={isSaving}
+                onClick={() => {
+                  AnalyticsUtil.logEvent("GSHEET_AUTH_INIT", {
+                    applicationId,
+                    datasourceId,
+                    pageId,
+                  });
+                  this.save(
+                    redirectAuthorizationCode(
+                      pageId,
+                      datasourceId,
+                      PluginType.SAAS,
+                    ),
+                  );
+                }}
+                size="small"
+                text="Continue"
+              />
+            </SaveButtonContainer>
+          </>
+        ) : (
+          <Connected />
+        )}
       </form>
     );
   };
@@ -250,6 +288,7 @@ const mapStateToProps = (state: AppState, props: any) => {
   }
   merge(initialValues, datasource);
   return {
+    datasource,
     isSaving: datasources.loading,
     isDeleting: datasources.isDeleting,
     formData: formData,
@@ -272,6 +311,12 @@ const mapDispatchToProps = (dispatch: any): DispatchFunctions => {
       dispatch(updateDatasource(formData, onSuccess)),
     getOAuthAccessToken: (datasourceId: string) =>
       dispatch(getOAuthAccessToken(datasourceId)),
+    createAction: (data: Partial<Action>) => {
+      dispatch(createActionRequest(data));
+    },
+    redirectToNewIntegrations: (applicationId: string, pageId: string) => {
+      dispatch(redirectToNewIntegrations(applicationId, pageId));
+    },
   };
 };
 
diff --git a/app/client/src/pages/Editor/SaaSEditor/ListView.tsx b/app/client/src/pages/Editor/SaaSEditor/ListView.tsx
index 3110c242e0..ee01d4be83 100644
--- a/app/client/src/pages/Editor/SaaSEditor/ListView.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/ListView.tsx
@@ -21,7 +21,7 @@ import styled from "styled-components";
 import { Spinner, Button } from "@blueprintjs/core";
 import DatasourceCard from "pages/Editor/SaaSEditor/DatasourceCard";
 import { getIsEditorInitialized } from "selectors/editorSelectors";
-import { API_EDITOR_URL } from "constants/routes";
+import { INTEGRATION_EDITOR_URL, INTEGRATION_TABS } from "constants/routes";
 
 const IntegrationHomePage = styled.div`
   padding: 20px;
@@ -81,11 +81,11 @@ class ListView extends React.Component<Props> {
 
   handleCreateNewAPI = (datasource: Datasource) => {
     const {
+      actions,
+      location,
       match: {
         params: { pageId },
       },
-      actions,
-      location,
     } = this.props;
     const params: string = location.search;
     let pgId = new URLSearchParams(params).get("importTo");
@@ -107,7 +107,7 @@ class ListView extends React.Component<Props> {
   };
 
   render() {
-    const { plugin, isCreating, isEditorInitialized } = this.props;
+    const { isCreating, isEditorInitialized, plugin } = this.props;
     if (!plugin) {
       return this.renderNotFound();
     }
@@ -159,19 +159,25 @@ class ListView extends React.Component<Props> {
 
   renderNotFound() {
     const {
+      history,
       match: {
         params: { applicationId, pageId },
       },
-      history,
     } = this.props;
     return (
       <IntegrationHomePage>
         <NotFound
-          buttonText="Go back to Integrations"
+          buttonText="Go back to Datasources"
           onBackButton={() =>
-            history.push(API_EDITOR_URL(applicationId, pageId))
+            history.push(
+              INTEGRATION_EDITOR_URL(
+                applicationId,
+                pageId,
+                INTEGRATION_TABS.ACTIVE,
+              ),
+            )
           }
-          title="Integration Not found"
+          title="Datasources/Queries Not found"
         />
       </IntegrationHomePage>
     );
diff --git a/app/client/src/pages/Editor/ShareApplicationForm.tsx b/app/client/src/pages/Editor/ShareApplicationForm.tsx
index ab8c7a1e72..d56e342782 100644
--- a/app/client/src/pages/Editor/ShareApplicationForm.tsx
+++ b/app/client/src/pages/Editor/ShareApplicationForm.tsx
@@ -29,13 +29,13 @@ const ShareToggle = styled.div`
 
 export function ShareApplicationForm(props: any) {
   const {
+    changeAppViewAccess,
+    currentApplicationDetails,
+    isChangingViewAccess,
+    isFetchingApplication,
     match: {
       params: { applicationId },
     },
-    isFetchingApplication,
-    isChangingViewAccess,
-    currentApplicationDetails,
-    changeAppViewAccess,
   } = props;
 
   return (
diff --git a/app/client/src/pages/Editor/ToggleModeButton.tsx b/app/client/src/pages/Editor/ToggleModeButton.tsx
new file mode 100644
index 0000000000..eab2e4b1d3
--- /dev/null
+++ b/app/client/src/pages/Editor/ToggleModeButton.tsx
@@ -0,0 +1,325 @@
+import React, { useCallback, useEffect, useState } from "react";
+import styled from "styled-components";
+import { useDispatch, useSelector } from "react-redux";
+import TooltipComponent from "components/ads/Tooltip";
+import TourTooltipWrapper from "components/ads/tour/TourTooltipWrapper";
+import { ReactComponent as Pen } from "assets/icons/comments/pen.svg";
+import { ReactComponent as Eye } from "assets/icons/comments/eye.svg";
+import { ReactComponent as CommentModeUnread } from "assets/icons/comments/comment-mode-unread-indicator.svg";
+import { ReactComponent as CommentMode } from "assets/icons/comments/chat.svg";
+import { Indices } from "constants/Layers";
+
+import {
+  setCommentMode as setCommentModeAction,
+  fetchApplicationCommentsRequest,
+  showCommentsIntroCarousel,
+} from "actions/commentActions";
+import {
+  commentModeSelector,
+  areCommentsEnabledForUserAndApp as areCommentsEnabledForUserAndAppSelector,
+  showUnreadIndicator as showUnreadIndicatorSelector,
+} from "../../selectors/commentsSelectors";
+import { getCurrentUser } from "selectors/usersSelectors";
+import { useLocation } from "react-router";
+import history from "utils/history";
+import { Position } from "@blueprintjs/core/lib/esm/common/position";
+import { TourType } from "entities/Tour";
+import useProceedToNextTourStep from "utils/hooks/useProceedToNextTourStep";
+import { getCommentsIntroSeen } from "utils/storage";
+import { User } from "constants/userConstants";
+import { AppState } from "reducers";
+import { APP_MODE } from "reducers/entityReducers/appReducer";
+
+import { matchBuilderPath, matchViewerPath } from "constants/routes";
+
+import { createMessage, ONE_UNREAD_MESSAGE } from "constants/messages";
+
+import localStorage from "utils/localStorage";
+
+const getShowCommentsButtonToolTip = () => {
+  const flag = localStorage.getItem("ShowCommentsButtonToolTip");
+  return flag === null || !!flag;
+};
+const setShowCommentsButtonToolTip = (value = "") =>
+  localStorage.setItem("ShowCommentsButtonToolTip", value);
+
+const ModeButton = styled.div<{ active: boolean; type: string }>`
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+
+  height: ${(props) => props.theme.smallHeaderHeight};
+  width: ${(props) => props.theme.smallHeaderHeight};
+  background: ${(props) =>
+    props.active
+      ? props.theme.colors.comments.activeModeBackground
+      : "transparent"};
+
+  svg path {
+    fill: ${(props) =>
+      props.type !== "fill"
+        ? "transparent"
+        : props.active
+        ? props.theme.colors.comments.activeModeIcon
+        : props.theme.colors.comments.modeIcon};
+    stroke: ${(props) =>
+      props.type !== "stroke"
+        ? "transparent"
+        : props.active
+        ? props.theme.colors.comments.activeModeIcon
+        : props.theme.colors.comments.modeIcon};
+  }
+
+  svg rect:not(:first-child) {
+    fill: ${(props) =>
+      props.active
+        ? props.theme.colors.comments.activeModeIcon
+        : props.theme.colors.comments.modeIcon};
+  }
+
+  svg circle {
+    stroke: ${(props) =>
+      props.active
+        ? props.theme.colors.comments.activeModeIconCircleStroke
+        : props.theme.colors.comments.modeIconCircleStroke};
+  }
+`;
+
+const Container = styled.div`
+  display: flex;
+  flex: 1;
+  z-index: ${Indices.Layer1};
+`;
+
+/**
+ * Sync comment mode in store with comment mode in URL
+ * Fetch app comments when comment mode is selected
+ */
+// eslint-disable-next-line
+const useUpdateCommentMode = async (currentUser?: User) => {
+  const location = useLocation();
+  const dispatch = useDispatch();
+  const isCommentMode = useSelector(commentModeSelector);
+
+  const setCommentModeInStore = useCallback(
+    (updatedIsCommentMode) =>
+      dispatch(setCommentModeAction(updatedIsCommentMode)),
+    [],
+  );
+
+  const handleLocationUpdate = async () => {
+    const searchParams = new URL(window.location.href).searchParams;
+    const isCommentMode = searchParams.get("isCommentMode");
+    const isCommentsIntroSeen = await getCommentsIntroSeen();
+    const updatedIsCommentMode = isCommentMode === "true" ? true : false;
+
+    if (updatedIsCommentMode && !isCommentsIntroSeen) {
+      dispatch(showCommentsIntroCarousel());
+    } else {
+      setCommentModeInStore(updatedIsCommentMode);
+    }
+  };
+
+  // sync comment mode in store with comment mode in URL
+  useEffect(() => {
+    if (window.location.href) {
+      handleLocationUpdate();
+    }
+  }, [location]);
+
+  // fetch applications comments when comment mode is turned on
+  useEffect(() => {
+    if (isCommentMode) {
+      dispatch(fetchApplicationCommentsRequest());
+    }
+  }, [isCommentMode]);
+};
+
+export const setCommentModeInUrl = (isCommentMode: boolean) => {
+  const currentURL = new URL(window.location.href);
+  const searchParams = currentURL.searchParams;
+  searchParams.set("isCommentMode", `${isCommentMode}`);
+  // remove comment link params so that they don't get retriggered
+  // on toggling comment mode
+  searchParams.delete("commentId");
+  searchParams.delete("commentThreadId");
+  history.replace({
+    pathname: currentURL.pathname,
+    search: searchParams.toString(),
+    hash: currentURL.hash,
+  });
+};
+
+function EditModeReset() {
+  return (
+    <TooltipComponent
+      content={
+        <>
+          Edit Mode
+          <span style={{ color: "#fff", marginLeft: 20 }}>V</span>
+        </>
+      }
+      hoverOpenDelay={1000}
+      position={Position.BOTTOM}
+    >
+      <Pen />
+    </TooltipComponent>
+  );
+}
+
+function ViewModeReset() {
+  return (
+    <TooltipComponent
+      content={
+        <>
+          View Mode
+          <span style={{ color: "#fff", marginLeft: 20 }}>V</span>
+        </>
+      }
+      hoverOpenDelay={1000}
+      position={Position.BOTTOM}
+    >
+      <Eye />
+    </TooltipComponent>
+  );
+}
+
+const tourToolTipProps = {
+  hasOverlay: true,
+  modifiers: {
+    offset: { enabled: true, offset: "3, 20" },
+    arrow: {
+      enabled: true,
+      fn: (data: any) => ({
+        ...data,
+        offsets: {
+          ...data.offsets,
+          arrow: {
+            top: -8,
+            left: 80,
+          },
+        },
+      }),
+    },
+  },
+  pulseStyles: {
+    top: 20,
+    left: 28,
+    height: 30,
+    width: 30,
+  },
+  showPulse: true,
+  tourIndex: 0,
+  tourType: TourType.COMMENTS_TOUR,
+};
+
+function ViewOrEditMode({ mode }: { mode?: APP_MODE }) {
+  return mode === APP_MODE.EDIT ? <EditModeReset /> : <ViewModeReset />;
+}
+
+function CommentModeBtn({
+  handleSetCommentModeButton,
+  isCommentMode,
+  showUnreadIndicator,
+}: {
+  handleSetCommentModeButton: () => void;
+  isCommentMode: boolean;
+  showUnreadIndicator: boolean;
+}) {
+  const CommentModeIcon = showUnreadIndicator ? CommentModeUnread : CommentMode;
+
+  return (
+    <ModeButton
+      active={isCommentMode}
+      className="t--switch-comment-mode-on"
+      onClick={handleSetCommentModeButton}
+      type="stroke"
+    >
+      <TooltipComponent
+        content={
+          <>
+            Comment Mode
+            <span style={{ color: "#fff", marginLeft: 20 }}>C</span>
+          </>
+        }
+        hoverOpenDelay={1000}
+        position={Position.BOTTOM}
+      >
+        <CommentModeIcon />
+      </TooltipComponent>
+    </ModeButton>
+  );
+}
+
+function ToggleCommentModeButton() {
+  const commentsEnabled = useSelector(areCommentsEnabledForUserAndAppSelector);
+  const isCommentMode = useSelector(commentModeSelector);
+  const currentUser = useSelector(getCurrentUser);
+  const [
+    showCommentButtonDiscoveryTooltip,
+    setShowCommentButtonDiscoveryTooltipInState,
+  ] = useState(getShowCommentsButtonToolTip());
+
+  const showUnreadIndicator =
+    useSelector(showUnreadIndicatorSelector) ||
+    showCommentButtonDiscoveryTooltip;
+
+  useUpdateCommentMode(currentUser);
+  const proceedToNextTourStep = useProceedToNextTourStep(
+    TourType.COMMENTS_TOUR,
+    0,
+  );
+
+  const mode = useSelector((state: AppState) => state.entities.app.mode);
+
+  const handleSetCommentModeButton = useCallback(() => {
+    setCommentModeInUrl(true);
+    proceedToNextTourStep();
+    setShowCommentButtonDiscoveryTooltipInState(false);
+    setShowCommentsButtonToolTip();
+  }, [proceedToNextTourStep, setShowCommentButtonDiscoveryTooltipInState]);
+
+  // Show comment mode button only on the canvas editor and viewer
+  const [shouldHide, setShouldHide] = useState(false);
+  const location = useLocation();
+  useEffect(() => {
+    const pathName = window.location.pathname;
+    const shouldShow = matchBuilderPath(pathName) || matchViewerPath(pathName);
+    setShouldHide(!shouldShow);
+  }, [location]);
+  if (shouldHide) return null;
+
+  if (!commentsEnabled) return null;
+
+  return (
+    <Container>
+      <TourTooltipWrapper {...tourToolTipProps}>
+        <div style={{ display: "flex" }}>
+          <ModeButton
+            active={!isCommentMode}
+            onClick={() => setCommentModeInUrl(false)}
+            type="fill"
+          >
+            <ViewOrEditMode mode={mode} />
+          </ModeButton>
+          <TooltipComponent
+            content={createMessage(ONE_UNREAD_MESSAGE)}
+            isOpen={showCommentButtonDiscoveryTooltip}
+          >
+            <CommentModeBtn
+              {...{
+                handleSetCommentModeButton,
+                isCommentMode,
+                showUnreadIndicator,
+              }}
+            />
+          </TooltipComponent>
+        </div>
+      </TourTooltipWrapper>
+    </Container>
+  );
+}
+
+export default ToggleCommentModeButton;
diff --git a/app/client/src/pages/Editor/WidgetCard.tsx b/app/client/src/pages/Editor/WidgetCard.tsx
index 545596a2b9..b3baddc045 100644
--- a/app/client/src/pages/Editor/WidgetCard.tsx
+++ b/app/client/src/pages/Editor/WidgetCard.tsx
@@ -4,16 +4,11 @@ import blankImage from "assets/images/blank.png";
 import { WidgetCardProps } from "widgets/BaseWidget";
 import styled from "styled-components";
 import { WidgetIcons } from "icons/WidgetIcons";
-import {
-  useWidgetDragResize,
-  useShowPropertyPane,
-  useWidgetSelection,
-} from "utils/hooks/dragResizeHooks";
+import { useWidgetDragResize } from "utils/hooks/dragResizeHooks";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { generateReactKey } from "utils/generators";
 import { Colors } from "constants/Colors";
-import { AppState } from "reducers";
-import { useSelector } from "react-redux";
+import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
 
 type CardProps = {
   details: WidgetCardProps;
@@ -44,9 +39,6 @@ export const Wrapper = styled.div`
       path {
         fill: ${Colors.WHITE};
       }
-      rect {
-        stroke: ${Colors.WHITE};
-      }
     }
   }
   & i {
@@ -81,15 +73,9 @@ export const IconLabel = styled.h5`
 
 function WidgetCard(props: CardProps) {
   const { setIsDragging } = useWidgetDragResize();
-  const { selectWidget } = useWidgetSelection();
-
-  const selectedWidget = useSelector(
-    (state: AppState) => state.ui.widgetDragResize.selectedWidget,
-  );
-
+  const { deselectAll } = useWidgetSelection();
   // Generate a new widgetId which can be used in the future for this widget.
   const [widgetId, setWidgetId] = useState(generateReactKey());
-  const showPropertyPane = useShowPropertyPane();
   const [, drag, preview] = useDrag({
     item: { ...props.details, widgetId },
     begin: () => {
@@ -97,11 +83,8 @@ function WidgetCard(props: CardProps) {
         widgetType: props.details.type,
         widgetName: props.details.widgetCardName,
       });
-      showPropertyPane && showPropertyPane(undefined);
       setIsDragging && setIsDragging(true);
-
-      // Make sure that this widget is selected
-      selectWidget && selectedWidget !== widgetId && selectWidget(widgetId);
+      deselectAll();
     },
     end: (widget, monitor) => {
       AnalyticsUtil.logEvent("WIDGET_CARD_DROP", {
diff --git a/app/client/src/pages/Editor/WidgetsEditor.tsx b/app/client/src/pages/Editor/WidgetsEditor.tsx
index 365361f36d..5886fd1206 100644
--- a/app/client/src/pages/Editor/WidgetsEditor.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor.tsx
@@ -11,7 +11,6 @@ import {
 import Centered from "components/designSystems/appsmith/CenteredWrapper";
 import EditorContextProvider from "components/editorComponents/EditorContextProvider";
 import { Spinner } from "@blueprintjs/core";
-import { useWidgetSelection } from "utils/hooks/dragResizeHooks";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import * as log from "loglevel";
 import { getCanvasClassName } from "utils/generators";
@@ -25,6 +24,8 @@ import { getCurrentApplication } from "selectors/applicationSelectors";
 import { MainContainerLayoutControl } from "./MainContainerLayoutControl";
 import { useDynamicAppLayout } from "utils/hooks/useDynamicAppLayout";
 import Debugger from "components/editorComponents/Debugger";
+import { closePropertyPane } from "actions/widgetActions";
+import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
 
 const EditorWrapper = styled.div`
   display: flex;
@@ -41,6 +42,7 @@ const CanvasContainer = styled.section`
   position: relative;
   overflow-x: auto;
   overflow-y: auto;
+  padding-top: 1px;
   &:before {
     position: absolute;
     top: 0;
@@ -53,7 +55,7 @@ const CanvasContainer = styled.section`
 
 /* eslint-disable react/display-name */
 function WidgetsEditor() {
-  const { focusWidget, selectWidget } = useWidgetSelection();
+  const { deselectAll, focusWidget, selectWidget } = useWidgetSelection();
   const params = useParams<{ applicationId: string; pageId: string }>();
   const dispatch = useDispatch();
 
@@ -98,8 +100,9 @@ function WidgetsEditor() {
 
   const handleWrapperClick = useCallback(() => {
     focusWidget && focusWidget();
-    selectWidget && selectWidget();
-  }, [focusWidget, selectWidget]);
+    deselectAll && deselectAll();
+    dispatch(closePropertyPane());
+  }, [focusWidget, deselectAll]);
 
   const pageLoading = (
     <Centered>
diff --git a/app/client/src/pages/Editor/WidgetsMultiSelectBox.tsx b/app/client/src/pages/Editor/WidgetsMultiSelectBox.tsx
new file mode 100644
index 0000000000..3f4f96ba84
--- /dev/null
+++ b/app/client/src/pages/Editor/WidgetsMultiSelectBox.tsx
@@ -0,0 +1,339 @@
+import React, { useMemo } from "react";
+import styled from "styled-components";
+import { get, minBy, maxBy } from "lodash";
+import { useSelector, useDispatch } from "react-redux";
+
+import {
+  copyWidget,
+  cutWidget,
+  deleteSelectedWidget,
+} from "actions/widgetActions";
+import { isMac } from "utils/helpers";
+import { Layers } from "constants/Layers";
+import { FormIcons } from "icons/FormIcons";
+import Tooltip from "components/ads/Tooltip";
+import { ControlIcons } from "icons/ControlIcons";
+import { getSelectedWidgets } from "selectors/ui";
+import { generateClassName } from "utils/generators";
+
+import { stopEventPropagation } from "utils/AppsmithUtils";
+import { getCanvasWidgets } from "selectors/entitiesSelector";
+import { IPopoverSharedProps, Position } from "@blueprintjs/core";
+import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
+import { WidgetTypes } from "constants/WidgetConstants";
+
+const StyledSelectionBox = styled.div`
+  position: absolute;
+`;
+
+const StyledActionsContainer = styled.div`
+  position: relative;
+  height: 100%;
+  width: 100%;
+`;
+
+const StyledActions = styled.div`
+  left: calc(100% - 38px);
+  padding: 5px 0;
+  width: max-content;
+  z-index: ${Layers.contextMenu};
+  position: absolute;
+  background-color: ${(props) => props.theme.colors.appBackground};
+`;
+
+const StyledAction = styled.button`
+  cursor: pointer;
+  height: 28px;
+  width: 28px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 5px;
+  outline: none;
+  border: none;
+  background: transparent;
+  z-index: ${Layers.contextMenu};
+  position: relative;
+
+  &:hover,
+  &:active,
+  &.active {
+    background: ${(props) =>
+      props.disabled
+        ? "initial"
+        : props.theme.colors.widgetGroupingContextMenu.actionActiveBg};
+  }
+  &:focus {
+    outline: none;
+  }
+`;
+
+const StyledSelectBoxHandleTop = styled.div`
+  width: 100%;
+  height: 1px;
+  position: absolute;
+  z-index: ${Layers.contextMenu};
+  border-top: 1px dashed
+    ${(props) => props.theme.colors.widgetGroupingContextMenu.border};
+  top: 0px;
+  left: -1px;
+`;
+
+const StyledSelectBoxHandleLeft = styled.div`
+  width: 0px;
+  height: 100%;
+  position: absolute;
+  z-index: ${Layers.contextMenu};
+  border-left: 1px dashed
+    ${(props) => props.theme.colors.widgetGroupingContextMenu.border};
+  top: 0px;
+  left: -1px;
+`;
+
+const StyledSelectBoxHandleRight = styled.div`
+  width: 0px;
+  height: 100%;
+  position: absolute;
+  z-index: ${Layers.contextMenu};
+  border-left: 1px dashed
+    ${(props) => props.theme.colors.widgetGroupingContextMenu.border};
+  top: 0px;
+  left: calc(100% - 1px);
+`;
+
+const StyledSelectBoxHandleBottom = styled.div`
+  width: 100%;
+  height: 1px;
+  position: absolute;
+  z-index: ${Layers.contextMenu};
+  border-bottom: 1px dashed
+    ${(props) => props.theme.colors.widgetGroupingContextMenu.border};
+  top: 100%;
+  left: -1px;
+`;
+
+export const PopoverModifiers: IPopoverSharedProps["modifiers"] = {
+  offset: {
+    enabled: true,
+  },
+  arrow: {
+    enabled: false,
+  },
+};
+
+const CopyIcon = ControlIcons.COPY2_CONTROL;
+const DeleteIcon = FormIcons.DELETE_ICON;
+const CutIcon = ControlIcons.CUT_CONTROL;
+
+/**
+ * helper text that comes in popover on hover of actions in context menu
+ * @returns
+ */
+const modText = () => (isMac() ? <span>&#8984;</span> : "ctrl");
+const copyHelpText = (
+  <>
+    Click or <b>{modText()} + C</b> & {modText()} + V
+  </>
+);
+const cutHelpText = (
+  <>
+    Click or <b>{modText()} + X</b> & {modText()} + V
+  </>
+);
+const deleteHelpText = (
+  <>
+    Click or <b> Del </b>
+  </>
+);
+
+interface OffsetBox {
+  top: number;
+  left: number;
+  width: number;
+  height: number;
+}
+
+function WidgetsMultiSelectBox(props: {
+  widgetId: string;
+  widgetType: string;
+}): any {
+  const dispatch = useDispatch();
+  const canvasWidgets = useSelector(getCanvasWidgets);
+  const selectedWidgetIDs = useSelector(getSelectedWidgets);
+  const selectedWidgets = selectedWidgetIDs.map(
+    (widgetID) => canvasWidgets[widgetID],
+  );
+  const { focusWidget } = useWidgetSelection();
+
+  /**
+   * the multi-selection bounding box should only render when:
+   *
+   * 1. the widgetID is equal to the parent id of selected widget
+   * 2. has common parent
+   * 3. multiple widgets are selected
+   */
+  const shouldRender = useMemo(() => {
+    const parentIDs = selectedWidgets
+      .filter(Boolean)
+      .map((widget) => widget.parentId);
+    const hasCommonParent = parentIDs.every((v) => v === parentIDs[0]);
+    const isMultipleWidgetsSelected = selectedWidgetIDs.length > 1;
+
+    return (
+      props.widgetType === WidgetTypes.CANVAS_WIDGET &&
+      isMultipleWidgetsSelected &&
+      hasCommonParent &&
+      get(selectedWidgets, "0.parentId") === props.widgetId
+    );
+  }, [selectedWidgets]);
+
+  /**
+   * calculate bounding box
+   */
+  const { height, left, top, width } = useMemo(() => {
+    if (shouldRender) {
+      const widgetClasses = selectedWidgetIDs
+        .map((id) => `.${generateClassName(id)}.positioned-widget`)
+        .join(",");
+      const elements = document.querySelectorAll<HTMLElement>(widgetClasses);
+
+      const rects: OffsetBox[] = [];
+
+      elements.forEach((el) => {
+        rects.push({
+          top: el.offsetTop,
+          left: el.offsetLeft,
+          width: el.offsetWidth,
+          height: el.offsetHeight,
+        });
+      });
+
+      return {
+        top: minBy(rects, (rect) => rect.top),
+        left: minBy(rects, (rect) => rect.left),
+        height: maxBy(rects, (rect) => rect.top + rect.height),
+        width: maxBy(rects, (rect) => rect.left + rect.width),
+      };
+    }
+
+    return {};
+  }, [selectedWidgets]);
+
+  /**
+   * copies the selected widgets
+   *
+   * @param e
+   */
+  const onCopySelectedWidgets = (
+    e: React.MouseEvent<HTMLButtonElement, MouseEvent>,
+  ) => {
+    e.preventDefault();
+    e.stopPropagation();
+    dispatch(copyWidget(true));
+
+    return false;
+  };
+
+  /**
+   * cut the selected widgets
+   *
+   * @param e
+   */
+  const onCutSelectedWidgets = (
+    e: React.MouseEvent<HTMLButtonElement, MouseEvent>,
+  ) => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    dispatch(cutWidget());
+  };
+
+  /**
+   * cut the selected widgets
+   *
+   * @param e
+   */
+  const onDeleteSelectedWidgets = (
+    e: React.MouseEvent<HTMLButtonElement, MouseEvent>,
+  ) => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    dispatch(deleteSelectedWidget(true));
+  };
+
+  if (!shouldRender) return false;
+
+  return (
+    <StyledSelectionBox
+      className="t--multi-selection-box"
+      key={`selection-box-${props.widgetId}`}
+      onMouseMove={() => focusWidget()}
+      onMouseOver={() => focusWidget()}
+      style={{
+        left: left?.left,
+        top: top?.top,
+        height:
+          get(height, "top", 0) + get(height, "height", 0) - get(top, "top", 0),
+        width:
+          get(width, "left", 0) + get(width, "width", 0) - get(left, "left", 0),
+      }}
+    >
+      <StyledSelectBoxHandleTop />
+      <StyledSelectBoxHandleLeft />
+      <StyledSelectBoxHandleRight />
+      <StyledSelectBoxHandleBottom />
+      <StyledActionsContainer>
+        <StyledActions>
+          {/* copy widgets */}
+          <Tooltip
+            boundary="viewport"
+            content={copyHelpText}
+            maxWidth="400px"
+            modifiers={PopoverModifiers}
+            position={Position.RIGHT}
+          >
+            <StyledAction
+              onClick={stopEventPropagation}
+              onClickCapture={onCopySelectedWidgets}
+            >
+              <CopyIcon color="black" height={16} width={16} />
+            </StyledAction>
+          </Tooltip>
+          {/* cut widgets */}
+          <Tooltip
+            boundary="viewport"
+            content={cutHelpText}
+            maxWidth="400px"
+            modifiers={PopoverModifiers}
+            position={Position.RIGHT}
+          >
+            <StyledAction
+              onClick={stopEventPropagation}
+              onClickCapture={onCutSelectedWidgets}
+            >
+              <CutIcon color="black" height={16} width={16} />
+            </StyledAction>
+          </Tooltip>
+          {/* delete widgets */}
+          <Tooltip
+            boundary="viewport"
+            content={deleteHelpText}
+            maxWidth="400px"
+            modifiers={PopoverModifiers}
+            position={Position.RIGHT}
+          >
+            <StyledAction
+              onClick={stopEventPropagation}
+              onClickCapture={onDeleteSelectedWidgets}
+            >
+              <DeleteIcon color="black" height={16} width={16} />
+            </StyledAction>
+          </Tooltip>
+        </StyledActions>
+      </StyledActionsContainer>
+    </StyledSelectionBox>
+  );
+}
+
+export default WidgetsMultiSelectBox;
diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx
index c8c540d6d6..bf2d8cd1fb 100644
--- a/app/client/src/pages/Editor/index.tsx
+++ b/app/client/src/pages/Editor/index.tsx
@@ -31,12 +31,15 @@ import { Theme } from "constants/DefaultTheme";
 import GlobalHotKeys from "./GlobalHotKeys";
 import { handlePathUpdated } from "actions/recentEntityActions";
 import AppComments from "comments/AppComments/AppComments";
+import AddCommentTourComponent from "comments/tour/AddCommentTourComponent";
+import CommentShowCaseCarousel from "comments/CommentsShowcaseCarousel";
 
 import history from "utils/history";
 
 type EditorProps = {
   currentApplicationId?: string;
   currentPageId?: string;
+  currentApplicationName?: string;
   initEditor: (applicationId: string, pageId: string) => void;
   isPublishing: boolean;
   isEditorLoading: boolean;
@@ -74,6 +77,7 @@ class Editor extends Component<Props> {
 
   shouldComponentUpdate(nextProps: Props, nextState: { registered: boolean }) {
     return (
+      nextProps.currentApplicationName !== this.props.currentApplicationName ||
       nextProps.currentPageId !== this.props.currentPageId ||
       nextProps.currentApplicationId !== this.props.currentApplicationId ||
       nextProps.isEditorInitialized !== this.props.isEditorInitialized ||
@@ -120,11 +124,15 @@ class Editor extends Component<Props> {
           <div>
             <Helmet>
               <meta charSet="utf-8" />
-              <title>Editor | Appsmith</title>
+              <title>
+                {`${this.props.currentApplicationName} |`} Editor | Appsmith
+              </title>
             </Helmet>
             <GlobalHotKeys>
               <MainContainer />
               <AppComments />
+              <AddCommentTourComponent />
+              <CommentShowCaseCarousel />
             </GlobalHotKeys>
           </div>
           <ConfirmRunModal />
@@ -145,6 +153,7 @@ const mapStateToProps = (state: AppState) => ({
   selectedWidget: getSelectedWidget(state),
   creatingOnboardingDatabase: state.ui.onBoarding.showOnboardingLoader,
   lightTheme: getThemeDetails(state, ThemeMode.LIGHT),
+  currentApplicationName: state.ui.applications.currentApplication?.name,
 });
 
 const mapDispatchToProps = (dispatch: any) => {
diff --git a/app/client/src/pages/Editor/routes.tsx b/app/client/src/pages/Editor/routes.tsx
index 83210415aa..0c12ce4f5c 100644
--- a/app/client/src/pages/Editor/routes.tsx
+++ b/app/client/src/pages/Editor/routes.tsx
@@ -7,6 +7,7 @@ import {
   matchPath,
 } from "react-router-dom";
 import ApiEditor from "./APIEditor";
+import IntegrationEditor from "./IntegrationEditor";
 import QueryEditor from "./QueryEditor";
 import DataSourceEditor from "./DataSourceEditor";
 
@@ -14,23 +15,17 @@ import CurlImportForm from "./APIEditor/CurlImportForm";
 import ProviderTemplates from "./APIEditor/ProviderTemplates";
 import {
   API_EDITOR_ID_URL,
-  API_EDITOR_URL,
-  QUERIES_EDITOR_URL,
   QUERIES_EDITOR_ID_URL,
-  DATA_SOURCES_EDITOR_URL,
   DATA_SOURCES_EDITOR_ID_URL,
   BUILDER_PAGE_URL,
   BuilderRouteParams,
   APIEditorRouteParams,
   getCurlImportPageURL,
-  API_EDITOR_URL_WITH_SELECTED_PAGE_ID,
+  INTEGRATION_EDITOR_URL,
   getProviderTemplatesURL,
 } from "constants/routes";
 import styled from "styled-components";
-import {
-  useShowPropertyPane,
-  useWidgetSelection,
-} from "utils/hooks/dragResizeHooks";
+import { useShowPropertyPane } from "utils/hooks/dragResizeHooks";
 import { closeAllModals } from "actions/widgetActions";
 import { useDispatch } from "react-redux";
 import PerformanceTracker, {
@@ -41,6 +36,7 @@ import * as Sentry from "@sentry/react";
 const SentryRoute = Sentry.withSentryRouting(Route);
 
 import { SaaSEditorRoutes } from "./SaaSEditor/routes";
+import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
 
 const Wrapper = styled.div<{ isVisible: boolean }>`
   position: absolute;
@@ -58,8 +54,7 @@ const DrawerWrapper = styled.div<{
   isActionPath: any;
 }>`
   background-color: white;
-  width: ${(props) =>
-    !props.isVisible ? "0px" : props.isActionPath ? "100%" : "75%"};
+  width: ${(props) => (!props.isVisible ? "0" : "100%")};
   height: 100%;
 `;
 
@@ -98,10 +93,8 @@ class EditorsRouter extends React.Component<
   isMatchPath = () => {
     return matchPath(this.props.location.pathname, {
       path: [
-        API_EDITOR_URL(),
+        INTEGRATION_EDITOR_URL(),
         API_EDITOR_ID_URL(),
-        API_EDITOR_URL_WITH_SELECTED_PAGE_ID(),
-        QUERIES_EDITOR_URL(),
         QUERIES_EDITOR_ID_URL(),
       ],
       exact: true,
@@ -135,22 +128,16 @@ class EditorsRouter extends React.Component<
           onClick={this.preventClose}
         >
           <Switch>
-            <SentryRoute component={ApiEditor} exact path={API_EDITOR_URL()} />
+            <SentryRoute
+              component={IntegrationEditor}
+              exact
+              path={INTEGRATION_EDITOR_URL()}
+            />
             <SentryRoute
               component={ApiEditor}
               exact
               path={API_EDITOR_ID_URL()}
             />
-            <SentryRoute
-              component={ApiEditor}
-              exact
-              path={API_EDITOR_URL_WITH_SELECTED_PAGE_ID()}
-            />
-            <SentryRoute
-              component={QueryEditor}
-              exact
-              path={QUERIES_EDITOR_URL()}
-            />
             <SentryRoute
               component={QueryEditor}
               exact
@@ -165,11 +152,6 @@ class EditorsRouter extends React.Component<
             {SaaSEditorRoutes.map((props) => (
               <SentryRoute exact key={props.path} {...props} />
             ))}
-            <SentryRoute
-              component={DataSourceEditor}
-              exact
-              path={DATA_SOURCES_EDITOR_URL()}
-            />
             <SentryRoute
               component={DataSourceEditor}
               exact
@@ -194,7 +176,7 @@ type PaneDrawerProps = {
 };
 function PaneDrawer(props: PaneDrawerProps) {
   const showPropertyPane = useShowPropertyPane();
-  const { selectWidget, focusWidget } = useWidgetSelection();
+  const { focusWidget, selectWidget } = useWidgetSelection();
   const dispatch = useDispatch();
   useEffect(() => {
     // This pane drawer is only open when NOT on canvas.
diff --git a/app/client/src/pages/Editor/utils.ts b/app/client/src/pages/Editor/utils.ts
index df7a54747e..8371ff6387 100644
--- a/app/client/src/pages/Editor/utils.ts
+++ b/app/client/src/pages/Editor/utils.ts
@@ -69,7 +69,7 @@ export const draggableElement = (
   };
 
   const calculateNewPosition = () => {
-    const { height, width, top, left } = element.getBoundingClientRect();
+    const { height, left, top, width } = element.getBoundingClientRect();
     const isElementOpen = height && width;
     const {
       left: calculatedLeft,
@@ -135,8 +135,9 @@ const createDragHandler = (
   const dragElement = document.createElement("div");
   dragElement.setAttribute("id", `${id}-draghandler`);
   dragElement.style.position = "absolute";
-  dragElement.style.left = "0px";
+  dragElement.style.left = "135px";
   dragElement.style.top = "0px";
+  dragElement.style.zIndex = "3";
   oldDragHandler
     ? el.replaceChild(dragElement, oldDragHandler)
     : el.appendChild(dragElement);
diff --git a/app/client/src/pages/UserAuth/ForgotPassword.tsx b/app/client/src/pages/UserAuth/ForgotPassword.tsx
index 8907e670da..6f82544d63 100644
--- a/app/client/src/pages/UserAuth/ForgotPassword.tsx
+++ b/app/client/src/pages/UserAuth/ForgotPassword.tsx
@@ -59,9 +59,9 @@ export const ForgotPassword = withTheme(
     const {
       error,
       handleSubmit,
-      submitting,
       submitFailed,
       submitSucceeded,
+      submitting,
     } = props;
 
     return (
diff --git a/app/client/src/pages/UserAuth/Login.tsx b/app/client/src/pages/UserAuth/Login.tsx
index d9c8bd15cc..600142955a 100644
--- a/app/client/src/pages/UserAuth/Login.tsx
+++ b/app/client/src/pages/UserAuth/Login.tsx
@@ -85,7 +85,7 @@ if (enableGoogleOAuth) SocialLoginList.push(SocialLoginTypes.GOOGLE);
 if (enableGithubOAuth) SocialLoginList.push(SocialLoginTypes.GITHUB);
 
 export function Login(props: LoginFormProps) {
-  const { error, valid, emailValue: email } = props;
+  const { emailValue: email, error, valid } = props;
   const isFormValid = valid && email && !isEmptyString(email);
   const location = useLocation();
 
@@ -97,9 +97,11 @@ export function Login(props: LoginFormProps) {
 
   let loginURL = "/api/v1/" + LOGIN_SUBMIT_PATH;
   let signupURL = SIGN_UP_URL;
-  if (queryParams.has("redirectUrl")) {
-    loginURL += `?redirectUrl=${queryParams.get("redirectUrl")}`;
-    signupURL += `?redirectUrl=${queryParams.get("redirectUrl")}`;
+  const redirectUrl = queryParams.get("redirectUrl");
+  if (redirectUrl != null) {
+    const encodedRedirectUrl = encodeURIComponent(redirectUrl);
+    loginURL += `?redirectUrl=${encodedRedirectUrl}`;
+    signupURL += `?redirectUrl=${encodedRedirectUrl}`;
   }
 
   let forgotPasswordURL = `${FORGOT_PASSWORD_URL}`;
diff --git a/app/client/src/pages/UserAuth/ResetPassword.tsx b/app/client/src/pages/UserAuth/ResetPassword.tsx
index 38cf460624..0260d10055 100644
--- a/app/client/src/pages/UserAuth/ResetPassword.tsx
+++ b/app/client/src/pages/UserAuth/ResetPassword.tsx
@@ -72,12 +72,12 @@ export function ResetPassword(props: ResetPasswordProps) {
   const {
     error,
     handleSubmit,
-    pristine,
-    submitting,
-    submitSucceeded,
-    submitFailed,
     initialValues,
     isTokenValid,
+    pristine,
+    submitFailed,
+    submitSucceeded,
+    submitting,
     validatingToken,
     verifyToken,
   } = props;
diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx
index bf6e042ea7..74c74ebcbc 100644
--- a/app/client/src/pages/UserAuth/SignUp.tsx
+++ b/app/client/src/pages/UserAuth/SignUp.tsx
@@ -35,7 +35,6 @@ import { isEmail, isStrongPassword, isEmptyString } from "utils/formhelpers";
 import { SignupFormValues } from "./helpers";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 
-import { getAppsmithConfigs } from "configs";
 import { SIGNUP_SUBMIT_PATH } from "constants/ApiConstants";
 import { connect } from "react-redux";
 import { AppState } from "reducers";
@@ -45,6 +44,8 @@ import PerformanceTracker, {
 import { useIntiateOnboarding } from "components/editorComponents/Onboarding/utils";
 
 import { SIGNUP_FORM_EMAIL_FIELD_NAME } from "constants/forms";
+import { getAppsmithConfigs } from "configs";
+import { useScript, ScriptStatus, AddScriptTo } from "utils/hooks/useScript";
 
 const { enableGithubOAuth, enableGoogleOAuth } = getAppsmithConfigs();
 const SocialLoginList: string[] = [];
@@ -54,6 +55,13 @@ if (enableGithubOAuth) SocialLoginList.push(SocialLoginTypes.GITHUB);
 import { withTheme } from "styled-components";
 import { Theme } from "constants/DefaultTheme";
 
+declare global {
+  interface Window {
+    grecaptcha: any;
+  }
+}
+const { googleRecaptchaSiteKey } = getAppsmithConfigs();
+
 const validate = (values: SignupFormValues) => {
   const errors: SignupFormValues = {};
   if (!values.password || isEmptyString(values.password)) {
@@ -76,12 +84,17 @@ type SignUpFormProps = InjectedFormProps<
   RouteComponentProps<{ email: string }> & { theme: Theme; emailValue: string };
 
 export function SignUp(props: SignUpFormProps) {
-  const { error, submitting, pristine, valid, emailValue: email } = props;
+  const { emailValue: email, error, pristine, submitting, valid } = props;
   const isFormValid = valid && email && !isEmptyString(email);
 
   const location = useLocation();
   const initiateOnboarding = useIntiateOnboarding();
 
+  const recaptchaStatus = useScript(
+    `https://www.google.com/recaptcha/api.js?render=${googleRecaptchaSiteKey.apiKey}`,
+    AddScriptTo.HEAD,
+  );
+
   let showError = false;
   let errorMessage = "";
   const queryParams = new URLSearchParams(location.search);
@@ -93,8 +106,11 @@ export function SignUp(props: SignUpFormProps) {
   let signupURL = "/api/v1/" + SIGNUP_SUBMIT_PATH;
   if (queryParams.has("appId")) {
     signupURL += `?appId=${queryParams.get("appId")}`;
-  } else if (queryParams.has("redirectUrl")) {
-    signupURL += `?redirectUrl=${queryParams.get("redirectUrl")}`;
+  } else {
+    const redirectUrl = queryParams.get("redirectUrl");
+    if (redirectUrl != null) {
+      signupURL += `?redirectUrl=${encodeURIComponent(redirectUrl)}`;
+    }
   }
 
   return (
@@ -115,7 +131,37 @@ export function SignUp(props: SignUpFormProps) {
       {SocialLoginList.length > 0 && (
         <ThirdPartyAuth logins={SocialLoginList} type={"SIGNUP"} />
       )}
-      <SpacedSubmitForm action={signupURL} method="POST">
+      <SpacedSubmitForm
+        action={signupURL}
+        id="signup-form"
+        method="POST"
+        onSubmit={(e) => {
+          e.preventDefault();
+          const formElement: HTMLFormElement = document.getElementById(
+            "signup-form",
+          ) as HTMLFormElement;
+          if (
+            googleRecaptchaSiteKey.enabled &&
+            recaptchaStatus === ScriptStatus.READY
+          ) {
+            window.grecaptcha
+              .execute(googleRecaptchaSiteKey.apiKey, {
+                action: "submit",
+              })
+              .then(function(token: any) {
+                formElement &&
+                  formElement.setAttribute(
+                    "action",
+                    `${signupURL}?recaptchaToken=${token}`,
+                  );
+                formElement && formElement.submit();
+              });
+          } else {
+            formElement && formElement.submit();
+          }
+          return false;
+        }}
+      >
         <FormGroup
           intent={error ? "danger" : "none"}
           label={createMessage(SIGNUP_PAGE_EMAIL_INPUT_LABEL)}
diff --git a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
index 8c6d2af3a5..44dbf87e7f 100644
--- a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
+++ b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
@@ -68,8 +68,9 @@ function SocialLoginButton(props: {
   const initiateOnboarding = useIntiateOnboarding();
   const queryParams = new URLSearchParams(location.search);
   let url = props.url;
-  if (queryParams.has("redirectUrl")) {
-    url += `?redirectUrl=${queryParams.get("redirectUrl")}`;
+  const redirectUrl = queryParams.get("redirectUrl");
+  if (redirectUrl != null) {
+    url += `?redirectUrl=${encodeURIComponent(redirectUrl)}`;
   }
   return (
     <StyledSocialLoginButton
diff --git a/app/client/src/pages/UserAuth/helpers.ts b/app/client/src/pages/UserAuth/helpers.ts
index 2d5ba3626e..4bd9956080 100644
--- a/app/client/src/pages/UserAuth/helpers.ts
+++ b/app/client/src/pages/UserAuth/helpers.ts
@@ -49,7 +49,7 @@ export const resetPasswordSubmitHandler = (
   values: ResetPasswordFormValues,
   dispatch: any,
 ): Promise<any> => {
-  const { token, email, password } = values;
+  const { email, password, token } = values;
   return new Promise((resolve, reject) => {
     dispatch({
       type: ReduxActionTypes.RESET_USER_PASSWORD_INIT,
@@ -70,7 +70,7 @@ export const createPasswordSubmitHandler = (
   values: CreatePasswordFormValues,
   dispatch: any,
 ): Promise<any> => {
-  const { token, email, password } = values;
+  const { email, password, token } = values;
   return new Promise((resolve, reject) => {
     dispatch({
       type: ReduxActionTypes.INVITED_USER_SIGNUP_INIT,
diff --git a/app/client/src/pages/UserProfile/General.tsx b/app/client/src/pages/UserProfile/General.tsx
index d0c85bd90d..ca3bff2d0d 100644
--- a/app/client/src/pages/UserProfile/General.tsx
+++ b/app/client/src/pages/UserProfile/General.tsx
@@ -12,6 +12,7 @@ import { Variant } from "components/ads/common";
 import { FORGOT_PASSWORD_SUCCESS_TEXT } from "constants/messages";
 import { logoutUser, updateUserDetails } from "actions/userActions";
 import { AppState } from "reducers";
+import UserProfileImagePicker from "components/ads/UserProfileImagePicker";
 
 const Wrapper = styled.div`
   & > div {
@@ -23,12 +24,6 @@ const FieldWrapper = styled.div`
   display: flex;
 `;
 
-const InputWrapper = styled.div`
-  width: 520px;
-  display: flex;
-  align-items: center;
-`;
-
 const LabelWrapper = styled.div`
   width: 200px;
   display: flex;
@@ -90,21 +85,30 @@ function General() {
 
   return (
     <Wrapper>
-      <InputWrapper>
+      <FieldWrapper>
+        <LabelWrapper>
+          <Text type={TextType.H4}>Display Picture</Text>
+        </LabelWrapper>
+        <UserProfileImagePicker />
+      </FieldWrapper>
+      <FieldWrapper>
         <LabelWrapper>
           <Text type={TextType.H4}>Display name</Text>
         </LabelWrapper>
         {isFetchingUser && <Loader className={Classes.SKELETON} />}
         {!isFetchingUser && (
-          <TextInput
-            cypressSelector="t--display-name"
-            defaultValue={user?.name}
-            onChange={onNameChange}
-            placeholder="Display name"
-            validator={notEmptyValidator}
-          />
+          <div style={{ flex: 1 }}>
+            <TextInput
+              cypressSelector="t--display-name"
+              defaultValue={user?.name}
+              fill={false}
+              onChange={onNameChange}
+              placeholder="Display name"
+              validator={notEmptyValidator}
+            />
+          </div>
         )}
-      </InputWrapper>
+      </FieldWrapper>
       <FieldWrapper>
         <LabelWrapper>
           <Text type={TextType.H4}>Email</Text>
@@ -118,18 +122,7 @@ function General() {
           </ForgotPassword>
         </div>
       </FieldWrapper>
-      {/* Commenting for now until the image related apis are ready */}
-      {/* <FieldWrapper>
-        <LabelWrapper>
-          <Text type={TextType.H4}>Display Picture</Text>
-        </LabelWrapper>
-        <FilePicker
-          url={""}
-          onFileRemoved={DeleteLogo}
-          logoUploadError={logoUploadError.message}
-        />
-      </FieldWrapper>
-      <InputWrapper>
+      {/* <InputWrapper>
         <LabelWrapper>
           <Text type={TextType.H4}>Website</Text>
         </LabelWrapper>
diff --git a/app/client/src/pages/common/ArtBoard.tsx b/app/client/src/pages/common/ArtBoard.tsx
index 19b9b19dde..351056630a 100644
--- a/app/client/src/pages/common/ArtBoard.tsx
+++ b/app/client/src/pages/common/ArtBoard.tsx
@@ -6,5 +6,5 @@ export default styled.div<{ width: number }>`
   background: ${(props) => {
     return props.theme.colors.artboard;
   }};
-  padding: ${(props) => props.theme.canvasPadding};
+  padding: 0 0 ${(props) => props.theme.canvasBottomPadding}px 0px;
 `;
diff --git a/app/client/src/pages/common/CanvasSelectionArena.test.tsx b/app/client/src/pages/common/CanvasSelectionArena.test.tsx
new file mode 100644
index 0000000000..d6e43b6412
--- /dev/null
+++ b/app/client/src/pages/common/CanvasSelectionArena.test.tsx
@@ -0,0 +1,129 @@
+import { fireEvent, render } from "test/testUtils";
+import Canvas from "pages/Editor/Canvas";
+import React from "react";
+import {
+  buildChildren,
+  widgetCanvasFactory,
+} from "test/factories/WidgetFactoryUtils";
+import { MockPageDSL, syntheticTestMouseEvent } from "test/testCommon";
+import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
+
+describe("Canvas selection test cases", () => {
+  it("Should select using canvas draw", () => {
+    const children: any = buildChildren([
+      {
+        type: "TABS_WIDGET",
+        topRow: 5,
+        bottomRow: 30,
+        leftColumn: 5,
+        rightColumn: 30,
+      },
+      {
+        type: "SWITCH_WIDGET",
+        topRow: 5,
+        bottomRow: 10,
+        leftColumn: 40,
+        rightColumn: 48,
+      },
+    ]);
+    const dsl: any = widgetCanvasFactory.build({
+      children,
+    });
+    const component = render(
+      <MockPageDSL dsl={dsl}>
+        <Canvas dsl={dsl} />
+      </MockPageDSL>,
+    );
+    let selectionCanvas: any = component.queryByTestId(
+      `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+    );
+    expect(selectionCanvas.style.zIndex).toBe("");
+    fireEvent.mouseDown(selectionCanvas);
+
+    selectionCanvas = component.queryByTestId(
+      `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+    );
+
+    expect(selectionCanvas.style.zIndex).toBe("2");
+    fireEvent.mouseUp(selectionCanvas);
+    selectionCanvas = component.queryByTestId(
+      `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+    );
+
+    expect(selectionCanvas.style.zIndex).toBe("");
+  });
+
+  it("Should select all elements using canvas from top to bottom", () => {
+    const children: any = buildChildren([
+      {
+        type: "TABS_WIDGET",
+        topRow: 1,
+        bottomRow: 3,
+        leftColumn: 1,
+        rightColumn: 3,
+      },
+      {
+        type: "SWITCH_WIDGET",
+        topRow: 1,
+        bottomRow: 2,
+        leftColumn: 5,
+        rightColumn: 13,
+      },
+    ]);
+    const dsl: any = widgetCanvasFactory.build({
+      children,
+    });
+    const component = render(
+      <MockPageDSL dsl={dsl}>
+        <Canvas dsl={dsl} />
+      </MockPageDSL>,
+    );
+    const selectionCanvas: any = component.queryByTestId(
+      `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+    );
+    fireEvent(
+      selectionCanvas,
+      syntheticTestMouseEvent(
+        new MouseEvent("mousedown", {
+          bubbles: true,
+          cancelable: true,
+        }),
+        {
+          offsetX: 10,
+          offsetY: 10,
+        },
+      ),
+    );
+    fireEvent(
+      selectionCanvas,
+      syntheticTestMouseEvent(
+        new MouseEvent("mousemove", {
+          bubbles: true,
+          cancelable: true,
+        }),
+        {
+          offsetX: dsl.rightColumn * 4,
+          offsetY: dsl.bottomRow * 4,
+        },
+      ),
+    );
+
+    fireEvent(
+      selectionCanvas,
+      syntheticTestMouseEvent(
+        new MouseEvent("mouseup", {
+          bubbles: true,
+          cancelable: true,
+        }),
+        {
+          offsetX: dsl.rightColumn * 4,
+          offsetY: dsl.bottomRow * 4,
+        },
+      ),
+    );
+    const selectedWidgets = component.queryAllByTestId(
+      "t--widget-propertypane-toggle",
+    );
+    expect(selectedWidgets.length).toBe(2);
+  });
+});
diff --git a/app/client/src/pages/common/CanvasSelectionArena.tsx b/app/client/src/pages/common/CanvasSelectionArena.tsx
new file mode 100644
index 0000000000..cc79994f75
--- /dev/null
+++ b/app/client/src/pages/common/CanvasSelectionArena.tsx
@@ -0,0 +1,252 @@
+import {
+  selectAllWidgetsInAreaAction,
+  setCanvasSelectionStateAction,
+} from "actions/canvasSelectionActions";
+import { theme } from "constants/DefaultTheme";
+import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
+import { throttle } from "lodash";
+import React, { memo, useEffect, useCallback } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { AppState } from "reducers";
+import { APP_MODE } from "reducers/entityReducers/appReducer";
+import { getWidget } from "sagas/selectors";
+import { getAppMode } from "selectors/applicationSelectors";
+import {
+  getCurrentApplicationLayout,
+  getCurrentPageId,
+} from "selectors/editorSelectors";
+import styled from "styled-components";
+
+const StyledSelectionCanvas = styled.canvas`
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  height: calc(100% + ${(props) => props.theme.canvasBottomPadding}px);
+  width: 100%;
+  overflow-y: auto;
+`;
+
+export interface SelectedArenaDimensions {
+  top: number;
+  left: number;
+  width: number;
+  height: number;
+}
+
+export const CanvasSelectionArena = memo(
+  ({ widgetId }: { widgetId: string }) => {
+    const dispatch = useDispatch();
+    const appMode = useSelector(getAppMode);
+
+    const mainContainer = useSelector((state: AppState) =>
+      getWidget(state, MAIN_CONTAINER_WIDGET_ID),
+    );
+    const currentPageId = useSelector(getCurrentPageId);
+    const appLayout = useSelector(getCurrentApplicationLayout);
+    const throttledWidgetSelection = useCallback(
+      throttle(
+        (
+          selectionDimensions: SelectedArenaDimensions,
+          snapToNextColumn: boolean,
+          snapToNextRow: boolean,
+          isMultiSelect: boolean,
+        ) => {
+          dispatch(
+            selectAllWidgetsInAreaAction(
+              selectionDimensions,
+              snapToNextColumn,
+              snapToNextRow,
+              isMultiSelect,
+            ),
+          );
+        },
+        150,
+        {
+          leading: true,
+          trailing: true,
+        },
+      ),
+      [widgetId],
+    );
+    useEffect(() => {
+      if (appMode === APP_MODE.EDIT) {
+        const selectionCanvas: any = document.getElementById(
+          `canvas-${widgetId}`,
+        );
+        const canvasCtx = selectionCanvas.getContext("2d");
+        const initRectangle = (): SelectedArenaDimensions => ({
+          top: 0,
+          left: 0,
+          width: 0,
+          height: 0,
+        });
+        let selectionRectangle: SelectedArenaDimensions = initRectangle();
+        let isMultiSelect = false;
+        let isDragging = false;
+
+        const init = () => {
+          const { height, width } = selectionCanvas.getBoundingClientRect();
+          if (height && width) {
+            selectionCanvas.width = mainContainer.rightColumn;
+            selectionCanvas.height =
+              mainContainer.bottomRow + theme.canvasBottomPadding;
+          }
+          selectionCanvas.addEventListener("click", onClick, false);
+          selectionCanvas.addEventListener("mousedown", onMouseDown, false);
+          selectionCanvas.addEventListener("mouseup", onMouseUp, false);
+          selectionCanvas.addEventListener("mousemove", onMouseMove, false);
+          selectionCanvas.addEventListener("mouseleave", onMouseLeave, false);
+          selectionCanvas.addEventListener("mouseenter", onMouseEnter, false);
+        };
+
+        const getSelectionDimensions = () => {
+          return {
+            top:
+              selectionRectangle.height < 0
+                ? selectionRectangle.top - Math.abs(selectionRectangle.height)
+                : selectionRectangle.top,
+            left:
+              selectionRectangle.width < 0
+                ? selectionRectangle.left - Math.abs(selectionRectangle.width)
+                : selectionRectangle.left,
+            width: Math.abs(selectionRectangle.width),
+            height: Math.abs(selectionRectangle.height),
+          };
+        };
+
+        const selectWidgetsInit = (
+          selectionDimensions: SelectedArenaDimensions,
+          isMultiSelect: boolean,
+        ) => {
+          if (
+            selectionDimensions.left &&
+            selectionDimensions.top &&
+            selectionDimensions.width &&
+            selectionDimensions.height
+          ) {
+            const snapToNextColumn = selectionRectangle.height < 0;
+            const snapToNextRow = selectionRectangle.width < 0;
+            throttledWidgetSelection(
+              selectionDimensions,
+              snapToNextColumn,
+              snapToNextRow,
+              isMultiSelect,
+            );
+          }
+        };
+
+        const drawRectangle = (
+          selectionDimensions: SelectedArenaDimensions,
+        ) => {
+          const strokeWidth = 1;
+          canvasCtx.setLineDash([5]);
+          canvasCtx.strokeStyle = "rgb(84, 132, 236)";
+          canvasCtx.strokeRect(
+            selectionDimensions.left - strokeWidth,
+            selectionDimensions.top - strokeWidth,
+            selectionDimensions.width + 2 * strokeWidth,
+            selectionDimensions.height + 2 * strokeWidth,
+          );
+          canvasCtx.fillStyle = "rgb(84, 132, 236, 0.06)";
+          canvasCtx.fillRect(
+            selectionDimensions.left,
+            selectionDimensions.top,
+            selectionDimensions.width,
+            selectionDimensions.height,
+          );
+        };
+
+        const onMouseLeave = () => {
+          document.body.addEventListener("mouseup", onMouseUp, false);
+          document.body.addEventListener("click", onClick, false);
+        };
+
+        const onMouseEnter = () => {
+          document.body.removeEventListener("mouseup", onMouseUp);
+          document.body.removeEventListener("click", onClick);
+        };
+
+        const onClick = (e: any) => {
+          if (
+            Math.abs(selectionRectangle.height) +
+              Math.abs(selectionRectangle.width) >
+            0
+          ) {
+            if (!isDragging) {
+              // cant set this in onMouseUp coz click seems to happen after onMouseUp.
+              selectionRectangle = initRectangle();
+            }
+            e.stopPropagation();
+          }
+        };
+
+        const onMouseDown = (e: any) => {
+          isMultiSelect = e.ctrlKey || e.metaKey || e.shiftKey;
+          selectionRectangle.left = e.offsetX - selectionCanvas.offsetLeft;
+          selectionRectangle.top = e.offsetY - selectionCanvas.offsetTop;
+          selectionRectangle.width = 0;
+          selectionRectangle.height = 0;
+          isDragging = true;
+          dispatch(setCanvasSelectionStateAction(true));
+          // bring the canvas to the top layer
+          selectionCanvas.style.zIndex = 2;
+        };
+        const onMouseUp = () => {
+          if (isDragging) {
+            isDragging = false;
+            canvasCtx.clearRect(
+              0,
+              0,
+              selectionCanvas.width,
+              selectionCanvas.height,
+            );
+            selectionCanvas.style.zIndex = null;
+            dispatch(setCanvasSelectionStateAction(false));
+          }
+        };
+        const onMouseMove = (e: any) => {
+          if (isDragging) {
+            selectionRectangle.width =
+              e.offsetX - selectionCanvas.offsetLeft - selectionRectangle.left;
+            selectionRectangle.height =
+              e.offsetY - selectionCanvas.offsetTop - selectionRectangle.top;
+            canvasCtx.clearRect(
+              0,
+              0,
+              selectionCanvas.width,
+              selectionCanvas.height,
+            );
+            const selectionDimensions = getSelectionDimensions();
+            drawRectangle(selectionDimensions);
+            selectWidgetsInit(selectionDimensions, isMultiSelect);
+          }
+        };
+        if (appMode === APP_MODE.EDIT) {
+          init();
+        }
+        return () => {
+          selectionCanvas.removeEventListener("mousedown", onMouseDown);
+          selectionCanvas.removeEventListener("mouseup", onMouseUp);
+          selectionCanvas.removeEventListener("mousemove", onMouseMove);
+          selectionCanvas.removeEventListener("mouseleave", onMouseLeave);
+          selectionCanvas.removeEventListener("mouseenter", onMouseEnter);
+          selectionCanvas.removeEventListener("click", onClick);
+        };
+      }
+    }, [
+      appLayout,
+      currentPageId,
+      mainContainer.rightColumn,
+      mainContainer.bottomRow,
+      mainContainer.minHeight,
+    ]);
+
+    return appMode === APP_MODE.EDIT ? (
+      <StyledSelectionCanvas
+        data-testid={`canvas-${widgetId}`}
+        id={`canvas-${widgetId}`}
+      />
+    ) : null;
+  },
+);
+CanvasSelectionArena.displayName = "CanvasSelectionArena";
diff --git a/app/client/src/pages/common/CustomizedDropdown/dropdownHelpers.tsx b/app/client/src/pages/common/CustomizedDropdown/dropdownHelpers.tsx
index c2d6278208..79dc43b92c 100644
--- a/app/client/src/pages/common/CustomizedDropdown/dropdownHelpers.tsx
+++ b/app/client/src/pages/common/CustomizedDropdown/dropdownHelpers.tsx
@@ -3,6 +3,7 @@ import { IconNames } from "@blueprintjs/icons";
 import { Direction, Directions } from "utils/helpers";
 import { PopoverPosition } from "@blueprintjs/core";
 import history from "utils/history";
+import log from "loglevel";
 
 export const DropdownOnSelectActions: { [id: string]: string } = {
   REDIRECT: "redirect",
@@ -26,7 +27,7 @@ export const getOnSelectAction = (
       }
       break;
     default:
-      console.log("No such action registered", type);
+      log.error("No such action registered", type);
   }
 };
 
diff --git a/app/client/src/pages/common/ErrorPageHeader.tsx b/app/client/src/pages/common/ErrorPageHeader.tsx
index 5e78e2493a..91894a23d0 100644
--- a/app/client/src/pages/common/ErrorPageHeader.tsx
+++ b/app/client/src/pages/common/ErrorPageHeader.tsx
@@ -45,12 +45,13 @@ type ErrorPageHeaderProps = {
 };
 
 export function ErrorPageHeader(props: ErrorPageHeaderProps) {
-  const { user, flushErrors, flushErrorsAndRedirect, safeCrash } = props;
+  const { flushErrors, flushErrorsAndRedirect, safeCrash, user } = props;
   const location = useLocation();
   const queryParams = new URLSearchParams(location.search);
   let loginUrl = AUTH_LOGIN_URL;
-  if (queryParams.has("redirectUrl")) {
-    loginUrl += `?redirectUrl=${queryParams.get("redirectUrl")}`;
+  const redirectUrl = queryParams.get("redirectUrl");
+  if (redirectUrl != null) {
+    loginUrl += `?redirectUrl=${encodeURIComponent(redirectUrl)}`;
   }
 
   return (
diff --git a/app/client/src/pages/common/NotFound.tsx b/app/client/src/pages/common/NotFound.tsx
index a91b32fdad..c28fc29df7 100644
--- a/app/client/src/pages/common/NotFound.tsx
+++ b/app/client/src/pages/common/NotFound.tsx
@@ -26,7 +26,7 @@ interface Props {
 }
 
 function NotFound(props: Props) {
-  const { title, subtitle, buttonText, onBackButton } = props;
+  const { buttonText, onBackButton, subtitle, title } = props;
 
   return (
     <Wrapper>
diff --git a/app/client/src/pages/common/PageHeader.tsx b/app/client/src/pages/common/PageHeader.tsx
index 92f358de2a..08ff194994 100644
--- a/app/client/src/pages/common/PageHeader.tsx
+++ b/app/client/src/pages/common/PageHeader.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { Link, useLocation } from "react-router-dom";
-import { connect } from "react-redux";
+import { connect, useSelector } from "react-redux";
 import { getCurrentUser } from "selectors/usersSelectors";
 import styled from "styled-components";
 import StyledHeader from "components/designSystems/appsmith/StyledHeader";
@@ -12,6 +12,9 @@ import Button from "components/editorComponents/Button";
 import history from "utils/history";
 import { Colors } from "constants/Colors";
 import ProfileDropdown from "./ProfileDropdown";
+import Bell from "notifications/Bell";
+
+import { areCommentsEnabledForUserAndApp as areCommentsEnabledForUserAndAppSelector } from "selectors/commentsSelectors";
 
 const StyledPageHeader = styled(StyledHeader)`
   background: ${Colors.BALTIC_SEA};
@@ -50,6 +53,10 @@ export function PageHeader(props: PageHeaderProps) {
     =${queryParams.get("redirectUrl")}`;
   }
 
+  const areCommentsEnabledForUserAndApp = useSelector(
+    areCommentsEnabledForUserAndAppSelector,
+  );
+
   return (
     <StyledPageHeader>
       <HeaderSection>
@@ -58,19 +65,22 @@ export function PageHeader(props: PageHeaderProps) {
         </Link>
       </HeaderSection>
       {user && (
-        <StyledDropDownContainer>
-          {user.username === ANONYMOUS_USERNAME ? (
-            <Button
-              filled
-              intent={"primary"}
-              onClick={() => history.push(loginUrl)}
-              size="small"
-              text="Sign In"
-            />
-          ) : (
-            <ProfileDropdown name={user.name} userName={user.username} />
-          )}
-        </StyledDropDownContainer>
+        <>
+          {areCommentsEnabledForUserAndApp && <Bell />}
+          <StyledDropDownContainer>
+            {user.username === ANONYMOUS_USERNAME ? (
+              <Button
+                filled
+                intent={"primary"}
+                onClick={() => history.push(loginUrl)}
+                size="small"
+                text="Sign In"
+              />
+            ) : (
+              <ProfileDropdown name={user.name} userName={user.username} />
+            )}
+          </StyledDropDownContainer>
+        </>
       )}
     </StyledPageHeader>
   );
diff --git a/app/client/src/pages/common/ProfileDropdown.tsx b/app/client/src/pages/common/ProfileDropdown.tsx
index ccc18a6e9b..a9d4c34d29 100644
--- a/app/client/src/pages/common/ProfileDropdown.tsx
+++ b/app/client/src/pages/common/ProfileDropdown.tsx
@@ -15,6 +15,7 @@ import { ReduxActionTypes } from "constants/ReduxActionConstants";
 import ProfileImage from "./ProfileImage";
 import { PopperModifiers } from "@blueprintjs/core";
 import { PROFILE } from "constants/routes";
+import UserApi from "api/UserApi";
 
 type TagProps = CommonComponentProps & {
   onClick?: (text: string) => void;
@@ -76,7 +77,12 @@ const UserNameWrapper = styled.div`
 `;
 
 export default function ProfileDropdown(props: TagProps) {
-  const Profile = <ProfileImage userName={props.userName} />;
+  const Profile = (
+    <ProfileImage
+      source={`/api/${UserApi.photoURL}`}
+      userName={props.name || props.userName}
+    />
+  );
 
   return (
     <>
diff --git a/app/client/src/pages/common/ProfileImage.tsx b/app/client/src/pages/common/ProfileImage.tsx
index d5aac20f02..a1a730e2af 100644
--- a/app/client/src/pages/common/ProfileImage.tsx
+++ b/app/client/src/pages/common/ProfileImage.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from "react";
+import React, { useContext, useState } from "react";
 import { getInitialsAndColorCode } from "utils/AppsmithUtils";
 import Text, { TextType } from "components/ads/Text";
 import styled, { ThemeContext } from "styled-components";
@@ -15,6 +15,13 @@ export const Profile = styled.div<{ backgroundColor?: string; side?: number }>`
   && span {
     color: ${(props) => props.theme.colors.text.highlight};
   }
+
+  img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    border-radius: 50%;
+  }
 `;
 
 export default function ProfileImage(props: {
@@ -22,6 +29,7 @@ export default function ProfileImage(props: {
   className?: string;
   commonName?: string;
   side?: number;
+  source?: string;
 }) {
   const theme = useContext(ThemeContext);
 
@@ -30,15 +38,30 @@ export default function ProfileImage(props: {
     theme.colors.appCardColors,
   );
 
+  const [hasErrorLoadingImage, setHasErrorLoadingImage] = useState(false);
+
+  const shouldRenderImage = props.source && !hasErrorLoadingImage;
+  const backgroundColor = shouldRenderImage
+    ? "transparent"
+    : initialsAndColorCode[1];
+
   return (
     <Profile
-      backgroundColor={initialsAndColorCode[1]}
+      backgroundColor={backgroundColor}
       className={props.className}
       side={props.side} // side since it's a square
     >
-      <Text highlight type={TextType.H6}>
-        {props.commonName || initialsAndColorCode[0]}
-      </Text>
+      {!shouldRenderImage ? (
+        <Text highlight type={TextType.H6}>
+          {props.commonName || initialsAndColorCode[0]}
+        </Text>
+      ) : (
+        <img
+          onError={() => setHasErrorLoadingImage(true)}
+          onLoad={() => setHasErrorLoadingImage(false)}
+          src={props.source}
+        />
+      )}
     </Profile>
   );
 }
diff --git a/app/client/src/pages/common/SubHeader.tsx b/app/client/src/pages/common/SubHeader.tsx
index cc05418d20..01af3e4e6d 100644
--- a/app/client/src/pages/common/SubHeader.tsx
+++ b/app/client/src/pages/common/SubHeader.tsx
@@ -7,6 +7,7 @@ import SearchInput, { SearchVariant } from "components/ads/SearchInput";
 import Button, { Size } from "components/ads/Button";
 import { useSelector } from "react-redux";
 import { getIsFetchingApplications } from "selectors/applicationSelectors";
+import { Indices } from "constants/Layers";
 
 const SubHeaderWrapper = styled.div`
   width: 100%;
@@ -17,7 +18,7 @@ const SubHeaderWrapper = styled.div`
   background: ${(props) => props.theme.colors.homepageBackground};
   top: ${(props) => props.theme.homePage.header}px;
   left: 369px;
-  z-index: 10;
+  z-index: ${Indices.Layer3};
 `;
 const SearchContainer = styled.div`
   flex-grow: 1;
diff --git a/app/client/src/pages/organization/AppInviteUsersForm.tsx b/app/client/src/pages/organization/AppInviteUsersForm.tsx
index 71a84ed865..d04e033933 100644
--- a/app/client/src/pages/organization/AppInviteUsersForm.tsx
+++ b/app/client/src/pages/organization/AppInviteUsersForm.tsx
@@ -34,14 +34,14 @@ const ShareToggle = styled.div`
 
 function AppInviteUsersForm(props: any) {
   const {
-    isFetchingApplication,
-    isChangingViewAccess,
-    currentApplicationDetails,
-    changeAppViewAccess,
     applicationId,
-    fetchCurrentOrg,
+    changeAppViewAccess,
+    currentApplicationDetails,
     currentUser,
     defaultPageId,
+    fetchCurrentOrg,
+    isChangingViewAccess,
+    isFetchingApplication,
   } = props;
 
   const currentOrg = useSelector(getCurrentAppOrg);
diff --git a/app/client/src/pages/organization/CreateOrganizationForm.tsx b/app/client/src/pages/organization/CreateOrganizationForm.tsx
index 644f24c774..bd44cd533b 100644
--- a/app/client/src/pages/organization/CreateOrganizationForm.tsx
+++ b/app/client/src/pages/organization/CreateOrganizationForm.tsx
@@ -23,10 +23,10 @@ export function CreateApplicationForm(
   const {
     error,
     handleSubmit,
-    pristine,
-    submitting,
     invalid,
     onCancel,
+    pristine,
+    submitting,
   } = props;
   const submitHandler = useCallback(
     async (data, dispatch) => {
diff --git a/app/client/src/pages/organization/DeleteConfirmationModal.tsx b/app/client/src/pages/organization/DeleteConfirmationModal.tsx
new file mode 100644
index 0000000000..a8f3176b9b
--- /dev/null
+++ b/app/client/src/pages/organization/DeleteConfirmationModal.tsx
@@ -0,0 +1,88 @@
+import React from "react";
+import styled from "styled-components";
+import Button, { Size, Category } from "components/ads/Button";
+import Text, { TextType } from "components/ads/Text";
+import { Variant } from "components/ads/common";
+import {
+  DELETE_CONFIRMATION_MODAL_TITLE,
+  DELETE_CONFIRMATION_MODAL_SUBTITLE,
+} from "constants/messages";
+import Dialog from "components/ads/DialogComponent";
+import { Classes } from "@blueprintjs/core";
+
+const StyledDialog = styled(Dialog)`
+  && .${Classes.DIALOG_BODY} {
+    padding-top: 0px;
+  }
+`;
+
+const CenteredContainer = styled.div`
+  text-align: center;
+`;
+
+const ImportButton = styled(Button)<{ disabled?: boolean }>`
+  height: 30px;
+  width: 81px;
+  pointer-events: ${(props) => (!!props.disabled ? "none" : "auto")};
+`;
+
+const ButtonWrapper = styled.div`
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+
+  & > a {
+    margin: 0 4px;
+  }
+`;
+
+type DeleteConfirmationProps = {
+  username?: string | null;
+  name?: string | null;
+  isOpen: boolean;
+  onClose: () => void;
+  onConfirm: () => void;
+  isDeletingUser: boolean;
+};
+
+function DeleteConfirmationModal(props: DeleteConfirmationProps) {
+  const { isDeletingUser, isOpen, name, onClose, onConfirm, username } = props;
+
+  return (
+    <StyledDialog
+      canOutsideClickClose
+      className={"t--member-delete-confirmation-modal"}
+      isOpen={isOpen}
+      maxHeight={"540px"}
+      setModalClose={onClose}
+      title={DELETE_CONFIRMATION_MODAL_TITLE()}
+    >
+      <CenteredContainer>
+        <Text textAlign="center" type={TextType.P1}>
+          {DELETE_CONFIRMATION_MODAL_SUBTITLE(name || username)}
+        </Text>
+        <ButtonWrapper>
+          <ImportButton
+            category={Category.tertiary}
+            className=".button-item"
+            onClick={onClose}
+            size={Size.large}
+            text={"CANCEL"}
+            variant={Variant.danger}
+          />
+          <ImportButton
+            className=".button-item"
+            cypressSelector={"t--org-leave-button"}
+            isLoading={isDeletingUser}
+            onClick={onConfirm}
+            size={Size.large}
+            text={"REMOVE"}
+            variant={Variant.danger}
+          />
+        </ButtonWrapper>
+      </CenteredContainer>
+    </StyledDialog>
+  );
+}
+
+export default DeleteConfirmationModal;
diff --git a/app/client/src/pages/organization/General.tsx b/app/client/src/pages/organization/General.tsx
index f9bd6e2010..7e320be84f 100644
--- a/app/client/src/pages/organization/General.tsx
+++ b/app/client/src/pages/organization/General.tsx
@@ -20,9 +20,12 @@ import { getOrgLoadingStates } from "selectors/organizationSelectors";
 import FilePicker, {
   SetProgress,
   UploadCallback,
+  FileType,
 } from "components/ads/FilePicker";
 import { getIsFetchingApplications } from "selectors/applicationSelectors";
 
+// trigger tests
+
 const InputLabelWrapper = styled.div`
   width: 150px;
   display: flex;
@@ -171,6 +174,7 @@ export function GeneralSettings() {
             {isFetchingOrg && <FilePickerLoader className={Classes.SKELETON} />}
             {!isFetchingOrg && (
               <FilePicker
+                fileType={FileType.IMAGE}
                 fileUploader={FileUploader}
                 logoUploadError={logoUploadError.message}
                 onFileRemoved={DeleteLogo}
diff --git a/app/client/src/pages/organization/Members.tsx b/app/client/src/pages/organization/Members.tsx
index b2b45debe4..698550910b 100644
--- a/app/client/src/pages/organization/Members.tsx
+++ b/app/client/src/pages/organization/Members.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 
 import {
@@ -29,6 +29,7 @@ import { SettingsHeading } from "./General";
 import styled from "styled-components";
 import { Classes } from "@blueprintjs/core";
 import { Variant } from "components/ads/common";
+import DeleteConfirmationModal from "./DeleteConfirmationModal";
 
 export type PageProps = RouteComponentProps<{
   orgId: string;
@@ -54,10 +55,39 @@ export default function MemberSettings(props: PageProps) {
     dispatch(fetchOrg(orgId));
   }, [orgId]);
 
+  const [
+    showMemberDeletionConfirmation,
+    setShowMemberDeletionConfirmation,
+  ] = useState(false);
+  const [isDeletingUser, setIsDeletingUser] = useState(false);
+  const onOpenConfirmationModal = () => setShowMemberDeletionConfirmation(true);
+  const onCloseConfirmationModal = () =>
+    setShowMemberDeletionConfirmation(false);
+
+  const [userToBeDeleted, setUserToBeDeleted] = useState<{
+    name: string;
+    username: string;
+    orgId: string;
+  } | null>(null);
+
+  const onConfirmMemberDeletion = (
+    name: string,
+    username: string,
+    orgId: string,
+  ) => {
+    setUserToBeDeleted({ name, username, orgId });
+    onOpenConfirmationModal();
+  };
+
+  const onDeleteMember = () => {
+    if (!userToBeDeleted) return null;
+    dispatch(deleteOrgUser(userToBeDeleted.orgId, userToBeDeleted.username));
+  };
+
   const {
-    isFetchingAllUsers,
-    isFetchingAllRoles,
     deletingUserInfo,
+    isFetchingAllRoles,
+    isFetchingAllUsers,
     roleChangingUserInfo,
   } = useSelector(getOrgLoadingStates);
   const allUsers = useSelector(getAllUsers);
@@ -66,6 +96,21 @@ export default function MemberSettings(props: PageProps) {
     (el) => el.id === orgId,
   )[0];
 
+  useEffect(() => {
+    if (!!userToBeDeleted && showMemberDeletionConfirmation) {
+      const userBeingDeleted = allUsers.find(
+        (user) => user.username === userToBeDeleted.username,
+      );
+      if (!userBeingDeleted) {
+        setUserToBeDeleted(null);
+        onCloseConfirmationModal();
+        setIsDeletingUser(false);
+      } else {
+        setIsDeletingUser(userBeingDeleted.isDeleting);
+      }
+    }
+  }, [allUsers]);
+
   const userTableData = allUsers.map((user) => ({
     ...user,
     isCurrentUser: user.username === currentUser?.username,
@@ -130,12 +175,6 @@ export default function MemberSettings(props: PageProps) {
       accessor: "delete",
       disableSortBy: true,
       Cell: function DeleteCell(cellProps: any) {
-        if (
-          cellProps.cell.row.values.username ===
-          useSelector(getCurrentUser)?.username
-        ) {
-          return null;
-        }
         return (
           <Icon
             cypressSelector="t--deleteUser"
@@ -145,8 +184,10 @@ export default function MemberSettings(props: PageProps) {
             }
             name="delete"
             onClick={() => {
-              dispatch(
-                deleteOrgUser(orgId, cellProps.cell.row.values.username),
+              onConfirmMemberDeletion(
+                cellProps.cell.row.values.username,
+                cellProps.cell.row.values.username,
+                orgId,
               );
             }}
             size={IconSize.LARGE}
@@ -180,7 +221,17 @@ export default function MemberSettings(props: PageProps) {
       {isFetchingAllUsers && isFetchingAllRoles ? (
         <Loader className={Classes.SKELETON} />
       ) : (
-        <Table columns={columns} data={userTableData} />
+        <>
+          <Table columns={columns} data={userTableData} />
+          <DeleteConfirmationModal
+            isDeletingUser={isDeletingUser}
+            isOpen={showMemberDeletionConfirmation}
+            name={userToBeDeleted && userToBeDeleted.name}
+            onClose={onCloseConfirmationModal}
+            onConfirm={onDeleteMember}
+            username={userToBeDeleted && userToBeDeleted.username}
+          />
+        </>
       )}
     </>
   );
diff --git a/app/client/src/pages/organization/OrgInviteUsersForm.tsx b/app/client/src/pages/organization/OrgInviteUsersForm.tsx
index 437c3ab050..fe1b72ff81 100644
--- a/app/client/src/pages/organization/OrgInviteUsersForm.tsx
+++ b/app/client/src/pages/organization/OrgInviteUsersForm.tsx
@@ -39,6 +39,7 @@ import { getInitialsAndColorCode } from "utils/AppsmithUtils";
 import ProfileImage from "pages/common/ProfileImage";
 import ManageUsers from "./ManageUsers";
 import ScrollIndicator from "components/ads/ScrollIndicator";
+import UserApi from "api/UserApi";
 
 const OrgInviteTitle = styled.div`
   padding: 10px 0px;
@@ -206,19 +207,19 @@ function OrgInviteUsersForm(props: any) {
   const [emailError, setEmailError] = useState("");
   const userRef = React.createRef<HTMLDivElement>();
   const {
-    handleSubmit,
     allUsers,
-    submitting,
     anyTouched,
-    submitFailed,
-    submitSucceeded,
     error,
-    fetchUser,
     fetchAllRoles,
-    valid,
     fetchCurrentOrg,
+    fetchUser,
+    handleSubmit,
     isApplicationInvite,
     isLoading,
+    submitFailed,
+    submitSucceeded,
+    submitting,
+    valid,
   } = props;
 
   // set state for checking number of users invited
@@ -343,7 +344,10 @@ function OrgInviteUsersForm(props: any) {
                     <Fragment key={user.username}>
                       <User>
                         <UserInfo>
-                          <ProfileImage userName={user.initials} />
+                          <ProfileImage
+                            source={`/api/${UserApi.photoURL}/${user.username}`}
+                            userName={user.name || user.username}
+                          />
                           <UserName>
                             <Text type={TextType.H5}>{user.name}</Text>
                             <Text type={TextType.P2}>{user.username}</Text>
diff --git a/app/client/src/reducers/entityReducers/actionsReducer.tsx b/app/client/src/reducers/entityReducers/actionsReducer.tsx
index 2b2c0496c5..01b84929b1 100644
--- a/app/client/src/reducers/entityReducers/actionsReducer.tsx
+++ b/app/client/src/reducers/entityReducers/actionsReducer.tsx
@@ -16,6 +16,15 @@ export interface ActionData {
   config: Action;
   data?: ActionResponse;
 }
+
+export interface ActionDataWithMeta extends ActionData {
+  responseMeta: {
+    headers?: unknown;
+    isExecutionSuccess: boolean;
+    statusCode?: string;
+  };
+}
+
 export type ActionDataState = ActionData[];
 export interface PartialActionData {
   isLoading: boolean;
@@ -294,6 +303,7 @@ const actionsReducer = createReducer(initialState, {
         .filter((a) => a.config.id === action.payload.id)
         .map((a) => ({
           ...a,
+          data: undefined,
           config: {
             ...a.config,
             id: "TEMP_COPY_ID",
diff --git a/app/client/src/reducers/entityReducers/datasourceReducer.ts b/app/client/src/reducers/entityReducers/datasourceReducer.ts
index 60cde23c83..f2c3f17da8 100644
--- a/app/client/src/reducers/entityReducers/datasourceReducer.ts
+++ b/app/client/src/reducers/entityReducers/datasourceReducer.ts
@@ -4,7 +4,11 @@ import {
   ReduxAction,
   ReduxActionErrorTypes,
 } from "constants/ReduxActionConstants";
-import { Datasource, DatasourceStructure } from "entities/Datasource";
+import {
+  Datasource,
+  DatasourceStructure,
+  MockDatasource,
+} from "entities/Datasource";
 
 export interface DatasourceDataState {
   list: Datasource[];
@@ -14,6 +18,8 @@ export interface DatasourceDataState {
   fetchingDatasourceStructure: boolean;
   isRefreshingStructure: boolean;
   structure: Record<string, DatasourceStructure>;
+  isFetchingMockDataSource: false;
+  mockDatasourceList: any[];
 }
 
 const initialState: DatasourceDataState = {
@@ -24,9 +30,48 @@ const initialState: DatasourceDataState = {
   fetchingDatasourceStructure: false,
   isRefreshingStructure: false,
   structure: {},
+  isFetchingMockDataSource: false,
+  mockDatasourceList: [],
 };
 
 const datasourceReducer = createReducer(initialState, {
+  [ReduxActionTypes.FETCH_MOCK_DATASOURCES_INIT]: (
+    state: DatasourceDataState,
+  ) => {
+    return { ...state, isFetchingMockDataSource: true };
+  },
+  [ReduxActionTypes.FETCH_MOCK_DATASOURCES_SUCCESS]: (
+    state: DatasourceDataState,
+    action: ReduxAction<any>,
+  ) => {
+    const mockDatasourceList = action.payload as MockDatasource[];
+    return { ...state, isFetchingMockDataSource: false, mockDatasourceList };
+  },
+  [ReduxActionErrorTypes.FETCH_MOCK_DATASOURCES_ERROR]: (
+    state: DatasourceDataState,
+  ) => {
+    return { ...state, isFetchingMockDataSource: false };
+  },
+  [ReduxActionTypes.ADD_MOCK_DATASOURCES_INIT]: (
+    state: DatasourceDataState,
+  ) => {
+    return { ...state, loading: true };
+  },
+  [ReduxActionTypes.ADD_MOCK_DATASOURCES_SUCCESS]: (
+    state: DatasourceDataState,
+    action: ReduxAction<Datasource>,
+  ) => {
+    return {
+      ...state,
+      loading: false,
+      list: state.list.concat(action.payload),
+    };
+  },
+  [ReduxActionErrorTypes.FETCH_MOCK_DATASOURCES_ERROR]: (
+    state: DatasourceDataState,
+  ) => {
+    return { ...state, loading: false };
+  },
   [ReduxActionTypes.FETCH_DATASOURCES_INIT]: (state: DatasourceDataState) => {
     return { ...state, loading: true };
   },
diff --git a/app/client/src/reducers/entityReducers/metaReducer.ts b/app/client/src/reducers/entityReducers/metaReducer.ts
index 5deb65a212..ab00926994 100644
--- a/app/client/src/reducers/entityReducers/metaReducer.ts
+++ b/app/client/src/reducers/entityReducers/metaReducer.ts
@@ -1,6 +1,7 @@
+import { set, cloneDeep } from "lodash";
 import { createReducer } from "utils/AppsmithUtils";
-import { ReduxActionTypes, ReduxAction } from "constants/ReduxActionConstants";
 import { UpdateWidgetMetaPropertyPayload } from "actions/metaActions";
+import { ReduxActionTypes, ReduxAction } from "constants/ReduxActionConstants";
 
 export type MetaState = Record<string, Record<string, unknown>>;
 
@@ -11,14 +12,14 @@ export const metaReducer = createReducer(initialState, {
     state: MetaState,
     action: ReduxAction<UpdateWidgetMetaPropertyPayload>,
   ) => {
-    const next = { ...state };
-    let widgetMetaProps: Record<string, any> = next[action.payload.widgetId];
-    if (widgetMetaProps === undefined) {
-      widgetMetaProps = {};
-      next[action.payload.widgetId] = widgetMetaProps;
-    }
-    (widgetMetaProps as Record<string, any>)[action.payload.propertyName] =
-      action.payload.propertyValue;
+    const next = cloneDeep(state);
+
+    set(
+      next,
+      `${action.payload.widgetId}.${action.payload.propertyName}`,
+      action.payload.propertyValue,
+    );
+
     return next;
   },
   [ReduxActionTypes.WIDGET_DELETE]: (
diff --git a/app/client/src/reducers/entityReducers/widgetConfigReducer.tsx b/app/client/src/reducers/entityReducers/widgetConfigReducer.tsx
index 7b8c5b021a..dd659ee6c6 100644
--- a/app/client/src/reducers/entityReducers/widgetConfigReducer.tsx
+++ b/app/client/src/reducers/entityReducers/widgetConfigReducer.tsx
@@ -29,6 +29,9 @@ import { VideoWidgetProps } from "widgets/VideoWidget";
 import { SkeletonWidgetProps } from "../../widgets/SkeletonWidget";
 import { SwitchWidgetProps } from "widgets/SwitchWidget";
 import { ListWidgetProps } from "../../widgets/ListWidget/ListWidget";
+import { DividerWidgetProps } from "../../widgets/DividerWidget";
+import { RateWidgetProps } from "../../widgets/RateWidget";
+import { IframeWidgetProps } from "widgets/IframeWidget";
 
 const initialState: WidgetConfigReducerState = WidgetConfigResponse;
 
@@ -82,6 +85,9 @@ export interface WidgetConfigReducerState {
     ICON_WIDGET: Partial<IconWidgetProps> & WidgetConfigProps;
     SKELETON_WIDGET: Partial<SkeletonWidgetProps> & WidgetConfigProps;
     LIST_WIDGET: Partial<ListWidgetProps<WidgetProps>> & WidgetConfigProps;
+    DIVIDER_WIDGET: Partial<DividerWidgetProps> & WidgetConfigProps;
+    RATE_WIDGET: Partial<RateWidgetProps> & WidgetConfigProps;
+    IFRAME_WIDGET: Partial<IframeWidgetProps> & WidgetConfigProps;
   };
   configVersion: number;
 }
diff --git a/app/client/src/reducers/index.tsx b/app/client/src/reducers/index.tsx
index 97b80fc2ee..0099c6d984 100644
--- a/app/client/src/reducers/index.tsx
+++ b/app/client/src/reducers/index.tsx
@@ -44,6 +44,9 @@ import { LoadingEntitiesState } from "./evaluationReducers/loadingEntitiesReduce
 import { CommentsReduxState } from "./uiReducers/commentsReducer/interfaces";
 import { WebsocketReduxState } from "./uiReducers/websocketReducer";
 import { DebuggerReduxState } from "./uiReducers/debuggerReducer";
+import { TourReducerState } from "./uiReducers/tourReducer";
+import { NotificationReducerState } from "./uiReducers/notificationsReducer";
+import { CanvasSelectionState } from "./uiReducers/canvasSelectionReducer";
 
 const appReducer = combineReducers({
   entities: entityReducer,
@@ -86,6 +89,9 @@ export interface AppState {
     comments: CommentsReduxState;
     websocket: WebsocketReduxState;
     debugger: DebuggerReduxState;
+    tour: TourReducerState;
+    notifications: NotificationReducerState;
+    canvasSelection: CanvasSelectionState;
   };
   entities: {
     canvasWidgets: CanvasWidgetsReduxState;
diff --git a/app/client/src/reducers/uiReducers/applicationsReducer.tsx b/app/client/src/reducers/uiReducers/applicationsReducer.tsx
index fff32d7465..5e4c1a8faa 100644
--- a/app/client/src/reducers/uiReducers/applicationsReducer.tsx
+++ b/app/client/src/reducers/uiReducers/applicationsReducer.tsx
@@ -17,6 +17,7 @@ import { AppLayoutConfig } from "reducers/entityReducers/pageListReducer";
 const initialState: ApplicationsReduxState = {
   isFetchingApplications: false,
   isSavingAppName: false,
+  isErrorSavingAppName: false,
   isFetchingApplication: false,
   isChangingViewAccess: false,
   applicationList: [],
@@ -26,6 +27,9 @@ const initialState: ApplicationsReduxState = {
   duplicatingApplication: false,
   userOrgs: [],
   isSavingOrgInfo: false,
+  importingApplication: false,
+  importedApplication: null,
+  showAppInviteUsersDialog: false,
 };
 
 const applicationsReducer = createReducer(initialState, {
@@ -213,6 +217,28 @@ const applicationsReducer = createReducer(initialState, {
       forkingApplication: false,
     };
   },
+  [ReduxActionTypes.IMPORT_APPLICATION_INIT]: (
+    state: ApplicationsReduxState,
+  ) => ({ ...state, importingApplication: true }),
+  [ReduxActionTypes.IMPORT_APPLICATION_SUCCESS]: (
+    state: ApplicationsReduxState,
+    action: ReduxAction<{ importedApplication: any }>,
+  ) => {
+    const { importedApplication } = action.payload;
+    return {
+      ...state,
+      importingApplication: false,
+      importedApplication,
+    };
+  },
+  [ReduxActionErrorTypes.IMPORT_APPLICATION_ERROR]: (
+    state: ApplicationsReduxState,
+  ) => {
+    return {
+      ...state,
+      importingApplication: false,
+    };
+  },
   [ReduxActionTypes.SAVING_ORG_INFO]: (state: ApplicationsReduxState) => {
     return {
       ...state,
@@ -289,6 +315,18 @@ const applicationsReducer = createReducer(initialState, {
     if (action.payload.name) {
       isSavingAppName = true;
     }
+    return {
+      ...state,
+      isSavingAppName: isSavingAppName,
+      isErrorSavingAppName: false,
+    };
+  },
+  [ReduxActionTypes.UPDATE_APPLICATION_SUCCESS]: (
+    state: ApplicationsReduxState,
+    action: ReduxAction<UpdateApplicationRequest>,
+  ) => {
+    // userOrgs data has to be saved to localStorage only if the action is successful
+    // It introduces bug if we prematurely save it during init action.
     const { id, ...rest } = action.payload;
     const _organizations = state.userOrgs.map((org: Organization) => {
       const appIndex = org.applications.findIndex((app) => app.id === id);
@@ -302,26 +340,28 @@ const applicationsReducer = createReducer(initialState, {
 
       return org;
     });
-
     return {
       ...state,
       userOrgs: _organizations,
-      isSavingAppName: isSavingAppName,
+      isSavingAppName: false,
+      isErrorSavingAppName: false,
     };
   },
-  [ReduxActionTypes.UPDATE_APPLICATION_SUCCESS]: (
-    state: ApplicationsReduxState,
-  ) => {
-    return { ...state, isSavingAppName: false };
-  },
   [ReduxActionErrorTypes.UPDATE_APPLICATION_ERROR]: (
     state: ApplicationsReduxState,
   ) => {
-    return { ...state, isSavingAppName: false };
+    return { ...state, isSavingAppName: false, isErrorSavingAppName: true };
   },
   [ReduxActionTypes.RESET_CURRENT_APPLICATION]: (
     state: ApplicationsReduxState,
   ) => ({ ...state, currentApplication: null }),
+  [ReduxActionTypes.SET_SHOW_APP_INVITE_USERS_MODAL]: (
+    state: ApplicationsReduxState,
+    action: ReduxAction<boolean>,
+  ) => ({
+    ...state,
+    showAppInviteUsersDialog: action.payload,
+  }),
 });
 
 export type creatingApplicationMap = Record<string, boolean>;
@@ -331,6 +371,7 @@ export interface ApplicationsReduxState {
   searchKeyword?: string;
   isFetchingApplications: boolean;
   isSavingAppName: boolean;
+  isErrorSavingAppName: boolean;
   isFetchingApplication: boolean;
   isChangingViewAccess: boolean;
   creatingApplication: creatingApplicationMap;
@@ -341,6 +382,9 @@ export interface ApplicationsReduxState {
   currentApplication?: ApplicationPayload;
   userOrgs: Organization[];
   isSavingOrgInfo: boolean;
+  importingApplication: boolean;
+  importedApplication: any;
+  showAppInviteUsersDialog: boolean;
 }
 
 export interface Application {
diff --git a/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts b/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
new file mode 100644
index 0000000000..8d1d3ebde7
--- /dev/null
+++ b/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
@@ -0,0 +1,21 @@
+import { createImmerReducer } from "utils/AppsmithUtils";
+import { ReduxActionTypes } from "constants/ReduxActionConstants";
+
+const initialState: CanvasSelectionState = {
+  isDraggingForSelection: false,
+};
+
+export const canvasSelectionReducer = createImmerReducer(initialState, {
+  [ReduxActionTypes.START_CANVAS_SELECTION]: (state: CanvasSelectionState) => {
+    state.isDraggingForSelection = true;
+  },
+  [ReduxActionTypes.STOP_CANVAS_SELECTION]: (state: CanvasSelectionState) => {
+    state.isDraggingForSelection = false;
+  },
+});
+
+export type CanvasSelectionState = {
+  isDraggingForSelection: boolean;
+};
+
+export default canvasSelectionReducer;
diff --git a/app/client/src/reducers/uiReducers/commentsReducer/commentsReducer.test.ts b/app/client/src/reducers/uiReducers/commentsReducer/commentsReducer.test.ts
index d24eb174e5..73b983566a 100644
--- a/app/client/src/reducers/uiReducers/commentsReducer/commentsReducer.test.ts
+++ b/app/client/src/reducers/uiReducers/commentsReducer/commentsReducer.test.ts
@@ -22,11 +22,11 @@ import {
   unpublishedCommentPayload,
   createCommentThreadSuccessPayload,
   addCommentToThreadSuccessPayload,
-  updateCommentThreadPayload,
   newCommentThreadEventPayload,
   updateCommentThreadEventPayload,
   newCommentEventPayload,
 } from "./testFixtures";
+import { CommentThread } from "entities/Comments/CommentsInterfaces";
 
 describe("Test comments reducer handles", () => {
   let state: any;
@@ -76,10 +76,10 @@ describe("Test comments reducer handles", () => {
         ],
         [createCommentThreadSuccessPayload.refId]: Array.from(
           new Set([
+            createCommentThreadSuccessPayload.id,
             ...((prevState.applicationCommentThreadsByRef[
               createCommentThreadSuccessPayload.applicationId
             ] || {})[createCommentThreadSuccessPayload.refId] || []),
-            createCommentThreadSuccessPayload.id,
           ]),
         ),
       },
@@ -110,15 +110,15 @@ describe("Test comments reducer handles", () => {
   });
 
   it("thread updates", () => {
-    state = commentsReducer(
-      state,
-      updateCommentThreadSuccess(updateCommentThreadPayload),
-    );
-    expect(
-      state.commentThreadsMap[updateCommentThreadPayload.id],
-    ).toStrictEqual({
-      ...state.commentThreadsMap[updateCommentThreadPayload.id],
-      ...updateCommentThreadPayload,
+    const threadUpdate: CommentThread =
+      fetchApplicationThreadsMockResponse.data[0];
+    threadUpdate.resolvedState = { active: true };
+
+    state = commentsReducer(state, updateCommentThreadSuccess(threadUpdate));
+
+    expect(state.commentThreadsMap[threadUpdate.id]).toStrictEqual({
+      ...state.commentThreadsMap[threadUpdate.id],
+      ...threadUpdate,
     });
   });
 
@@ -134,7 +134,6 @@ describe("Test comments reducer handles", () => {
       [newCommentThreadEventPayload.thread._id]: {
         ...newCommentThreadEventPayload.thread,
         id: newCommentThreadEventPayload.thread._id,
-        isVisible: false,
         comments:
           state.commentThreadsMap[newCommentThreadEventPayload.thread._id]
             .comments || [],
@@ -149,10 +148,10 @@ describe("Test comments reducer handles", () => {
         ],
         [newCommentThreadEventPayload.thread.refId]: Array.from(
           new Set([
+            newCommentThreadEventPayload.thread._id,
             ...((prevState.applicationCommentThreadsByRef[
               newCommentThreadEventPayload.thread.applicationId
             ] || {})[newCommentThreadEventPayload.thread.refId] || []),
-            newCommentThreadEventPayload.thread._id,
           ]),
         ),
       },
diff --git a/app/client/src/reducers/uiReducers/commentsReducer/commentsReducer.ts b/app/client/src/reducers/uiReducers/commentsReducer/commentsReducer.ts
index 6c170cb2c0..9e5e03224f 100644
--- a/app/client/src/reducers/uiReducers/commentsReducer/commentsReducer.ts
+++ b/app/client/src/reducers/uiReducers/commentsReducer/commentsReducer.ts
@@ -7,6 +7,7 @@ import handleFetchApplicationCommentsSuccess from "./handleFetchApplicationComme
 import handleNewCommentThreadEvent from "./handleNewCommentThreadEvent";
 import handleUpdateCommentThreadSuccess from "./handleUpdateCommentThreadSuccess";
 import handleUpdateCommentThreadEvent from "./handleUpdateCommentThreadEvent";
+import handleUpdateCommentEvent from "./handleUpdateCommentEvent";
 
 import { CommentsReduxState } from "./interfaces";
 import {
@@ -15,8 +16,11 @@ import {
   CreateCommentThreadRequest,
   NewCommentEventPayload,
   NewCommentThreadPayload,
+  Comment,
 } from "entities/Comments/CommentsInterfaces";
 
+import { options as filterOptions } from "comments/AppComments/AppCommentsFilterPopover";
+
 const initialState: CommentsReduxState = {
   commentThreadsMap: {},
   applicationCommentThreadsByRef: {},
@@ -24,6 +28,12 @@ const initialState: CommentsReduxState = {
   isCommentMode: false,
   creatingNewThread: false,
   creatingNewThreadComment: false,
+  appCommentsFilter: filterOptions[0].value,
+  shouldShowResolvedAppCommentThreads: false,
+  unreadCommentThreadsCount: 0,
+  visibleCommentThreadId: "",
+  isIntroCarouselVisible: false,
+  areCommentsEnabled: false,
 };
 
 /**
@@ -31,14 +41,6 @@ const initialState: CommentsReduxState = {
  * They are handled separately
  */
 const commentsReducer = createReducer(initialState, {
-  // todo: remove (for dev)
-  [ReduxActionTypes.SET_COMMENT_THREADS_SUCCESS]: (
-    state: CommentsReduxState,
-    action: ReduxAction<any>,
-  ) => ({
-    ...state,
-    ...action.payload,
-  }),
   // Only one unpublished comment threads exists at a time
   [ReduxActionTypes.CREATE_UNPUBLISHED_COMMENT_THREAD_SUCCESS]: (
     state: CommentsReduxState,
@@ -71,18 +73,8 @@ const commentsReducer = createReducer(initialState, {
   ) => ({
     ...state,
     isCommentMode: action.payload,
+    isIntroCarouselVisible: false,
   }),
-  [ReduxActionTypes.SET_IS_COMMENT_THREAD_VISIBLE]: (
-    state: CommentsReduxState,
-    action: ReduxAction<{ isVisible: boolean; commentThreadId: string }>,
-  ) => {
-    state.commentThreadsMap[action.payload.commentThreadId] = {
-      ...state.commentThreadsMap[action.payload.commentThreadId],
-      isVisible: action.payload.isVisible,
-    };
-
-    return { ...state };
-  },
   [ReduxActionTypes.CREATE_COMMENT_THREAD_REQUEST]: (
     state: CommentsReduxState,
   ) => ({
@@ -137,22 +129,6 @@ const commentsReducer = createReducer(initialState, {
   ) => {
     return handleUpdateCommentThreadEvent(state, action);
   },
-  [ReduxActionTypes.PIN_COMMENT_THREAD_SUCCESS]: (
-    state: CommentsReduxState,
-    action: ReduxAction<{ threadId: string; applicationId: string }>,
-  ) => {
-    const { threadId, applicationId } = action.payload;
-    state.commentThreadsMap[threadId] = {
-      ...state.commentThreadsMap[threadId],
-      isPinned: true,
-    };
-    // so that changes are propagated to app comments
-    state.applicationCommentThreadsByRef[applicationId] = {
-      ...state.applicationCommentThreadsByRef[applicationId],
-    };
-
-    return { ...state };
-  },
   [ReduxActionTypes.DELETE_COMMENT_SUCCESS]: (
     state: CommentsReduxState,
     action: ReduxAction<{
@@ -160,7 +136,7 @@ const commentsReducer = createReducer(initialState, {
       threadId: string;
     }>,
   ) => {
-    const { threadId, commentId } = action.payload;
+    const { commentId, threadId } = action.payload;
 
     const commentThread = state.commentThreadsMap[threadId];
     state.commentThreadsMap[threadId] = {
@@ -172,6 +148,122 @@ const commentsReducer = createReducer(initialState, {
 
     return { ...state };
   },
+  [ReduxActionTypes.SET_SHOULD_SHOW_RESOLVED_COMMENTS]: (
+    state: CommentsReduxState,
+    action: ReduxAction<boolean>,
+  ) => ({
+    ...state,
+    shouldShowResolvedAppCommentThreads: action.payload,
+  }),
+  [ReduxActionTypes.RESET_VISIBLE_THREAD]: (
+    state: CommentsReduxState,
+    action: ReduxAction<string>,
+  ) => ({
+    ...state,
+    /**
+     * To solve race cond, explicitly hide a visible thread using it's id
+     * so that we don't accidently hide another thread
+     */
+    visibleCommentThreadId:
+      action.payload === state.visibleCommentThreadId
+        ? ""
+        : state.visibleCommentThreadId,
+  }),
+  [ReduxActionTypes.SET_VISIBLE_THREAD]: (
+    state: CommentsReduxState,
+    action: ReduxAction<string>,
+  ) => ({
+    ...state,
+    visibleCommentThreadId: action.payload,
+  }),
+  [ReduxActionTypes.SET_APP_COMMENTS_FILTER]: (
+    state: CommentsReduxState,
+    action: ReduxAction<typeof filterOptions[number]["value"]>,
+  ) => ({
+    ...state,
+    appCommentsFilter: action.payload,
+  }),
+  [ReduxActionTypes.EDIT_COMMENT_SUCCESS]: (
+    state: CommentsReduxState,
+    action: ReduxAction<{ comment: Comment; commentThreadId: string }>,
+  ) => {
+    const { comment, commentThreadId } = action.payload;
+    const { id: commentId } = comment;
+    const commentThread = state.commentThreadsMap[commentThreadId];
+
+    if (!commentThread) return state;
+
+    const commentIdx = commentThread.comments.findIndex(
+      (comment: Comment) => comment.id === commentId,
+    );
+
+    commentThread.comments.splice(commentIdx, 1, comment);
+
+    // propagate changes
+    state.commentThreadsMap[commentThreadId] = {
+      ...state.commentThreadsMap[commentThreadId],
+    };
+
+    return { ...state };
+  },
+  [ReduxActionTypes.DELETE_THREAD_SUCCESS]: (
+    state: CommentsReduxState,
+    action: ReduxAction<{ commentThreadId: string; appId: string }>,
+  ) => {
+    const { appId, commentThreadId } = action.payload;
+    if (!state.applicationCommentThreadsByRef[appId]) return false;
+
+    const { refId } = state.commentThreadsMap[commentThreadId];
+
+    let refComments = state.applicationCommentThreadsByRef[appId][refId];
+    if (refComments) {
+      refComments = refComments.filter(
+        (threadId: string) => threadId !== commentThreadId,
+      );
+    }
+
+    delete state.commentThreadsMap[commentThreadId];
+
+    state.commentThreadsMap = { ...state.commentThreadsMap };
+
+    state.applicationCommentThreadsByRef[appId as string] = {
+      ...state.applicationCommentThreadsByRef[appId as string],
+    };
+
+    return { ...state };
+  },
+  [ReduxActionTypes.SHOW_COMMENTS_INTRO_CAROUSEL]: (
+    state: CommentsReduxState,
+  ) => ({
+    ...state,
+    isIntroCarouselVisible: true,
+  }),
+  [ReduxActionTypes.HIDE_COMMENTS_INTRO_CAROUSEL]: (
+    state: CommentsReduxState,
+  ) => ({
+    ...state,
+    isIntroCarouselVisible: false,
+  }),
+  [ReduxActionTypes.SET_ARE_COMMENTS_ENABLED]: (
+    state: CommentsReduxState,
+    action: ReduxAction<boolean>,
+  ) => ({
+    ...state,
+    areCommentsEnabled: action.payload,
+  }),
+  [ReduxActionTypes.UPDATE_COMMENT_EVENT]: (
+    state: CommentsReduxState,
+    action: ReduxAction<Comment>,
+  ) => {
+    return handleUpdateCommentEvent(state, action);
+  },
+  [ReduxActionTypes.FETCH_UNREAD_COMMENT_THREADS_COUNT_SUCCESS]: (
+    state: CommentsReduxState,
+    action: ReduxAction<number>,
+  ) => ({
+    ...state,
+    unreadCommentThreadsCount: action.payload || 0,
+  }),
 });
 
 export default commentsReducer;
diff --git a/app/client/src/reducers/uiReducers/commentsReducer/handleAddCommentToThreadSuccess.ts b/app/client/src/reducers/uiReducers/commentsReducer/handleAddCommentToThreadSuccess.ts
index f08725669f..472d73a05e 100644
--- a/app/client/src/reducers/uiReducers/commentsReducer/handleAddCommentToThreadSuccess.ts
+++ b/app/client/src/reducers/uiReducers/commentsReducer/handleAddCommentToThreadSuccess.ts
@@ -1,17 +1,17 @@
 import { ReduxAction } from "constants/ReduxActionConstants";
-import { get } from "lodash";
+import { get, uniqBy } from "lodash";
 import { CommentsReduxState } from "./interfaces";
 
 const handleAddCommentToThreadSuccess = (
   state: CommentsReduxState,
   action: ReduxAction<any>,
 ) => {
-  const { commentThreadId, comment } = action.payload;
+  const { comment, commentThreadId } = action.payload;
   const commentThreadInStore = state.commentThreadsMap[commentThreadId];
   const existingComments = get(commentThreadInStore, "comments", []);
   state.commentThreadsMap[commentThreadId] = {
     ...commentThreadInStore,
-    comments: Array.from(new Set([...existingComments, comment])),
+    comments: uniqBy([...existingComments, comment], "id"),
   };
 
   return { ...state };
diff --git a/app/client/src/reducers/uiReducers/commentsReducer/handleCreateNewCommentThreadSuccess.ts b/app/client/src/reducers/uiReducers/commentsReducer/handleCreateNewCommentThreadSuccess.ts
index 22e34cbb0b..56ee69a52d 100644
--- a/app/client/src/reducers/uiReducers/commentsReducer/handleCreateNewCommentThreadSuccess.ts
+++ b/app/client/src/reducers/uiReducers/commentsReducer/handleCreateNewCommentThreadSuccess.ts
@@ -10,7 +10,7 @@ const handleCreateNewCommentThreadSuccess = (
   state: CommentsReduxState,
   action: ReduxAction<any>,
 ) => {
-  const { refId, id, applicationId } = action.payload;
+  const { applicationId, id, refId } = action.payload;
 
   state.commentThreadsMap[id] = action.payload;
 
@@ -26,7 +26,7 @@ const handleCreateNewCommentThreadSuccess = (
 
   state.applicationCommentThreadsByRef[applicationId] = {
     ...state.applicationCommentThreadsByRef[applicationId],
-    [refId]: Array.from(new Set([...commentThreadsIdsForRefId, id])),
+    [refId]: Array.from(new Set([id, ...commentThreadsIdsForRefId])),
   };
 
   return { ...state };
diff --git a/app/client/src/reducers/uiReducers/commentsReducer/handleNewCommentThreadEvent.ts b/app/client/src/reducers/uiReducers/commentsReducer/handleNewCommentThreadEvent.ts
index 9d4ad3e5ba..abf766c5b5 100644
--- a/app/client/src/reducers/uiReducers/commentsReducer/handleNewCommentThreadEvent.ts
+++ b/app/client/src/reducers/uiReducers/commentsReducer/handleNewCommentThreadEvent.ts
@@ -13,23 +13,17 @@ const handleNewCommentThreadEvent = (
     {},
   ) as Record<string, Array<string>>;
   const threadsForRefId = get(applicationCommentIdsByRefId, thread.refId, []);
-  // Prevent duplicate events from hiding the thread popover
-  // Can happen if the creator is also receiving the new comment thread updates
-  const isVisible = get(
-    state.commentThreadsMap,
-    `${thread._id}.isVisible`,
-    false,
-  );
   const existingComments = get(
     state.commentThreadsMap,
     `${thread._id}.comments`,
     [],
   ) as [];
 
+  // TODO override fields explicitly?
   state.commentThreadsMap[thread._id] = {
-    id: thread._id,
     ...thread,
-    isVisible,
+    ...(state.commentThreadsMap[thread._id] || {}),
+    id: thread._id,
     comments: [...existingComments, ...(thread.comments || [])],
   };
 
@@ -38,11 +32,14 @@ const handleNewCommentThreadEvent = (
   }
   state.applicationCommentThreadsByRef[thread.applicationId] = {
     ...state.applicationCommentThreadsByRef[thread.applicationId],
-    [thread.refId]: Array.from(new Set([...threadsForRefId, thread._id])),
+    [thread.refId]: Array.from(new Set([thread._id, ...threadsForRefId])),
   };
 
+  const showUnreadIndicator = !state.isCommentMode;
+
   return {
     ...state,
+    showUnreadIndicator,
   };
 };
 
diff --git a/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentEvent.ts b/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentEvent.ts
new file mode 100644
index 0000000000..3c75803f22
--- /dev/null
+++ b/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentEvent.ts
@@ -0,0 +1,24 @@
+import { Comment } from "entities/Comments/CommentsInterfaces";
+import { ReduxAction } from "constants/ReduxActionConstants";
+import { CommentsReduxState } from "./interfaces";
+
+const handleUpdateCommentThreadEvent = (
+  state: CommentsReduxState,
+  action: ReduxAction<Comment>,
+) => {
+  const { _id, threadId } = action.payload;
+
+  const threadInState = state.commentThreadsMap[threadId as string];
+
+  if (!threadInState) return state;
+
+  const commentIdx = threadInState.comments.findIndex(
+    (comment) => comment.id === _id,
+  );
+  threadInState.comments.splice(commentIdx, 1, { ...action.payload, id: _id });
+  state.commentThreadsMap[threadId as string] = { ...threadInState };
+
+  return { ...state };
+};
+
+export default handleUpdateCommentThreadEvent;
diff --git a/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentThreadEvent.ts b/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentThreadEvent.ts
index a52f583353..78dbffe0db 100644
--- a/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentThreadEvent.ts
+++ b/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentThreadEvent.ts
@@ -3,6 +3,7 @@ import { ReduxAction } from "constants/ReduxActionConstants";
 import { get, uniqBy } from "lodash";
 import { CommentsReduxState } from "./interfaces";
 
+// TODO verify cases where commentThread can be undefined for update event
 const handleUpdateCommentThreadEvent = (
   state: CommentsReduxState,
   action: ReduxAction<Partial<CommentThread & { _id: string }>>,
@@ -11,13 +12,37 @@ const handleUpdateCommentThreadEvent = (
   const commentThreadInStore = state.commentThreadsMap[id];
   const existingComments = get(commentThreadInStore, "comments", []);
   const newComments = get(action.payload, "comments", []);
+
+  const pinnedStateChanged =
+    commentThreadInStore?.pinnedState?.active !==
+    action.payload?.pinnedState?.active;
+
+  const isNowResolved =
+    !commentThreadInStore?.resolvedState?.active &&
+    action.payload?.resolvedState?.active;
+
+  const shouldRefreshList = isNowResolved || pinnedStateChanged;
+
   state.commentThreadsMap[id] = {
-    ...commentThreadInStore,
+    ...(commentThreadInStore || {}),
     ...action.payload,
+    isViewed: commentThreadInStore?.isViewed || action.payload.isViewed, // TODO refactor this
     comments: uniqBy([...existingComments, ...newComments], "id"),
   };
 
-  return { ...state };
+  if (shouldRefreshList) {
+    state.applicationCommentThreadsByRef[
+      action.payload.applicationId as string
+    ] = {
+      ...state.applicationCommentThreadsByRef[
+        action.payload.applicationId as string
+      ],
+    };
+  }
+
+  const showUnreadIndicator = !state.isCommentMode;
+
+  return { ...state, showUnreadIndicator };
 };
 
 export default handleUpdateCommentThreadEvent;
diff --git a/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentThreadSuccess.ts b/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentThreadSuccess.ts
index 2555f7c206..68edf97ee4 100644
--- a/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentThreadSuccess.ts
+++ b/app/client/src/reducers/uiReducers/commentsReducer/handleUpdateCommentThreadSuccess.ts
@@ -11,12 +11,34 @@ const handleUpdateCommentThreadSuccess = (
   const commentThreadInStore = state.commentThreadsMap[id];
   const existingComments = get(commentThreadInStore, "comments", []);
 
+  if (!commentThreadInStore) return state;
+
+  const pinnedStateChanged =
+    commentThreadInStore?.pinnedState?.active !==
+    action.payload?.pinnedState?.active;
+
+  const isNowResolved =
+    !commentThreadInStore?.resolvedState?.active &&
+    action.payload?.resolvedState?.active;
+
+  const shouldRefreshList = isNowResolved || pinnedStateChanged;
+
   state.commentThreadsMap[id] = {
     ...commentThreadInStore,
     ...action.payload,
     comments: existingComments,
   };
 
+  if (shouldRefreshList) {
+    state.applicationCommentThreadsByRef[
+      action.payload.applicationId as string
+    ] = {
+      ...state.applicationCommentThreadsByRef[
+        action.payload.applicationId as string
+      ],
+    };
+  }
+
   return {
     ...state,
     creatingNewThreadComment: false,
diff --git a/app/client/src/reducers/uiReducers/commentsReducer/interfaces.ts b/app/client/src/reducers/uiReducers/commentsReducer/interfaces.ts
index 49ead67f15..0385abbbc0 100644
--- a/app/client/src/reducers/uiReducers/commentsReducer/interfaces.ts
+++ b/app/client/src/reducers/uiReducers/commentsReducer/interfaces.ts
@@ -1,4 +1,5 @@
 import { CommentThread } from "entities/Comments/CommentsInterfaces";
+import { options as filterOptions } from "comments/AppComments/AppCommentsFilterPopover";
 
 export interface CommentsReduxState {
   commentThreadsMap: Record<string, CommentThread>;
@@ -7,4 +8,10 @@ export interface CommentsReduxState {
   isCommentMode: boolean;
   creatingNewThread: boolean;
   creatingNewThreadComment: boolean;
+  appCommentsFilter: typeof filterOptions[number]["value"];
+  shouldShowResolvedAppCommentThreads: boolean;
+  unreadCommentThreadsCount: number;
+  visibleCommentThreadId?: string;
+  isIntroCarouselVisible?: boolean;
+  areCommentsEnabled?: boolean;
 }
diff --git a/app/client/src/reducers/uiReducers/commentsReducer/testFixtures.ts b/app/client/src/reducers/uiReducers/commentsReducer/testFixtures.ts
index 55c4e30d60..0d0811efdb 100644
--- a/app/client/src/reducers/uiReducers/commentsReducer/testFixtures.ts
+++ b/app/client/src/reducers/uiReducers/commentsReducer/testFixtures.ts
@@ -334,7 +334,6 @@ export const createCommentThreadSuccessPayload = {
     },
   ],
   new: false,
-  isVisible: true,
 };
 
 export const addCommentToThreadSuccessPayload = {
diff --git a/app/client/src/reducers/uiReducers/debuggerReducer.ts b/app/client/src/reducers/uiReducers/debuggerReducer.ts
index 4ad5fa9126..0a685b642a 100644
--- a/app/client/src/reducers/uiReducers/debuggerReducer.ts
+++ b/app/client/src/reducers/uiReducers/debuggerReducer.ts
@@ -49,7 +49,8 @@ const debuggerReducer = createReducer(initialState, {
 
     const entityId = action.payload.source.id;
     const id =
-      action.payload.logType === LOG_TYPE.WIDGET_PROPERTY_VALIDATION_ERROR
+      action.payload.logType === LOG_TYPE.WIDGET_PROPERTY_VALIDATION_ERROR ||
+      action.payload.logType === LOG_TYPE.EVAL_ERROR
         ? `${entityId}-${action.payload.source.propertyPath}`
         : entityId;
     const previousState = get(state.errors, id, {});
@@ -73,7 +74,8 @@ const debuggerReducer = createReducer(initialState, {
 
     const entityId = action.payload.source.id;
     const isWidgetErrorLog =
-      action.payload.logType === LOG_TYPE.WIDGET_PROPERTY_VALIDATION_ERROR;
+      action.payload.logType === LOG_TYPE.WIDGET_PROPERTY_VALIDATION_ERROR ||
+      action.payload.logType === LOG_TYPE.EVAL_ERROR;
     const id = isWidgetErrorLog
       ? `${entityId}-${action.payload.source.propertyPath}`
       : entityId;
@@ -105,6 +107,11 @@ const debuggerReducer = createReducer(initialState, {
       errors: { ...action.payload },
     };
   },
+  [ReduxActionTypes.INIT_CANVAS_LAYOUT]: () => {
+    return {
+      ...initialState,
+    };
+  },
 });
 
 export interface DebuggerReduxState {
diff --git a/app/client/src/reducers/uiReducers/dragResizeReducer.ts b/app/client/src/reducers/uiReducers/dragResizeReducer.ts
index 5c825b6877..f3aaddc486 100644
--- a/app/client/src/reducers/uiReducers/dragResizeReducer.ts
+++ b/app/client/src/reducers/uiReducers/dragResizeReducer.ts
@@ -1,11 +1,13 @@
 import { createImmerReducer } from "utils/AppsmithUtils";
 import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
+import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
 
 const initialState: WidgetDragResizeState = {
   isDraggingDisabled: false,
   isDragging: false,
   isResizing: false,
-  selectedWidget: undefined,
+  lastSelectedWidget: undefined,
+  selectedWidgets: [],
   focusedWidget: undefined,
   selectedWidgetAncestory: [],
 };
@@ -31,9 +33,64 @@ export const widgetDraggingReducer = createImmerReducer(initialState, {
   },
   [ReduxActionTypes.SELECT_WIDGET]: (
     state: WidgetDragResizeState,
-    action: ReduxAction<{ widgetId?: string }>,
+    action: ReduxAction<{ widgetId?: string; isMultiSelect?: boolean }>,
   ) => {
-    state.selectedWidget = action.payload.widgetId;
+    if (action.payload.widgetId === MAIN_CONTAINER_WIDGET_ID) return;
+    if (action.payload.isMultiSelect) {
+      const widgetId = action.payload.widgetId || "";
+      const removeSelection = state.selectedWidgets.includes(widgetId);
+      if (removeSelection) {
+        state.selectedWidgets = state.selectedWidgets.filter(
+          (each) => each !== widgetId,
+        );
+      } else if (!!widgetId) {
+        state.selectedWidgets = [...state.selectedWidgets, widgetId];
+      }
+      if (state.selectedWidgets.length > 0) {
+        state.lastSelectedWidget = removeSelection ? "" : widgetId;
+      }
+    } else {
+      state.lastSelectedWidget = action.payload.widgetId;
+      if (action.payload.widgetId) {
+        state.selectedWidgets = [action.payload.widgetId];
+      } else {
+        state.selectedWidgets = [];
+      }
+    }
+  },
+  [ReduxActionTypes.DESELECT_WIDGETS]: (
+    state: WidgetDragResizeState,
+    action: ReduxAction<{ widgetIds?: string[] }>,
+  ) => {
+    const { widgetIds } = action.payload;
+    if (widgetIds) {
+      state.selectedWidgets = state.selectedWidgets.filter(
+        (each) => !widgetIds.includes(each),
+      );
+    }
+  },
+  [ReduxActionTypes.SELECT_MULTIPLE_WIDGETS]: (
+    state: WidgetDragResizeState,
+    action: ReduxAction<{ widgetIds?: string[] }>,
+  ) => {
+    const { widgetIds } = action.payload;
+    if (widgetIds) {
+      state.selectedWidgets = widgetIds || [];
+      if (widgetIds.length > 1) {
+        state.lastSelectedWidget = "";
+      } else {
+        state.lastSelectedWidget = widgetIds[0];
+      }
+    }
+  },
+  [ReduxActionTypes.SELECT_WIDGETS]: (
+    state: WidgetDragResizeState,
+    action: ReduxAction<{ widgetIds?: string[] }>,
+  ) => {
+    const { widgetIds } = action.payload;
+    if (widgetIds) {
+      state.selectedWidgets = [...state.selectedWidgets, ...widgetIds];
+    }
   },
   [ReduxActionTypes.FOCUS_WIDGET]: (
     state: WidgetDragResizeState,
@@ -53,9 +110,10 @@ export type WidgetDragResizeState = {
   isDraggingDisabled: boolean;
   isDragging: boolean;
   isResizing: boolean;
-  selectedWidget?: string;
+  lastSelectedWidget?: string;
   focusedWidget?: string;
   selectedWidgetAncestory: string[];
+  selectedWidgets: string[];
 };
 
 export default widgetDraggingReducer;
diff --git a/app/client/src/reducers/uiReducers/editorReducer.tsx b/app/client/src/reducers/uiReducers/editorReducer.tsx
index f4dfa33458..877721b1fd 100644
--- a/app/client/src/reducers/uiReducers/editorReducer.tsx
+++ b/app/client/src/reducers/uiReducers/editorReducer.tsx
@@ -97,17 +97,23 @@ const editorReducer = createReducer(initialState, {
     state.loadingStates.savingError = true;
     return { ...state };
   },
+  [ReduxActionTypes.SET_LAST_UPDATED_TIME]: (
+    state: EditorReduxState,
+    actions: ReduxAction<number>,
+  ) => {
+    return { ...state, lastUpdatedTime: actions.payload };
+  },
   [ReduxActionTypes.INIT_CANVAS_LAYOUT]: (
     state: EditorReduxState,
     action: ReduxAction<UpdateCanvasPayload>,
   ) => {
     const {
-      currentPageName,
-      currentLayoutId,
-      pageWidgetId,
       currentApplicationId,
+      currentLayoutId,
       currentPageId,
+      currentPageName,
       pageActions,
+      pageWidgetId,
     } = action.payload;
     state.loadingStates.publishing = false;
     state.loadingStates.publishingError = false;
@@ -174,6 +180,7 @@ export interface EditorReduxState {
   currentLayoutId?: string;
   currentPageName?: string;
   currentPageId?: string;
+  lastUpdatedTime?: number;
   pageActions?: PageAction[][];
   loadingStates: {
     saving: boolean;
diff --git a/app/client/src/reducers/uiReducers/globalSearchReducer.ts b/app/client/src/reducers/uiReducers/globalSearchReducer.ts
index 8699621722..316c182714 100644
--- a/app/client/src/reducers/uiReducers/globalSearchReducer.ts
+++ b/app/client/src/reducers/uiReducers/globalSearchReducer.ts
@@ -22,7 +22,7 @@ const globalSearchReducer = createReducer(initialState, {
     action: ReduxAction<Array<RecentEntity>>,
   ) => ({
     ...state,
-    recentEntities: action.payload,
+    recentEntities: (action.payload || []).filter((a: RecentEntity) => a),
   }),
   [ReduxActionTypes.RESET_RECENT_ENTITIES]: (
     state: GlobalSearchReduxState,
diff --git a/app/client/src/reducers/uiReducers/index.tsx b/app/client/src/reducers/uiReducers/index.tsx
index 15348b5f9f..f8f9a85893 100644
--- a/app/client/src/reducers/uiReducers/index.tsx
+++ b/app/client/src/reducers/uiReducers/index.tsx
@@ -29,6 +29,9 @@ import releasesReducer from "./releasesReducer";
 import commentsReducer from "./commentsReducer/commentsReducer";
 import websocketReducer from "./websocketReducer";
 import debuggerReducer from "./debuggerReducer";
+import tourReducer from "./tourReducer";
+import notificationsReducer from "./notificationsReducer";
+import canvasSelectionReducer from "./canvasSelectionReducer";
 
 const uiReducer = combineReducers({
   widgetSidebar: widgetSidebarReducer,
@@ -61,6 +64,9 @@ const uiReducer = combineReducers({
   comments: commentsReducer,
   websocket: websocketReducer,
   debugger: debuggerReducer,
+  tour: tourReducer,
+  notifications: notificationsReducer,
+  canvasSelection: canvasSelectionReducer,
 });
 
 export default uiReducer;
diff --git a/app/client/src/reducers/uiReducers/notificationsReducer.ts b/app/client/src/reducers/uiReducers/notificationsReducer.ts
new file mode 100644
index 0000000000..22ba042980
--- /dev/null
+++ b/app/client/src/reducers/uiReducers/notificationsReducer.ts
@@ -0,0 +1,103 @@
+import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
+import { AppsmithNotification } from "entities/Notification";
+import { uniqBy } from "lodash";
+import { createReducer } from "utils/AppsmithUtils";
+
+const initialState: NotificationReducerState = {
+  unreadNotificationsCount: 0,
+  showNotificationsMenu: false,
+  notifications: [],
+  fetchingNotifications: false,
+};
+
+const tourReducer = createReducer(initialState, {
+  [ReduxActionTypes.FETCH_NOTIFICATIONS_REQUEST]: (
+    state: NotificationReducerState,
+  ) => ({
+    ...state,
+    fetchingNotifications: true,
+  }),
+  [ReduxActionTypes.RESET_NOTIFICATIONS]: (
+    state: NotificationReducerState,
+    action: ReduxAction<{ notifications: Array<AppsmithNotification> }>,
+  ) => {
+    return {
+      ...state,
+      fetchingNotifications: false,
+      notifications: action.payload.notifications,
+    };
+  },
+  [ReduxActionTypes.FETCH_NOTIFICATIONS_SUCCESS]: (
+    state: NotificationReducerState,
+    action: ReduxAction<{ notifications: Array<AppsmithNotification> }>,
+  ) => {
+    return {
+      ...state,
+      fetchingNotifications: false,
+      notifications: uniqBy(
+        [...state.notifications, ...action.payload.notifications],
+        "id",
+      ),
+    };
+  },
+  [ReduxActionTypes.NEW_NOTIFICATION_EVENT]: (
+    state: NotificationReducerState,
+    action: ReduxAction<AppsmithNotification>,
+  ) => {
+    if (!state.showNotificationsMenu) {
+      state.unreadNotificationsCount += 1;
+    }
+
+    return {
+      ...state,
+      notifications: uniqBy(
+        [{ ...action.payload, id: action.payload._id }, ...state.notifications],
+        "id",
+      ),
+    };
+  },
+  [ReduxActionTypes.SET_IS_NOTIFICATIONS_LIST_VISIBLE]: (
+    state: NotificationReducerState,
+    action: ReduxAction<boolean>,
+  ) => ({
+    ...state,
+    showNotificationsMenu: action.payload,
+  }),
+  [ReduxActionTypes.FETCH_UNREAD_NOTIFICATIONS_COUNT_SUCCESS]: (
+    state: NotificationReducerState,
+    action: ReduxAction<number>,
+  ) => ({
+    ...state,
+    unreadNotificationsCount: action.payload,
+  }),
+  [ReduxActionTypes.MARK_NOTIFICATION_AS_READ_SUCCESS]: (
+    state: NotificationReducerState,
+    action: ReduxAction<string>,
+  ) => {
+    const notification = state.notifications.find(
+      (notification: AppsmithNotification) => {
+        const { _id, id } = notification;
+        const notificationId = _id || id;
+        return notificationId === action.payload;
+      },
+    );
+
+    if (notification) {
+      notification.isRead = true;
+    }
+
+    return {
+      ...state,
+      notifications: [...state.notifications],
+    };
+  },
+});
+
+export type NotificationReducerState = {
+  unreadNotificationsCount: number;
+  notifications: Array<AppsmithNotification>;
+  showNotificationsMenu: boolean;
+  fetchingNotifications: boolean;
+};
+
+export default tourReducer;
diff --git a/app/client/src/reducers/uiReducers/orgReducer.ts b/app/client/src/reducers/uiReducers/orgReducer.ts
index 984506b53d..9207c16725 100644
--- a/app/client/src/reducers/uiReducers/orgReducer.ts
+++ b/app/client/src/reducers/uiReducers/orgReducer.ts
@@ -78,6 +78,14 @@ const orgReducer = createImmerReducer(initialState, {
       }
     });
   },
+  [ReduxActionErrorTypes.CHANGE_ORG_USER_ROLE_ERROR]: (
+    draftState: OrgReduxState,
+  ) => {
+    draftState.orgUsers.forEach((user: OrgUser) => {
+      //TODO: This will change the status to false even if one role change api fails.
+      user.isChangingRole = false;
+    });
+  },
   [ReduxActionTypes.DELETE_ORG_USER_INIT]: (
     draftState: OrgReduxState,
     action: ReduxAction<{ username: string }>,
@@ -96,14 +104,6 @@ const orgReducer = createImmerReducer(initialState, {
       (user: OrgUser) => user.username !== action.payload.username,
     );
   },
-  [ReduxActionErrorTypes.CHANGE_ORG_USER_ROLE_ERROR]: (
-    draftState: OrgReduxState,
-  ) => {
-    draftState.orgUsers.forEach((user: OrgUser) => {
-      //TODO: This will change the status to false even if one role change api fails.
-      user.isChangingRole = false;
-    });
-  },
   [ReduxActionErrorTypes.DELETE_ORG_USER_ERROR]: (
     draftState: OrgReduxState,
   ) => {
diff --git a/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx b/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx
index 37a04e7579..0b559556d8 100644
--- a/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx
+++ b/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx
@@ -24,7 +24,7 @@ const propertyPaneReducer = createReducer(initialState, {
     ) {
       return state;
     }
-    const { widgetId, callForDragOrResize } = action.payload;
+    const { callForDragOrResize, widgetId } = action.payload;
     // If callForDragOrResize is true, an action has started or ended.
     // If the action has started, isVisibleBeforeAction should be undefined
     // If the action has ended, isVisibleBeforeAction should be the visible state
diff --git a/app/client/src/reducers/uiReducers/queryPaneReducer.ts b/app/client/src/reducers/uiReducers/queryPaneReducer.ts
index d4e9aef6d4..d954fea897 100644
--- a/app/client/src/reducers/uiReducers/queryPaneReducer.ts
+++ b/app/client/src/reducers/uiReducers/queryPaneReducer.ts
@@ -145,7 +145,7 @@ const queryPaneReducer = createReducer(initialState, {
     state: any,
     action: ReduxAction<{ id: string; error: Error }>,
   ) => {
-    const { id, error } = action.payload;
+    const { error, id } = action.payload;
 
     return {
       ...state,
diff --git a/app/client/src/reducers/uiReducers/tourReducer.ts b/app/client/src/reducers/uiReducers/tourReducer.ts
new file mode 100644
index 0000000000..751534533a
--- /dev/null
+++ b/app/client/src/reducers/uiReducers/tourReducer.ts
@@ -0,0 +1,40 @@
+import { createReducer } from "utils/AppsmithUtils";
+import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
+import { TourType } from "entities/Tour";
+
+const initialState: TourReducerState = {
+  isTourInProgress: false,
+  activeTourIndex: -1,
+  activeTourType: undefined,
+};
+
+const tourReducer = createReducer(initialState, {
+  [ReduxActionTypes.SET_ACTIVE_TOUR]: (
+    state: TourReducerState,
+    action: ReduxAction<TourType>,
+  ) => ({
+    ...state,
+    activeTourType: action.payload,
+    activeTourIndex: 0,
+  }),
+  [ReduxActionTypes.RESET_ACTIVE_TOUR]: (state: TourReducerState) => ({
+    ...state,
+    activeTourType: undefined,
+    activeTourIndex: -1,
+  }),
+  [ReduxActionTypes.SET_ACTIVE_TOUR_INDEX]: (
+    state: TourReducerState,
+    action: ReduxAction<number>,
+  ) => ({
+    ...state,
+    activeTourIndex: action.payload,
+  }),
+});
+
+export type TourReducerState = {
+  isTourInProgress: boolean;
+  activeTourType?: TourType;
+  activeTourIndex: number;
+};
+
+export default tourReducer;
diff --git a/app/client/src/resizable/index.tsx b/app/client/src/resizable/index.tsx
index 360e82840b..0647b0e5dd 100644
--- a/app/client/src/resizable/index.tsx
+++ b/app/client/src/resizable/index.tsx
@@ -2,6 +2,9 @@ import React, { ReactNode, useState, useEffect, forwardRef, Ref } from "react";
 import styled, { StyledComponent } from "styled-components";
 import { useDrag } from "react-use-gesture";
 import { Spring } from "react-spring/renderprops";
+import PerformanceTracker, {
+  PerformanceTransactionName,
+} from "utils/PerformanceTracker";
 
 const ResizeWrapper = styled.div<{ pevents: boolean }>`
   display: block;
@@ -56,14 +59,14 @@ function ResizableHandle(props: ResizableHandleProps) {
 
 type ResizableProps = {
   handles: {
-    left: StyledComponent<"div", Record<string, unknown>>;
-    top: StyledComponent<"div", Record<string, unknown>>;
-    bottom: StyledComponent<"div", Record<string, unknown>>;
-    right: StyledComponent<"div", Record<string, unknown>>;
-    bottomRight: StyledComponent<"div", Record<string, unknown>>;
-    topLeft: StyledComponent<"div", Record<string, unknown>>;
-    topRight: StyledComponent<"div", Record<string, unknown>>;
-    bottomLeft: StyledComponent<"div", Record<string, unknown>>;
+    left?: StyledComponent<"div", Record<string, unknown>>;
+    top?: StyledComponent<"div", Record<string, unknown>>;
+    bottom?: StyledComponent<"div", Record<string, unknown>>;
+    right?: StyledComponent<"div", Record<string, unknown>>;
+    bottomRight?: StyledComponent<"div", Record<string, unknown>>;
+    topLeft?: StyledComponent<"div", Record<string, unknown>>;
+    topRight?: StyledComponent<"div", Record<string, unknown>>;
+    bottomLeft?: StyledComponent<"div", Record<string, unknown>>;
   };
   componentWidth: number;
   componentHeight: number;
@@ -80,192 +83,235 @@ type ResizableProps = {
     position: { x: number; y: number },
   ) => boolean;
   className?: string;
+  zWidgetType?: string;
+  zWidgetId?: string;
 };
 
-export const Resizable = forwardRef(
-  (props: ResizableProps, ref: Ref<HTMLDivElement>) => {
-    const [pointerEvents, togglePointerEvents] = useState(true);
-    const [newDimensions, set] = useState({
+export const Resizable = forwardRef(function Resizable(
+  props: ResizableProps,
+  ref: Ref<HTMLDivElement>,
+) {
+  // Performance tracking start
+  const sentryPerfTags = props.zWidgetType
+    ? [{ name: "widget_type", value: props.zWidgetType }]
+    : [];
+  PerformanceTracker.startTracking(
+    PerformanceTransactionName.SHOW_RESIZE_HANDLES,
+    { widgetId: props.zWidgetId },
+    true,
+    sentryPerfTags,
+  );
+
+  useEffect(() => {
+    PerformanceTracker.stopTracking(
+      PerformanceTransactionName.SHOW_RESIZE_HANDLES,
+    );
+  });
+  //end
+  const [pointerEvents, togglePointerEvents] = useState(true);
+  const [newDimensions, set] = useState({
+    width: props.componentWidth,
+    height: props.componentHeight,
+    x: 0,
+    y: 0,
+    reset: false,
+  });
+
+  const setNewDimensions = (rect: {
+    width: number;
+    height: number;
+    x: number;
+    y: number;
+  }) => {
+    const { height, width, x, y } = rect;
+    const isColliding = props.isColliding({ width, height }, { x, y });
+    if (!isColliding) {
+      set({ ...rect, reset: false });
+    }
+  };
+
+  useEffect(() => {
+    set({
       width: props.componentWidth,
       height: props.componentHeight,
       x: 0,
       y: 0,
-      reset: false,
+      reset: true,
     });
+  }, [props.componentHeight, props.componentWidth]);
 
-    const setNewDimensions = (rect: {
-      width: number;
-      height: number;
-      x: number;
-      y: number;
-    }) => {
-      const { width, height, x, y } = rect;
-      const isColliding = props.isColliding({ width, height }, { x, y });
-      if (!isColliding) {
-        set({ ...rect, reset: false });
-      }
-    };
+  const handles = [];
 
-    useEffect(() => {
-      set({
-        width: props.componentWidth,
-        height: props.componentHeight,
-        x: 0,
-        y: 0,
-        reset: true,
-      });
-    }, [props.componentHeight, props.componentWidth]);
-
-    const handles = [
-      {
-        dragCallback: (x: number) => {
-          setNewDimensions({
-            width: props.componentWidth - x,
-            height: newDimensions.height,
-            x,
-            y: newDimensions.y,
-          });
-        },
-        component: props.handles.left,
-      },
-      {
-        dragCallback: (x: number) => {
-          setNewDimensions({
-            width: props.componentWidth + x,
-            height: newDimensions.height,
-            x: newDimensions.x,
-            y: newDimensions.y,
-          });
-        },
-        component: props.handles.right,
-      },
-      {
-        dragCallback: (x: number, y: number) => {
-          setNewDimensions({
-            width: newDimensions.width,
-            height: props.componentHeight - y,
-            y: y,
-            x: newDimensions.x,
-          });
-        },
-        component: props.handles.top,
-      },
-      {
-        dragCallback: (x: number, y: number) => {
-          setNewDimensions({
-            width: newDimensions.width,
-            height: props.componentHeight + y,
-            x: newDimensions.x,
-            y: newDimensions.y,
-          });
-        },
-        component: props.handles.bottom,
-      },
-      {
-        dragCallback: (x: number, y: number) => {
-          setNewDimensions({
-            width: props.componentWidth + x,
-            height: props.componentHeight + y,
-            x: newDimensions.x,
-            y: newDimensions.y,
-          });
-        },
-        component: props.handles.bottomRight,
-      },
-      {
-        dragCallback: (x: number, y: number) => {
-          setNewDimensions({
-            width: props.componentWidth - x,
-            height: props.componentHeight + y,
-            x,
-            y: newDimensions.y,
-          });
-        },
-        component: props.handles.bottomLeft,
-      },
-      {
-        dragCallback: (x: number, y: number) => {
-          setNewDimensions({
-            width: props.componentWidth + x,
-            height: props.componentHeight - y,
-            x: newDimensions.x,
-            y: y,
-          });
-        },
-        component: props.handles.topRight,
-      },
-      {
-        dragCallback: (x: number, y: number) => {
-          setNewDimensions({
-            width: props.componentWidth - x,
-            height: props.componentHeight - y,
-            x: x,
-            y: y,
-          });
-        },
-        component: props.handles.topLeft,
-      },
-    ];
-
-    const onResizeStop = () => {
-      togglePointerEvents(true);
-      props.onStop(
-        {
-          width: newDimensions.width,
+  if (props.handles.left) {
+    handles.push({
+      dragCallback: (x: number) => {
+        setNewDimensions({
+          width: props.componentWidth - x,
+          height: newDimensions.height,
+          x,
+          y: newDimensions.y,
+        });
+      },
+      component: props.handles.left,
+    });
+  }
+
+  if (props.handles.right) {
+    handles.push({
+      dragCallback: (x: number) => {
+        setNewDimensions({
+          width: props.componentWidth + x,
           height: newDimensions.height,
-        },
-        {
           x: newDimensions.x,
           y: newDimensions.y,
-        },
-      );
-    };
+        });
+      },
+      component: props.handles.right,
+    });
+  }
 
-    const renderHandles = handles.map((handle, index) => (
-      <ResizableHandle
-        {...handle}
-        key={index}
-        onStart={() => {
-          togglePointerEvents(false);
-          props.onStart();
-        }}
-        onStop={onResizeStop}
-        snapGrid={props.snapGrid}
-      />
-    ));
-
-    return (
-      <Spring
-        config={{
-          clamp: true,
-          friction: 0,
-          tension: 999,
-        }}
-        from={{
-          width: props.componentWidth,
-          height: props.componentHeight,
-        }}
-        immediate={newDimensions.reset ? true : false}
-        to={{
+  if (props.handles.bottom) {
+    handles.push({
+      dragCallback: (x: number, y: number) => {
+        setNewDimensions({
           width: newDimensions.width,
-          height: newDimensions.height,
-          transform: `translate3d(${newDimensions.x}px,${newDimensions.y}px,0)`,
-        }}
-      >
-        {(_props) => (
-          <ResizeWrapper
-            className={props.className}
-            pevents={pointerEvents}
-            ref={ref}
-            style={_props}
-          >
-            {props.children}
-            {props.enable && renderHandles}
-          </ResizeWrapper>
-        )}
-      </Spring>
+          height: props.componentHeight + y,
+          x: newDimensions.x,
+          y: newDimensions.y,
+        });
+      },
+      component: props.handles.bottom,
+    });
+  }
+
+  if (props.handles.bottomRight) {
+    handles.push({
+      dragCallback: (x: number, y: number) => {
+        setNewDimensions({
+          width: props.componentWidth + x,
+          height: props.componentHeight + y,
+          x: newDimensions.x,
+          y: newDimensions.y,
+        });
+      },
+      component: props.handles.bottomRight,
+    });
+  }
+
+  if (props.handles.bottomLeft) {
+    handles.push({
+      dragCallback: (x: number, y: number) => {
+        setNewDimensions({
+          width: props.componentWidth - x,
+          height: props.componentHeight + y,
+          x,
+          y: newDimensions.y,
+        });
+      },
+      component: props.handles.bottomLeft,
+    });
+  }
+
+  if (props.handles.topRight) {
+    handles.push({
+      dragCallback: (x: number, y: number) => {
+        setNewDimensions({
+          width: props.componentWidth + x,
+          height: props.componentHeight - y,
+          x: newDimensions.x,
+          y: y,
+        });
+      },
+      component: props.handles.topRight,
+    });
+  }
+
+  if (props.handles.topLeft) {
+    handles.push({
+      dragCallback: (x: number, y: number) => {
+        setNewDimensions({
+          width: props.componentWidth - x,
+          height: props.componentHeight - y,
+          x: x,
+          y: y,
+        });
+      },
+      component: props.handles.topLeft,
+    });
+  }
+
+  if (props.handles.top) {
+    handles.push({
+      dragCallback: (x: number, y: number) => {
+        setNewDimensions({
+          width: newDimensions.width,
+          height: props.componentHeight - y,
+          y: y,
+          x: newDimensions.x,
+        });
+      },
+      component: props.handles.top,
+    });
+  }
+
+  const onResizeStop = () => {
+    togglePointerEvents(true);
+    props.onStop(
+      {
+        width: newDimensions.width,
+        height: newDimensions.height,
+      },
+      {
+        x: newDimensions.x,
+        y: newDimensions.y,
+      },
     );
-  },
-);
+  };
+
+  const renderHandles = handles.map((handle, index) => (
+    <ResizableHandle
+      {...handle}
+      key={index}
+      onStart={() => {
+        togglePointerEvents(false);
+        props.onStart();
+      }}
+      onStop={onResizeStop}
+      snapGrid={props.snapGrid}
+    />
+  ));
+
+  return (
+    <Spring
+      config={{
+        clamp: true,
+        friction: 0,
+        tension: 999,
+      }}
+      from={{
+        width: props.componentWidth,
+        height: props.componentHeight,
+      }}
+      immediate={newDimensions.reset ? true : false}
+      to={{
+        width: newDimensions.width,
+        height: newDimensions.height,
+        transform: `translate3d(${newDimensions.x}px,${newDimensions.y}px,0)`,
+      }}
+    >
+      {(_props) => (
+        <ResizeWrapper
+          className={props.className}
+          pevents={pointerEvents}
+          ref={ref}
+          style={_props}
+        >
+          {props.children}
+          {props.enable && renderHandles}
+        </ResizeWrapper>
+      )}
+    </Spring>
+  );
+});
 
 export default Resizable;
diff --git a/app/client/src/sagas/ActionExecutionSagas.ts b/app/client/src/sagas/ActionExecutionSagas.ts
index 06148a2194..27725b110a 100644
--- a/app/client/src/sagas/ActionExecutionSagas.ts
+++ b/app/client/src/sagas/ActionExecutionSagas.ts
@@ -37,13 +37,20 @@ import _, { get, isString } from "lodash";
 import AnalyticsUtil, { EventName } from "utils/AnalyticsUtil";
 import history from "utils/history";
 import {
+  API_EDITOR_ID_URL,
+  API_EDITOR_URL,
+  API_EDITOR_URL_WITH_SELECTED_PAGE_ID,
   BUILDER_PAGE_URL,
   convertToQueryParams,
   getApplicationViewerPageURL,
+  QUERIES_EDITOR_ID_URL,
+  QUERIES_EDITOR_URL,
+  INTEGRATION_EDITOR_URL,
 } from "constants/routes";
 import {
   executeApiActionRequest,
   executeApiActionSuccess,
+  executePageLoadActionsComplete,
   showRunActionConfirmModal,
   updateAction,
 } from "actions/actionActions";
@@ -108,6 +115,7 @@ import {
 import AppsmithConsole from "utils/AppsmithConsole";
 import { ENTITY_TYPE } from "entities/AppsmithConsole";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
+import { matchPath } from "react-router";
 
 export enum NavigationTargetType {
   SAME_WINDOW = "SAME_WINDOW",
@@ -446,7 +454,7 @@ export function* executeActionSaga(
   apiAction: RunActionPayload,
   event: ExecuteActionPayloadEvent,
 ) {
-  const { actionId, onSuccess, onError, params } = apiAction;
+  const { actionId, onError, onSuccess, params } = apiAction;
   PerformanceTracker.startAsyncTracking(
     PerformanceTransactionName.EXECUTE_ACTION,
     {
@@ -527,7 +535,7 @@ export function* executeActionSaga(
           id: actionId,
         },
         state: response.data?.request ?? null,
-        message: payload.body as string,
+        messages: [{ message: payload.body as string }],
       });
       PerformanceTracker.stopAsyncTracking(
         PerformanceTransactionName.EXECUTE_ACTION,
@@ -553,6 +561,7 @@ export function* executeActionSaga(
       Toaster.show({
         text: createMessage(ERROR_API_EXECUTE, api.name),
         variant: Variant.danger,
+        showDebugButton: true,
       });
     } else {
       PerformanceTracker.stopAsyncTracking(
@@ -607,6 +616,7 @@ export function* executeActionSaga(
     Toaster.show({
       text: createMessage(ERROR_API_EXECUTE, api.name),
       variant: Variant.danger,
+      showDebugButton: true,
     });
     if (onError) {
       yield put(
@@ -701,6 +711,42 @@ function* executeAppAction(action: ReduxAction<ExecuteActionPayload>) {
   }
 }
 
+function* runActionShortcutSaga() {
+  const location = window.location.pathname;
+  const match: any = matchPath(location, {
+    path: [
+      API_EDITOR_URL(),
+      API_EDITOR_ID_URL(),
+      QUERIES_EDITOR_URL(),
+      QUERIES_EDITOR_ID_URL(),
+      API_EDITOR_URL_WITH_SELECTED_PAGE_ID(),
+      INTEGRATION_EDITOR_URL(),
+    ],
+    exact: true,
+    strict: false,
+  });
+  if (!match || !match.params) return;
+  const { apiId, pageId, queryId } = match.params;
+  const actionId = apiId || queryId;
+  if (!actionId) return;
+  const trackerId = apiId
+    ? PerformanceTransactionName.RUN_API_SHORTCUT
+    : PerformanceTransactionName.RUN_QUERY_SHORTCUT;
+  PerformanceTracker.startTracking(trackerId, {
+    actionId,
+    pageId,
+  });
+  AnalyticsUtil.logEvent(trackerId as EventName, {
+    actionId,
+  });
+  yield put({
+    type: ReduxActionTypes.RUN_ACTION_INIT,
+    payload: {
+      id: actionId,
+    },
+  });
+}
+
 function* runActionInitSaga(
   reduxAction: ReduxAction<{
     id: string;
@@ -828,15 +874,19 @@ function* runActionSaga(
             name: actionObject.name,
             id: actionId,
           },
-          message: !isString(payload.body)
-            ? JSON.stringify(payload.body)
-            : payload.body,
+          messages: [
+            {
+              message: !isString(payload.body)
+                ? JSON.stringify(payload.body)
+                : payload.body,
+            },
+          ],
           state: response.data?.request ?? null,
         });
 
         Toaster.show({
           text: createMessage(ERROR_ACTION_EXECUTE_FAIL, actionObject.name),
-          variant: Variant.warning,
+          variant: Variant.danger,
         });
       }
     } else {
@@ -930,6 +980,18 @@ function* executePageLoadAction(pageAction: PageAction) {
         message += `\nERROR: "${body}"`;
       }
 
+      AppsmithConsole.error({
+        logType: LOG_TYPE.ACTION_EXECUTION_ERROR,
+        text: `Execution failed with status ${response.data.statusCode}`,
+        source: {
+          type: ENTITY_TYPE.ACTION,
+          name: pageAction.name,
+          id: pageAction.id,
+        },
+        state: response.data?.request ?? null,
+        messages: [{ message: JSON.stringify(body) }],
+      });
+
       yield put(
         executeActionError({
           actionId: pageAction.id,
@@ -997,6 +1059,8 @@ function* executePageLoadActionsSaga() {
     PerformanceTracker.stopAsyncTracking(
       PerformanceTransactionName.EXECUTE_PAGE_LOAD_ACTIONS,
     );
+
+    yield put(executePageLoadActionsComplete());
   } catch (e) {
     log.error(e);
 
@@ -1012,6 +1076,10 @@ export function* watchActionExecutionSagas() {
     takeEvery(ReduxActionTypes.EXECUTE_ACTION, executeAppAction),
     takeLatest(ReduxActionTypes.RUN_ACTION_REQUEST, runActionSaga),
     takeLatest(ReduxActionTypes.RUN_ACTION_INIT, runActionInitSaga),
+    takeLatest(
+      ReduxActionTypes.RUN_ACTION_SHORTCUT_REQUEST,
+      runActionShortcutSaga,
+    ),
     takeLatest(
       ReduxActionTypes.EXECUTE_PAGE_LOAD_ACTIONS,
       executePageLoadActionsSaga,
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index 7cd345d7ba..9bf0063f16 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -9,6 +9,7 @@ import {
   call,
   put,
   select,
+  take,
   takeEvery,
   takeLatest,
 } from "redux-saga/effects";
@@ -20,6 +21,7 @@ import { updateCanvasWithDSL } from "sagas/PageSagas";
 import {
   copyActionError,
   copyActionSuccess,
+  createActionRequest,
   createActionSuccess,
   deleteActionSuccess,
   fetchActionsForPage,
@@ -55,13 +57,14 @@ import {
   getPlugin,
   getSettingConfig,
   getDatasources,
+  getActions,
 } from "selectors/entitiesSelector";
 import history from "utils/history";
 import {
   API_EDITOR_ID_URL,
-  API_EDITOR_URL,
+  INTEGRATION_EDITOR_URL,
+  INTEGRATION_TABS,
   QUERIES_EDITOR_ID_URL,
-  QUERIES_EDITOR_URL,
 } from "constants/routes";
 import { Toaster } from "components/ads/Toast";
 import { Variant } from "components/ads/common";
@@ -78,12 +81,15 @@ import {
   ERROR_ACTION_MOVE_FAIL,
   ERROR_ACTION_RENAME_FAIL,
 } from "constants/messages";
-import _, { merge } from "lodash";
+import _, { merge, get } from "lodash";
 import { getConfigInitialValues } from "components/formControls/utils";
 import AppsmithConsole from "utils/AppsmithConsole";
 import { ENTITY_TYPE } from "entities/AppsmithConsole";
 import { SAAS_EDITOR_API_ID_URL } from "pages/Editor/SaaSEditor/constants";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
+import { createNewApiAction } from "actions/apiPaneActions";
+import { createNewApiName, createNewQueryName } from "utils/AppsmithUtils";
+import { DEFAULT_API_ACTION_CONFIG } from "constants/ApiEditorConstants";
 
 export function* createActionSaga(
   actionPayload: ReduxAction<
@@ -330,7 +336,11 @@ export function* updateActionSaga(actionPayload: ReduxAction<{ id: string }>) {
 }
 
 export function* deleteActionSaga(
-  actionPayload: ReduxAction<{ id: string; name: string }>,
+  actionPayload: ReduxAction<{
+    id: string;
+    name: string;
+    onSuccess?: () => void;
+  }>,
 ) {
   try {
     const id = actionPayload.payload.id;
@@ -371,14 +381,16 @@ export function* deleteActionSaga(
           queryName: action.name,
         });
       }
-      const applicationId = yield select(getCurrentApplicationId);
-      const pageId = yield select(getCurrentPageId);
-      if (isApi || isSaas) {
-        history.push(API_EDITOR_URL(applicationId, pageId));
-      }
 
-      if (isQuery) {
-        history.push(QUERIES_EDITOR_URL(applicationId, pageId));
+      if (!!actionPayload.payload.onSuccess) {
+        actionPayload.payload.onSuccess();
+      } else {
+        const applicationId = yield select(getCurrentApplicationId);
+        const pageId = yield select(getCurrentPageId);
+
+        history.push(
+          INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.NEW),
+        );
       }
 
       AppsmithConsole.info({
@@ -619,20 +631,26 @@ function getDynamicBindingsChangesSaga(
 }
 
 function* setActionPropertySaga(action: ReduxAction<SetActionPropertyPayload>) {
-  const { actionId, value, propertyName } = action.payload;
+  const { actionId, propertyName, value } = action.payload;
   if (!actionId) return;
   if (propertyName === "name") return;
 
   const actionObj = yield select(getAction, actionId);
+  const fieldToBeUpdated = propertyName.replace(
+    "actionConfiguration",
+    "config",
+  );
   AppsmithConsole.info({
+    logType: LOG_TYPE.ACTION_UPDATE,
     text: "Configuration updated",
     source: {
       type: ENTITY_TYPE.ACTION,
       name: actionObj.name,
       id: actionId,
+      propertyPath: fieldToBeUpdated,
     },
     state: {
-      [propertyName]: value,
+      [fieldToBeUpdated]: value,
     },
   });
 
@@ -715,6 +733,64 @@ function* handleMoveOrCopySaga(actionPayload: ReduxAction<{ id: string }>) {
   }
 }
 
+function* executeCommand(
+  actionPayload: ReduxAction<{
+    actionType: string;
+    callback: (binding: string) => void;
+    args: any;
+  }>,
+) {
+  const pageId = yield select(getCurrentPageId);
+  const applicationId = yield select(getCurrentApplicationId);
+  switch (actionPayload.payload.actionType) {
+    case "NEW_INTEGRATION":
+      history.push(
+        INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.NEW),
+      );
+      break;
+    case "NEW_QUERY":
+      const datasource = get(actionPayload, "payload.args.datasource");
+      const pluginId = get(datasource, "pluginId");
+      const plugin = yield select(getPlugin, pluginId);
+      const actions = yield select(getActions);
+      const pageActions = actions.filter(
+        (a: ActionData) => a.config.pageId === pageId,
+      );
+      const newQueryName =
+        plugin.type === PluginType.DB
+          ? createNewQueryName(actions, pageId)
+          : createNewApiName(pageActions, pageId);
+      const nextPayload: Partial<Action> = {
+        name: newQueryName,
+        pageId,
+        eventData: {
+          actionType: "Query",
+          from: "Quick-Commands",
+          dataSource: datasource.name,
+        },
+        pluginId: datasource.pluginId,
+        actionConfiguration: {},
+      };
+      if (plugin.type === "API") {
+        nextPayload.datasource = datasource;
+        nextPayload.actionConfiguration = DEFAULT_API_ACTION_CONFIG;
+      } else {
+        nextPayload.datasource = {
+          id: datasource.id,
+        };
+      }
+      yield put(createActionRequest(nextPayload));
+      const QUERY = yield take(ReduxActionTypes.CREATE_ACTION_SUCCESS);
+      actionPayload.payload.callback(`{{${QUERY.payload.name}.data}}`);
+      break;
+    case "NEW_API":
+      yield put(createNewApiAction(pageId, "QUICK_COMMANDS"));
+      const API = yield take(ReduxActionTypes.CREATE_ACTION_SUCCESS);
+      actionPayload.payload.callback(`{{${API.payload.name}.data}}`);
+      break;
+  }
+}
+
 export function* watchActionSagas() {
   yield all([
     takeEvery(ReduxActionTypes.SET_ACTION_PROPERTY, setActionPropertySaga),
@@ -741,5 +817,6 @@ export function* watchActionSagas() {
       ReduxActionTypes.TOGGLE_ACTION_EXECUTE_ON_LOAD_INIT,
       toggleActionExecuteOnLoadSaga,
     ),
+    takeLatest(ReduxActionTypes.EXECUTE_COMMAND, executeCommand),
   ]);
 }
diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts
index 13c188c371..a1feac619d 100644
--- a/app/client/src/sagas/ApiPaneSagas.ts
+++ b/app/client/src/sagas/ApiPaneSagas.ts
@@ -1,7 +1,9 @@
 /**
  * Handles the Api pane ui state. It looks into the routing based on actions too
  * */
-import { get, omit, cloneDeep } from "lodash";
+import get from "lodash/get";
+import omit from "lodash/omit";
+import cloneDeep from "lodash/cloneDeep";
 import { all, select, put, takeEvery, call, take } from "redux-saga/effects";
 import * as Sentry from "@sentry/react";
 import {
@@ -25,10 +27,10 @@ import {
 import history from "utils/history";
 import {
   API_EDITOR_ID_URL,
-  QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID,
-  DATA_SOURCES_EDITOR_URL,
-  API_EDITOR_URL_WITH_SELECTED_PAGE_ID,
   DATA_SOURCES_EDITOR_ID_URL,
+  INTEGRATION_EDITOR_MODES,
+  INTEGRATION_EDITOR_URL,
+  INTEGRATION_TABS,
 } from "constants/routes";
 import {
   getCurrentApplicationId,
@@ -66,66 +68,42 @@ import { Toaster } from "components/ads/Toast";
 import { createMessage, ERROR_ACTION_RENAME_FAIL } from "constants/messages";
 import { checkCurrentStep } from "./OnboardingSagas";
 import { OnboardingStep } from "constants/OnboardingConstants";
-import { getIndextoUpdate } from "utils/ApiPaneUtils";
+import {
+  getIndextoUpdate,
+  parseUrlForQueryParams,
+  queryParamsRegEx,
+} from "utils/ApiPaneUtils";
 
 function* syncApiParamsSaga(
   actionPayload: ReduxActionWithMeta<string, { field: string }>,
   actionId: string,
 ) {
   const field = actionPayload.meta.field;
+  //Payload here contains the path and query params of a typical url like https://{domain}/{path}?{query_params}
   const value = actionPayload.payload;
-  const padQueryParams = { key: "", value: "" };
+  // Regular expression to find the query params group
   PerformanceTracker.startTracking(PerformanceTransactionName.SYNC_PARAMS_SAGA);
   if (field === "actionConfiguration.path") {
-    if (value.indexOf("?") > -1) {
-      const paramsString = value.substr(value.indexOf("?") + 1);
-      const params = paramsString.split("&").map((p) => {
-        const keyValue = p.split("=");
-        return { key: keyValue[0], value: keyValue[1] || "" };
-      });
-      if (params.length < 2) {
-        while (params.length < 2) {
-          params.push(padQueryParams);
-        }
-      }
-      yield put(
-        autofill(
-          API_EDITOR_FORM_NAME,
-          "actionConfiguration.queryParameters",
-          params,
-        ),
-      );
-      yield put(
-        setActionProperty({
-          actionId: actionId,
-          propertyName: "actionConfiguration.queryParameters",
-          value: params,
-        }),
-      );
-    } else {
-      yield put(
-        autofill(
-          API_EDITOR_FORM_NAME,
-          "actionConfiguration.queryParameters",
-          Array(2).fill(padQueryParams),
-        ),
-      );
-      yield put(
-        setActionProperty({
-          actionId: actionId,
-          propertyName: "actionConfiguration.queryParameters",
-          value: Array(2).fill(padQueryParams),
-        }),
-      );
-    }
+    const params = parseUrlForQueryParams(value);
+    yield put(
+      autofill(
+        API_EDITOR_FORM_NAME,
+        "actionConfiguration.queryParameters",
+        params,
+      ),
+    );
+    yield put(
+      setActionProperty({
+        actionId: actionId,
+        propertyName: "actionConfiguration.queryParameters",
+        value: params,
+      }),
+    );
   } else if (field.includes("actionConfiguration.queryParameters")) {
     const { values } = yield select(getFormData, API_EDITOR_FORM_NAME);
     const path = values.actionConfiguration.path || "";
-    const pathHasParams = path.indexOf("?") > -1;
-    const currentPath = path.substring(
-      0,
-      pathHasParams ? path.indexOf("?") : undefined,
-    );
+    const matchGroups = path.match(queryParamsRegEx) || [];
+    const currentPath = matchGroups[1] || "";
     const paramsString = values.actionConfiguration.queryParameters
       .filter((p: Property) => p.key)
       .map(
@@ -143,10 +121,23 @@ function* syncApiParamsSaga(
   PerformanceTracker.stopTracking();
 }
 
+function* redirectToNewIntegrations(
+  action: ReduxAction<{ applicationId: string; pageId: string }>,
+) {
+  history.push(
+    INTEGRATION_EDITOR_URL(
+      action.payload.applicationId,
+      action.payload.pageId,
+      INTEGRATION_TABS.ACTIVE,
+      INTEGRATION_EDITOR_MODES.AUTO,
+    ),
+  );
+}
+
 function* handleUpdateBodyContentType(
   action: ReduxAction<{ title: ApiContentTypes; apiId: string }>,
 ) {
-  const { title, apiId } = action.payload;
+  const { apiId, title } = action.payload;
   const { values } = yield select(getFormData, API_EDITOR_FORM_NAME);
   const displayFormatObject = POST_BODY_FORMAT_OPTIONS.find(
     (el) => el.label === title,
@@ -347,7 +338,7 @@ function* updateFormFields(
 function* formValueChangeSaga(
   actionPayload: ReduxActionWithMeta<string, { field: string; form: string }>,
 ) {
-  const { form, field } = actionPayload.meta;
+  const { field, form } = actionPayload.meta;
   if (form !== API_EDITOR_FORM_NAME) return;
   if (field === "dynamicBindingPathList" || field === "name") return;
   const { values } = yield select(getFormData, API_EDITOR_FORM_NAME);
@@ -392,6 +383,7 @@ function* handleActionCreatedSaga(actionPayload: ReduxAction<Action>) {
     history.push(
       API_EDITOR_ID_URL(applicationId, pageId, id, {
         editName: "true",
+        from: "datasources",
       }),
     );
   }
@@ -406,7 +398,14 @@ function* handleDatasourceCreatedSaga(actionPayload: ReduxAction<Datasource>) {
   const pageId = yield select(getCurrentPageId);
 
   history.push(
-    DATA_SOURCES_EDITOR_ID_URL(applicationId, pageId, actionPayload.payload.id),
+    DATA_SOURCES_EDITOR_ID_URL(
+      applicationId,
+      pageId,
+      actionPayload.payload.id,
+      {
+        from: "datasources",
+      },
+    ),
   );
 }
 
@@ -418,7 +417,6 @@ function* handleCreateNewApiActionSaga(
     getPluginIdOfPackageName,
     REST_PLUGIN_PACKAGE_NAME,
   );
-  const applicationId = yield select(getCurrentApplicationId);
   const { pageId } = action.payload;
   if (pageId && pluginId) {
     const actions = yield select(getActions);
@@ -444,9 +442,6 @@ function* handleCreateNewApiActionSaga(
         pageId,
       } as ApiAction), // We don't have recursive partial in typescript for now.
     );
-    history.push(
-      API_EDITOR_URL_WITH_SELECTED_PAGE_ID(applicationId, pageId, pageId),
-    );
   }
 }
 
@@ -503,11 +498,10 @@ function* handleCreateNewQueryActionSaga(
     }
 
     yield put(createActionRequest(createActionPayload));
-    history.push(
-      QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID(applicationId, pageId, pageId),
-    );
   } else {
-    history.push(DATA_SOURCES_EDITOR_URL(applicationId, pageId));
+    history.push(
+      INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.ACTIVE),
+    );
   }
 }
 
@@ -585,6 +579,10 @@ export default function* root() {
       ReduxActionTypes.UPDATE_API_ACTION_BODY_CONTENT_TYPE,
       handleUpdateBodyContentType,
     ),
+    takeEvery(
+      ReduxActionTypes.REDIRECT_TO_NEW_INTEGRATIONS,
+      redirectToNewIntegrations,
+    ),
     // Intercepting the redux-form change actionType
     takeEvery(ReduxFormActionTypes.VALUE_CHANGE, formValueChangeSaga),
     takeEvery(ReduxFormActionTypes.ARRAY_REMOVE, formValueChangeSaga),
diff --git a/app/client/src/sagas/ApplicationSagas.tsx b/app/client/src/sagas/ApplicationSagas.tsx
index 44daa0218e..f7ffc6102d 100644
--- a/app/client/src/sagas/ApplicationSagas.tsx
+++ b/app/client/src/sagas/ApplicationSagas.tsx
@@ -12,7 +12,6 @@ import ApplicationApi, {
   CreateApplicationResponse,
   DeleteApplicationRequest,
   DuplicateApplicationRequest,
-  FetchApplicationsResponse,
   FetchUsersApplicationsOrgsResponse,
   ForkApplicationRequest,
   OrganizationApplicationObject,
@@ -20,6 +19,8 @@ import ApplicationApi, {
   PublishApplicationResponse,
   SetDefaultPageRequest,
   UpdateApplicationRequest,
+  ImportApplicationRequest,
+  FetchApplicationResponse,
 } from "api/ApplicationApi";
 import { all, call, put, select, takeLatest } from "redux-saga/effects";
 
@@ -37,6 +38,7 @@ import {
   setDefaultApplicationPageSuccess,
   resetCurrentApplication,
 } from "actions/applicationActions";
+import { fetchUnreadCommentThreadsCountSuccess } from "actions/commentActions";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import {
   APPLICATION_NAME_UPDATE,
@@ -55,8 +57,11 @@ import {
   getCurrentPageId,
 } from "selectors/editorSelectors";
 import { showCompletionDialog } from "./OnboardingSagas";
+
 import { deleteRecentAppEntities } from "utils/storage";
 import { reconnectWebsocket as reconnectWebsocketAction } from "actions/websocketActions";
+import { getCurrentOrg } from "selectors/organizationSelectors";
+import { Org } from "constants/orgConstants";
 
 const getDefaultPageId = (
   pages?: ApplicationPagePayload[],
@@ -165,14 +170,14 @@ export function* fetchApplicationSaga(
   action: ReduxAction<FetchApplicationPayload>,
 ) {
   try {
-    const { mode, applicationId } = action.payload;
+    const { applicationId, mode } = action.payload;
     // Get endpoint based on app mode
     const apiEndpoint =
       mode === APP_MODE.EDIT
         ? ApplicationApi.fetchApplication
         : ApplicationApi.fetchApplicationForViewMode;
 
-    const response: FetchApplicationsResponse = yield call(
+    const response: FetchApplicationResponse = yield call(
       apiEndpoint,
       applicationId,
     );
@@ -181,6 +186,10 @@ export function* fetchApplicationSaga(
       type: ReduxActionTypes.FETCH_APPLICATION_SUCCESS,
       payload: response.data,
     });
+
+    yield put(
+      fetchUnreadCommentThreadsCountSuccess(response.data.unreadCommentThreads),
+    );
   } catch (error) {
     yield put({
       type: ReduxActionErrorTypes.FETCH_APPLICATION_ERROR,
@@ -250,14 +259,20 @@ export function* updateApplicationSaga(
       request,
     );
     const isValidResponse = yield validateResponse(response);
+    console.log({ request, isValidResponse });
+    // as the redux store updates the app only on success.
+    // we have to run this
+    if (isValidResponse && request) {
+      yield put({
+        type: ReduxActionTypes.UPDATE_APPLICATION_SUCCESS,
+        payload: action.payload,
+      });
+    }
     if (isValidResponse && request && request.name) {
       Toaster.show({
         text: createMessage(APPLICATION_NAME_UPDATE),
         variant: Variant.success,
       });
-      yield put({
-        type: ReduxActionTypes.UPDATE_APPLICATION_SUCCESS,
-      });
     }
     if (isValidResponse && request.currentApp) {
       yield put({
@@ -382,7 +397,7 @@ export function* createApplicationSaga(
     reject: any;
   }>,
 ) {
-  const { applicationName, icon, color, orgId, reject } = action.payload;
+  const { applicationName, color, icon, orgId, reject } = action.payload;
   try {
     const userOrgs = yield select(getUserApplicationsOrgsList);
     const existingOrgs = userOrgs.filter(
@@ -502,6 +517,53 @@ export function* forkApplicationSaga(
   }
 }
 
+export function* importApplicationSaga(
+  action: ReduxAction<ImportApplicationRequest>,
+) {
+  try {
+    const response: ApiResponse = yield call(
+      ApplicationApi.importApplicationToOrg,
+      action.payload,
+    );
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      const allOrgs = yield select(getCurrentOrg);
+      const currentOrg = allOrgs.filter(
+        (el: Org) => el.id === action.payload.orgId,
+      );
+      if (currentOrg.length > 0) {
+        const {
+          id: appId,
+          pages,
+        }: {
+          id: string;
+          pages: { default?: boolean; id: string; isDefault?: boolean }[];
+        } = response.data;
+        yield put({
+          type: ReduxActionTypes.IMPORT_APPLICATION_SUCCESS,
+          payload: {
+            importedApplication: appId,
+          },
+        });
+        const defaultPage = pages.filter((eachPage) => !!eachPage.isDefault);
+        const pageURL = BUILDER_PAGE_URL(appId, defaultPage[0].id);
+        history.push(pageURL);
+        Toaster.show({
+          text: "Application imported successfully",
+          variant: Variant.success,
+        });
+      }
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.IMPORT_APPLICATION_ERROR,
+      payload: {
+        error,
+      },
+    });
+  }
+}
+
 export default function* applicationSagas() {
   yield all([
     takeLatest(
@@ -530,5 +592,6 @@ export default function* applicationSagas() {
       ReduxActionTypes.DUPLICATE_APPLICATION_INIT,
       duplicateApplicationSaga,
     ),
+    takeLatest(ReduxActionTypes.IMPORT_APPLICATION_INIT, importApplicationSaga),
   ]);
 }
diff --git a/app/client/src/sagas/CommentSagas/handleCommentEvents.ts b/app/client/src/sagas/CommentSagas/handleCommentEvents.ts
deleted file mode 100644
index b0733c53ff..0000000000
--- a/app/client/src/sagas/CommentSagas/handleCommentEvents.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { put } from "redux-saga/effects";
-import {
-  setCommentThreadsSuccess,
-  newCommentEvent,
-  newCommentThreadEvent,
-  updateCommentThreadEvent,
-} from "actions/commentActions";
-import { COMMENT_EVENTS } from "constants/CommentConstants";
-import { reduceCommentsByRef } from "comments/utils";
-
-export default function* handleCommentEvents(event: any) {
-  switch (event.type) {
-    case COMMENT_EVENTS.SET_COMMENTS: {
-      const comments = event.payload;
-      const payload = reduceCommentsByRef(comments);
-      yield put(setCommentThreadsSuccess(payload));
-      return;
-    }
-    case COMMENT_EVENTS.INSERT_COMMENT_THREAD: {
-      yield put(newCommentThreadEvent(event.payload[0]));
-      return;
-    }
-    case COMMENT_EVENTS.INSERT_COMMENT: {
-      yield put(newCommentEvent(event.payload[0]));
-      return;
-    }
-    case COMMENT_EVENTS.UPDATE_COMMENT_THREAD: {
-      yield put(updateCommentThreadEvent(event.payload[0].thread));
-      return;
-    }
-  }
-}
diff --git a/app/client/src/sagas/CommentSagas/index.ts b/app/client/src/sagas/CommentSagas/index.ts
index d2bb0510e6..2a62452c27 100644
--- a/app/client/src/sagas/CommentSagas/index.ts
+++ b/app/client/src/sagas/CommentSagas/index.ts
@@ -1,81 +1,52 @@
-import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
 import {
-  put,
-  takeLatest,
-  take,
-  race,
-  all,
-  call,
-  actionChannel,
-  fork,
-  select,
-} from "redux-saga/effects";
-// import { updateLayout, getTestComments } from "comments/init";
+  ReduxAction,
+  ReduxActionErrorTypes,
+  ReduxActionTypes,
+} from "constants/ReduxActionConstants";
+import { put, takeLatest, all, call, fork, select } from "redux-saga/effects";
 import {
-  COMMENT_EVENTS_CHANNEL,
-  // COMMENT_EVENTS,
-} from "constants/CommentConstants";
-import handleCommentEvents from "./handleCommentEvents";
-import {
-  // commentEvent,
   createUnpublishedCommentThreadSuccess,
   removeUnpublishedCommentThreads,
   createCommentThreadSuccess,
   addCommentToThreadSuccess,
   fetchApplicationCommentsSuccess,
   updateCommentThreadSuccess,
-  pinCommentThreadSuccess,
   deleteCommentSuccess,
+  setVisibleThread,
+  updateCommentSuccess,
+  deleteCommentThreadSuccess,
+  setAreCommentsEnabled,
+  setCommentMode,
+  fetchUnreadCommentThreadsCountSuccess,
+  decrementThreadUnreadCount,
 } from "actions/commentActions";
 import {
   transformPublishedCommentActionPayload,
   transformUnpublishCommentThreadToCreateNew,
 } from "comments/utils";
 
-import CommentsApi from "api/CommentsAPI";
+import { waitForInit } from "sagas/InitSagas";
+import { waitForFetchUserSuccess } from "sagas/userSagas";
 
-// import { getAppsmithConfigs } from "configs";
+import CommentsApi from "api/CommentsAPI";
 
 import { validateResponse } from "../ErrorSagas";
 
 import {
   getCurrentApplicationId,
-  getIsEditorInitialized,
+  getCurrentPageId,
 } from "selectors/editorSelectors";
-import { getIsInitialized as getIsViewerInitialized } from "selectors/appViewSelectors";
 import {
   AddCommentToCommentThreadRequestPayload,
   CreateCommentThreadPayload,
   CreateCommentThreadRequest,
 } from "entities/Comments/CommentsInterfaces";
+import { RawDraftContentState } from "draft-js";
+import { getCurrentUser } from "selectors/usersSelectors";
+import { get } from "lodash";
 
-// const { commentsTestModeEnabled } = getAppsmithConfigs();
-// export function* initCommentThreads() {
-//   if (!commentsTestModeEnabled) return;
-//   try {
-//     yield race([
-//       take(ReduxActionTypes.INITIALIZE_EDITOR_SUCCESS),
-//       take(ReduxActionTypes.INITIALIZE_PAGE_VIEWER_SUCCESS),
-//     ]);
-//     yield put(updateLayout());
-//     yield put(
-//       commentEvent({
-//         type: COMMENT_EVENTS.SET_COMMENTS,
-//         payload: getTestComments(),
-//       }),
-//     );
-//   } catch (err) {
-//     console.log(err, "err");
-//   }
-// }
-
-function* watchCommentEvents() {
-  const requestChan = yield actionChannel(COMMENT_EVENTS_CHANNEL);
-  while (true) {
-    const { payload } = yield take(requestChan);
-    yield fork(handleCommentEvents, payload);
-  }
-}
+import { commentModeSelector } from "selectors/commentsSelectors";
+import { AppState } from "reducers";
 
 function* createUnpublishedCommentThread(
   action: ReduxAction<Partial<CreateCommentThreadRequest>>,
@@ -87,80 +58,81 @@ function* createUnpublishedCommentThread(
 }
 
 function* createCommentThread(action: ReduxAction<CreateCommentThreadPayload>) {
-  yield put(removeUnpublishedCommentThreads());
-  const newCommentThreadPayload = transformUnpublishCommentThreadToCreateNew(
-    action.payload,
-  );
-  const applicationId = yield select(getCurrentApplicationId);
-  const response = yield call(CommentsApi.createNewThread, {
-    ...newCommentThreadPayload,
-    applicationId,
-  });
-  const isValidResponse = yield validateResponse(response);
-
-  if (isValidResponse) {
-    yield put(
-      createCommentThreadSuccess({
-        ...response.data,
-        isVisible: true,
-      }),
+  try {
+    yield put(removeUnpublishedCommentThreads());
+    const newCommentThreadPayload = transformUnpublishCommentThreadToCreateNew(
+      action.payload,
     );
-  } else {
-    // todo handle error here
-    console.log(response, "invalid response");
+    const applicationId = yield select(getCurrentApplicationId);
+    const pageId = yield select(getCurrentPageId);
+    const mode = yield select((state: AppState) => state.entities.app.mode);
+    const response = yield call(CommentsApi.createNewThread, {
+      ...newCommentThreadPayload,
+      applicationId,
+      pageId,
+      mode,
+    });
+    const isValidResponse = yield validateResponse(response);
+
+    if (isValidResponse) {
+      yield put(createCommentThreadSuccess(response.data));
+      yield put(setVisibleThread(response.data.id));
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.CREATE_COMMENT_THREAD_ERROR,
+      payload: { error, logToSentry: true },
+    });
   }
 }
 
 function* addCommentToThread(
   action: ReduxAction<AddCommentToCommentThreadRequestPayload>,
 ) {
-  const { payload } = action;
-  const { commentBody, commentThread, callback } = payload;
+  try {
+    const { payload } = action;
+    const { callback, commentBody, commentThread } = payload;
 
-  const response = yield CommentsApi.createNewThreadComment(
-    { body: commentBody },
-    commentThread.id,
-  );
-
-  const isValidResponse = yield validateResponse(response);
-
-  if (isValidResponse) {
-    yield put(
-      addCommentToThreadSuccess({
-        commentThreadId: commentThread.id,
-        comment: response.data,
-      }),
+    const mode = yield select((state: AppState) => state.entities.app.mode);
+    const response = yield CommentsApi.createNewThreadComment(
+      { body: commentBody, mode },
+      commentThread.id,
     );
-    callback();
-  } else {
-    // todo handle error here
-    console.log(response, "invalid response");
+
+    const isValidResponse = yield validateResponse(response);
+
+    if (isValidResponse) {
+      yield put(
+        addCommentToThreadSuccess({
+          commentThreadId: commentThread.id,
+          comment: response.data,
+        }),
+      );
+      callback();
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.ADD_COMMENT_TO_THREAD_ERROR,
+      payload: { error, logToSentry: true },
+    });
   }
 }
 
 function* fetchApplicationComments() {
   try {
-    const isEditorInitialised = yield select(getIsEditorInitialized);
-    const isViewerInitialized = yield select(getIsViewerInitialized);
-    if (!isEditorInitialised && !isViewerInitialized) {
-      yield race([
-        take(ReduxActionTypes.INITIALIZE_EDITOR_SUCCESS),
-        take(ReduxActionTypes.INITIALIZE_PAGE_VIEWER_SUCCESS),
-      ]);
-    }
-
+    yield call(waitForInit);
     const applicationId = yield select(getCurrentApplicationId);
     const response = yield CommentsApi.fetchAppCommentThreads(applicationId);
     const isValidResponse = yield validateResponse(response);
 
     if (isValidResponse) {
       yield put(fetchApplicationCommentsSuccess(response.data));
-    } else {
-      // todo invalid response
     }
-  } catch (e) {
-    // todo handle error here
-    console.log(e, "error");
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.FETCH_APPLICATION_COMMENTS_ERROR,
+      payload: { error, logToSentry: true },
+    });
   }
 }
 
@@ -168,34 +140,41 @@ function* setCommentResolution(
   action: ReduxAction<{ threadId: string; resolved: boolean }>,
 ) {
   try {
-    const { threadId, resolved } = action.payload;
+    const { resolved, threadId } = action.payload;
     const response = yield CommentsApi.updateCommentThread(
-      { resolved },
+      { resolvedState: { active: resolved } },
       threadId,
     );
     const isValidResponse = yield validateResponse(response);
     if (isValidResponse) {
       yield put(updateCommentThreadSuccess(response.data));
-    } else {
-      console.log(isValidResponse, "handle error");
     }
-  } catch (e) {
-    console.log(e, "handle error");
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.SET_COMMENT_RESOLUTION_ERROR,
+      payload: { error, logToSentry: true },
+    });
   }
 }
 
-function* pinCommentThread(action: ReduxAction<{ threadId: string }>) {
+function* pinCommentThread(
+  action: ReduxAction<{ threadId: string; pin: boolean }>,
+) {
   try {
-    const { threadId } = action.payload;
-    yield CommentsApi.pinCommentThread(threadId);
-    // TODO: uncomment this
-    // const isValidResponse = yield validateResponse(response);
-    // if (isValidResponse) {
-    const applicationId = yield select(getCurrentApplicationId);
-    yield put(pinCommentThreadSuccess({ threadId, applicationId }));
-    // }
-  } catch (e) {
-    console.log(e, "handle error");
+    const { pin, threadId } = action.payload;
+    const response = yield CommentsApi.updateCommentThread(
+      { pinnedState: { active: pin } },
+      threadId,
+    );
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      yield put(updateCommentThreadSuccess(response.data));
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.PIN_COMMENT_THREAD_ERROR,
+      payload: { error, logToSentry: true },
+    });
   }
 }
 
@@ -209,14 +188,138 @@ function* deleteComment(
     if (isValidResponse) {
       yield put(deleteCommentSuccess({ commentId, threadId }));
     }
-  } catch (e) {
-    console.log(e, "handle error");
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.DELETE_COMMENT_ERROR,
+      payload: { error, logToSentry: true },
+    });
   }
 }
 
+function* markThreadAsRead(action: ReduxAction<{ threadId: string }>) {
+  try {
+    const { threadId } = action.payload;
+    const response = yield CommentsApi.updateCommentThread(
+      { isViewed: true },
+      threadId,
+    );
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      yield put(updateCommentThreadSuccess(response.data));
+      yield put(decrementThreadUnreadCount());
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.MARK_THREAD_AS_READ_ERROR,
+      payload: { error, logToSentry: true },
+    });
+  }
+}
+
+function* editComment(
+  action: ReduxAction<{
+    commentId: string;
+    commentThreadId: string;
+    body: RawDraftContentState;
+  }>,
+) {
+  try {
+    const { body, commentId, commentThreadId } = action.payload;
+    const response = yield CommentsApi.updateComment({ body }, commentId);
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      yield put(
+        updateCommentSuccess({ comment: response.data, commentThreadId }),
+      );
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.EDIT_COMMENT_ERROR,
+      payload: { error, logToSentry: true },
+    });
+  }
+}
+
+function* deleteCommentThread(action: ReduxAction<string>) {
+  try {
+    const response = yield CommentsApi.deleteCommentThread(action.payload);
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      const applicationId = yield select(getCurrentApplicationId);
+      yield put(
+        deleteCommentThreadSuccess({
+          commentThreadId: action.payload,
+          appId: applicationId,
+        }),
+      );
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.DELETE_COMMENT_THREAD_ERROR,
+      payload: { error, logToSentry: true },
+    });
+  }
+}
+
+function* setIfCommentsAreEnabled() {
+  yield call(waitForFetchUserSuccess);
+
+  const user = yield select(getCurrentUser);
+  const email = get(user, "email", "");
+  const isAppsmithEmail = email.toLowerCase().indexOf("@appsmith.com") !== -1;
+
+  const isCommentModeEnabled = isAppsmithEmail;
+  yield put(setAreCommentsEnabled(isAppsmithEmail));
+
+  const isCommentMode = yield select(commentModeSelector);
+  if (isCommentMode && !isCommentModeEnabled) yield put(setCommentMode(false));
+}
+
+function* addCommentReaction(
+  action: ReduxAction<{ emoji: string; commentId: string }>,
+) {
+  try {
+    const { commentId, emoji } = action.payload;
+    yield CommentsApi.addCommentReaction(commentId, { emoji });
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.ADD_COMMENT_REACTION_ERROR,
+      payload: { error, logToSentry: true },
+    });
+  }
+}
+
+function* deleteCommentReaction(
+  action: ReduxAction<{ emoji: string; commentId: string }>,
+) {
+  try {
+    const { commentId, emoji } = action.payload;
+    yield CommentsApi.removeCommentReaction(commentId, {
+      emoji,
+    });
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.DELETE_COMMENT_REACTION_ERROR,
+      payload: { error, logToSentry: true },
+    });
+  }
+}
+
+function* updateCommentThreadUnreadCount(action: ReduxAction<unknown>) {
+  const type = action.type;
+  let unreadCommentsCount = yield select(
+    (state: AppState) => state.ui.comments.unreadCommentThreadsCount,
+  );
+  if (type === ReduxActionTypes.INCREMENT_COMMENT_THREAD_UNREAD_COUNT) {
+    unreadCommentsCount += 1;
+  } else if (type === ReduxActionTypes.DECREMENT_COMMENT_THREAD_UNREAD_COUNT) {
+    unreadCommentsCount -= 1;
+  }
+  yield put(fetchUnreadCommentThreadsCountSuccess(unreadCommentsCount));
+}
+
 export default function* commentSagas() {
   yield all([
-    // takeLatest(ReduxActionTypes.INIT_COMMENT_THREADS, initCommentThreads),
     takeLatest(
       ReduxActionTypes.FETCH_APPLICATION_COMMENTS_REQUEST,
       fetchApplicationComments,
@@ -237,8 +340,20 @@ export default function* commentSagas() {
       ReduxActionTypes.SET_COMMENT_THREAD_RESOLUTION_REQUEST,
       setCommentResolution,
     ),
-    call(watchCommentEvents),
     takeLatest(ReduxActionTypes.PIN_COMMENT_THREAD_REQUEST, pinCommentThread),
     takeLatest(ReduxActionTypes.DELETE_COMMENT_REQUEST, deleteComment),
+    takeLatest(ReduxActionTypes.MARK_THREAD_AS_READ_REQUEST, markThreadAsRead),
+    takeLatest(ReduxActionTypes.EDIT_COMMENT_REQUEST, editComment),
+    takeLatest(ReduxActionTypes.DELETE_THREAD_REQUEST, deleteCommentThread),
+    takeLatest(ReduxActionTypes.ADD_COMMENT_REACTION, addCommentReaction),
+    takeLatest(ReduxActionTypes.REMOVE_COMMENT_REACTION, deleteCommentReaction),
+    fork(setIfCommentsAreEnabled),
+    takeLatest(
+      [
+        ReduxActionTypes.INCREMENT_COMMENT_THREAD_UNREAD_COUNT,
+        ReduxActionTypes.DECREMENT_COMMENT_THREAD_UNREAD_COUNT,
+      ],
+      updateCommentThreadUnreadCount,
+    ),
   ]);
 }
diff --git a/app/client/src/sagas/CurlImportSagas.ts b/app/client/src/sagas/CurlImportSagas.ts
index 9579804f7b..8a21cc3232 100644
--- a/app/client/src/sagas/CurlImportSagas.ts
+++ b/app/client/src/sagas/CurlImportSagas.ts
@@ -19,7 +19,7 @@ import { Variant } from "components/ads/common";
 import { CURL } from "constants/AppsmithActionConstants/ActionConstants";
 
 export function* curlImportSaga(action: ReduxAction<CurlImportRequest>) {
-  const { type, pageId, name } = action.payload;
+  const { name, pageId, type } = action.payload;
   let { curl } = action.payload;
   try {
     curl = transformCurlImport(curl);
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index 00c1df2757..b3a5e48eca 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -42,7 +42,9 @@ import { Datasource } from "entities/Datasource";
 import {
   API_EDITOR_ID_URL,
   DATA_SOURCES_EDITOR_ID_URL,
-  DATA_SOURCES_EDITOR_URL,
+  INTEGRATION_EDITOR_MODES,
+  INTEGRATION_EDITOR_URL,
+  INTEGRATION_TABS,
 } from "constants/routes";
 import history from "utils/history";
 import { API_EDITOR_FORM_NAME, DATASOURCE_DB_FORM } from "constants/forms";
@@ -76,6 +78,7 @@ import { APPSMITH_TOKEN_STORAGE_KEY } from "pages/Editor/SaaSEditor/constants";
 import { checkAndGetPluginFormConfigsSaga } from "sagas/PluginSagas";
 import { PluginType } from "entities/Action";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
+import { isDynamicValue } from "utils/DynamicBindingUtils";
 
 function* fetchDatasourcesSaga() {
   try {
@@ -101,6 +104,74 @@ function* fetchDatasourcesSaga() {
   }
 }
 
+function* fetchMockDatasourcesSaga() {
+  try {
+    const response: GenericApiResponse<any> = yield DatasourcesApi.fetchMockDatasources();
+    // not validating the api call here. If the call is unsuccessful it'll be unblocking. And we'll hide the mock DB section.
+    yield put({
+      type: ReduxActionTypes.FETCH_MOCK_DATASOURCES_SUCCESS,
+      payload: !!response && !!response.data ? response.data : [],
+    });
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.FETCH_MOCK_DATASOURCES_ERROR,
+      payload: { error },
+    });
+  }
+}
+
+export function* addMockDbToDatasources(
+  actionPayload: ReduxActionWithCallbacks<
+    {
+      name: string;
+      organizationId: string;
+      pluginId: string;
+      packageName: string;
+    },
+    unknown,
+    unknown
+  >,
+) {
+  try {
+    const {
+      name,
+      organizationId,
+      packageName,
+      pluginId,
+    } = actionPayload.payload;
+    const response: GenericApiResponse<any> = yield DatasourcesApi.addMockDbToDatasources(
+      name,
+      organizationId,
+      pluginId,
+      packageName,
+    );
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      yield put({
+        type: ReduxActionTypes.ADD_MOCK_DATASOURCES_SUCCESS,
+        payload: response.data,
+      });
+      yield put({
+        type: ReduxActionTypes.FETCH_DATASOURCES_INIT,
+      });
+      yield put({
+        type: ReduxActionTypes.FETCH_PLUGINS_REQUEST,
+      });
+      yield call(checkAndGetPluginFormConfigsSaga, response.data.pluginId);
+      const applicationId = yield select(getCurrentApplicationId);
+      const pageId = yield select(getCurrentPageId);
+      history.push(
+        INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.ACTIVE),
+      );
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.ADD_MOCK_DATASOURCES_ERROR,
+      payload: { error },
+    });
+  }
+}
+
 export function* deleteDatasourceSaga(
   actionPayload: ReduxActionWithCallbacks<{ id: string }, unknown, unknown>,
 ) {
@@ -120,7 +191,14 @@ export function* deleteDatasourceSaga(
         window.location.pathname ===
         DATA_SOURCES_EDITOR_ID_URL(applicationId, pageId, id)
       ) {
-        history.push(DATA_SOURCES_EDITOR_URL(applicationId, pageId));
+        history.push(
+          INTEGRATION_EDITOR_URL(
+            applicationId,
+            pageId,
+            INTEGRATION_TABS.NEW,
+            INTEGRATION_EDITOR_MODES.AUTO,
+          ),
+        );
       }
 
       Toaster.show({
@@ -204,19 +282,18 @@ function* updateDatasourceSaga(
       yield put(
         updateDatasourceSuccess(response.data, !actionPayload.onSuccess),
       );
-      if (actionPayload.onSuccess) {
-        yield put(actionPayload.onSuccess);
-      }
+      yield put(
+        setDatsourceEditorMode({ id: datasourcePayload.id, viewMode: true }),
+      );
       yield put({
         type: ReduxActionTypes.DELETE_DATASOURCE_DRAFT,
         payload: {
           id: response.data.id,
         },
       });
-      yield put(
-        setDatsourceEditorMode({ id: datasourcePayload.id, viewMode: true }),
-      );
-
+      if (actionPayload.onSuccess) {
+        yield put(actionPayload.onSuccess);
+      }
       if (expandDatasourceId === response.data.id && !datasourceStructure) {
         yield put(fetchDatasourceStructure(response.data.id));
       }
@@ -540,10 +617,14 @@ function* changeDatasourceSaga(actionPayload: ReduxAction<Datasource>) {
   }
 
   yield put(initialize(DATASOURCE_DB_FORM, _.omit(data, ["name"])));
-
-  history.push(
-    DATA_SOURCES_EDITOR_ID_URL(applicationId, pageId, datasource.id),
-  );
+  // this redirects to the same route, so checking first.
+  if (
+    history.location.pathname !==
+    DATA_SOURCES_EDITOR_ID_URL(applicationId, pageId, datasource.id)
+  )
+    history.push(
+      DATA_SOURCES_EDITOR_ID_URL(applicationId, pageId, datasource.id),
+    );
 }
 
 function* switchDatasourceSaga(action: ReduxAction<{ datasourceId: string }>) {
@@ -561,7 +642,7 @@ function* switchDatasourceSaga(action: ReduxAction<{ datasourceId: string }>) {
 function* formValueChangeSaga(
   actionPayload: ReduxActionWithMeta<string, { field: string; form: string }>,
 ) {
-  const { form, field } = actionPayload.meta;
+  const { field, form } = actionPayload.meta;
   if (form !== DATASOURCE_DB_FORM) return;
   if (field === "name") return;
   yield all([call(updateDraftsSaga)]);
@@ -573,8 +654,24 @@ function* storeAsDatasourceSaga() {
   const pageId = yield select(getCurrentPageId);
   let datasource = _.get(values, "datasource");
   datasource = _.omit(datasource, ["name"]);
-
-  history.push(DATA_SOURCES_EDITOR_URL(applicationId, pageId));
+  const originalHeaders = _.get(values, "actionConfiguration.headers", []);
+  const [datasourceHeaders, actionHeaders] = _.partition(
+    originalHeaders,
+    ({ key, value }: { key: string; value: string }) => {
+      return !(isDynamicValue(key) || isDynamicValue(value));
+    },
+  );
+  yield put(
+    setActionProperty({
+      actionId: values.id,
+      propertyName: "actionConfiguration.headers",
+      value: actionHeaders,
+    }),
+  );
+  _.set(datasource, "datasourceConfiguration.headers", datasourceHeaders);
+  history.push(
+    INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.ACTIVE),
+  );
 
   yield put(createDatasourceFromForm(datasource));
   const createDatasourceSuccessAction = yield take(
@@ -747,6 +844,14 @@ function* refreshDatasourceStructure(action: ReduxAction<{ id: string }>) {
 export function* watchDatasourcesSagas() {
   yield all([
     takeEvery(ReduxActionTypes.FETCH_DATASOURCES_INIT, fetchDatasourcesSaga),
+    takeEvery(
+      ReduxActionTypes.FETCH_MOCK_DATASOURCES_INIT,
+      fetchMockDatasourcesSaga,
+    ),
+    takeEvery(
+      ReduxActionTypes.ADD_MOCK_DATASOURCES_INIT,
+      addMockDbToDatasources,
+    ),
     takeEvery(
       ReduxActionTypes.CREATE_DATASOURCE_FROM_FORM_INIT,
       createDatasourceFromFormSaga,
diff --git a/app/client/src/sagas/DebuggerSagas.ts b/app/client/src/sagas/DebuggerSagas.ts
index d072aad539..13456bac5e 100644
--- a/app/client/src/sagas/DebuggerSagas.ts
+++ b/app/client/src/sagas/DebuggerSagas.ts
@@ -1,63 +1,51 @@
-import { debuggerLog, errorLog, updateErrorLog } from "actions/debuggerActions";
+import {
+  debuggerLog,
+  errorLog,
+  logDebuggerErrorAnalytics,
+  LogDebuggerErrorAnalyticsPayload,
+  updateErrorLog,
+} from "actions/debuggerActions";
 import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
-import { WidgetTypes } from "constants/WidgetConstants";
-import { LogActionPayload, Message } from "entities/AppsmithConsole";
+import {
+  ENTITY_TYPE,
+  LogActionPayload,
+  Message,
+} from "entities/AppsmithConsole";
 import {
   all,
+  call,
+  fork,
   put,
-  takeEvery,
   select,
   take,
-  fork,
-  call,
+  takeEvery,
 } from "redux-saga/effects";
-import { getDataTree } from "selectors/dataTreeSelectors";
-import { isEmpty, set } from "lodash";
+import { get, set } from "lodash";
 import { getDebuggerErrors } from "selectors/debuggerSelectors";
-import { getAction } from "selectors/entitiesSelector";
+import { getAction, getPlugin } from "selectors/entitiesSelector";
 import { Action, PluginType } from "entities/Action";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
 import { DataTree } from "entities/DataTree/dataTreeFactory";
-import { isWidget } from "workers/evaluationUtils";
-
-function* onWidgetUpdateSaga(payload: LogActionPayload) {
-  if (!payload.source) return;
-  // Wait for data tree update
-  yield take(ReduxActionTypes.SET_EVALUATED_TREE);
-  const dataTree: DataTree = yield select(getDataTree);
-  const widget = dataTree[payload.source.name];
-
-  if (!isWidget(widget) || !widget.validationMessages) return;
-
-  // Ignore canvas widget updates
-  if (widget.type === WidgetTypes.CANVAS_WIDGET) {
-    return;
-  }
-  const source = payload.source;
-
-  // If widget properties no longer have validation errors update the same
-  if (payload.state) {
-    const propertyPath = Object.keys(payload.state)[0];
-
-    const validationMessages = widget.validationMessages;
-    const validationMessage = validationMessages[propertyPath];
-    const errors = yield select(getDebuggerErrors);
-    const errorId = `${source.id}-${propertyPath}`;
-    const widgetErrorLog = errors[errorId];
-    if (!widgetErrorLog) return;
-
-    const noError = isEmpty(validationMessage);
-
-    if (noError) {
-      delete errors[errorId];
-
-      yield put({
-        type: ReduxActionTypes.DEBUGGER_UPDATE_ERROR_LOGS,
-        payload: errors,
-      });
-    }
-  }
-}
+import {
+  getDataTree,
+  getEvaluationInverseDependencyMap,
+} from "selectors/dataTreeSelectors";
+import {
+  getEntityNameAndPropertyPath,
+  isAction,
+  isWidget,
+} from "workers/evaluationUtils";
+import { getDependencyChain } from "components/editorComponents/Debugger/helpers";
+import {
+  ACTION_CONFIGURATION_UPDATED,
+  createMessage,
+  WIDGET_PROPERTIES_UPDATED,
+} from "constants/messages";
+import AnalyticsUtil from "utils/AnalyticsUtil";
+import { Plugin } from "api/PluginApi";
+import { getCurrentPageId } from "selectors/editorSelectors";
+import { getWidget } from "./selectors";
+import { WidgetProps } from "widgets/BaseWidget";
 
 function* formatActionRequestSaga(payload: LogActionPayload, request?: any) {
   if (!payload.source || !payload.state || !request || !request.headers) {
@@ -113,18 +101,76 @@ function* onEntityDeleteSaga(payload: Message) {
   yield put(debuggerLog(payload));
 }
 
+function* logDependentEntityProperties(payload: Message) {
+  const { source, state } = payload;
+  if (!state || !source) return;
+
+  yield take(ReduxActionTypes.SET_EVALUATED_TREE);
+  const dataTree: DataTree = yield select(getDataTree);
+
+  const propertyPath = `${source.name}.` + payload.source?.propertyPath;
+  const inverseDependencyMap = yield select(getEvaluationInverseDependencyMap);
+  const finalValue = getDependencyChain(propertyPath, inverseDependencyMap);
+
+  yield all(
+    finalValue.map((path) => {
+      const entityInfo = getEntityNameAndPropertyPath(path);
+      const entity = dataTree[entityInfo.entityName];
+      let log = {
+        ...payload,
+        state: {
+          [entityInfo.propertyPath]: get(dataTree, path),
+        },
+      };
+
+      if (isAction(entity)) {
+        log = {
+          ...log,
+          text: createMessage(ACTION_CONFIGURATION_UPDATED),
+          source: {
+            type: ENTITY_TYPE.ACTION,
+            name: entityInfo.entityName,
+            id: entity.actionId,
+          },
+        };
+      } else if (isWidget(entity)) {
+        log = {
+          ...log,
+          text: createMessage(WIDGET_PROPERTIES_UPDATED),
+          source: {
+            type: ENTITY_TYPE.WIDGET,
+            name: entityInfo.entityName,
+            id: entity.widgetId,
+          },
+        };
+      }
+
+      return put(debuggerLog(log));
+    }),
+  );
+}
+
 function* debuggerLogSaga(action: ReduxAction<Message>) {
   const { payload } = action;
+  const debuggerErrors: Record<string, Message> = yield select(
+    getDebuggerErrors,
+  );
 
   switch (payload.logType) {
     case LOG_TYPE.WIDGET_UPDATE:
-      yield call(onWidgetUpdateSaga, payload);
       yield put(debuggerLog(payload));
+      yield call(logDependentEntityProperties, payload);
       return;
+    case LOG_TYPE.ACTION_UPDATE:
+      yield put(debuggerLog(payload));
+      yield call(logDependentEntityProperties, payload);
+      return;
+    case LOG_TYPE.EVAL_ERROR:
     case LOG_TYPE.WIDGET_PROPERTY_VALIDATION_ERROR:
       if (payload.source && payload.source.propertyPath) {
         if (payload.text) {
           yield put(errorLog(payload));
+
           yield put(debuggerLog(payload));
         }
       }
@@ -134,6 +180,19 @@ function* debuggerLogSaga(action: ReduxAction<Message>) {
         const res = yield call(formatActionRequestSaga, payload, payload.state);
         const log = { ...payload };
         res && set(log, "state.headers", res);
+        if (!((payload.source?.id as string) in debuggerErrors)) {
+          yield put(
+            logDebuggerErrorAnalytics({
+              eventName: "DEBUGGER_NEW_ERROR",
+              errorMessages: payload.messages ?? [],
+              entityType: ENTITY_TYPE.ACTION,
+              entityId: payload.source?.id ?? "",
+              entityName: payload.source?.name ?? "",
+              propertyPath: "",
+            }),
+          );
+        }
+
         yield put(errorLog(log));
         yield put(debuggerLog(log));
       }
@@ -146,6 +205,19 @@ function* debuggerLogSaga(action: ReduxAction<Message>) {
           payload.state?.request ?? {},
         );
 
+        if ((payload.source?.id as string) in debuggerErrors) {
+          yield put(
+            logDebuggerErrorAnalytics({
+              eventName: "DEBUGGER_RESOLVED_ERROR",
+              errorMessages:
+                debuggerErrors[payload.source?.id ?? ""].messages ?? [],
+              entityType: ENTITY_TYPE.ACTION,
+              entityId: payload.source?.id ?? "",
+              entityName: payload.source?.name ?? "",
+              propertyPath: "",
+            }),
+          );
+        }
         yield put(
           updateErrorLog({
             ...payload,
@@ -166,6 +238,55 @@ function* debuggerLogSaga(action: ReduxAction<Message>) {
   }
 }
 
-export default function* debuggerSagasListeners() {
-  yield all([takeEvery(ReduxActionTypes.DEBUGGER_LOG_INIT, debuggerLogSaga)]);
+// This saga is intended for analytics only
+function* logDebuggerErrorAnalyticsSaga(
+  action: ReduxAction<LogDebuggerErrorAnalyticsPayload>,
+) {
+  try {
+    const { payload } = action;
+    const currentPageId = yield select(getCurrentPageId);
+
+    if (payload.entityType === ENTITY_TYPE.WIDGET) {
+      const widget: WidgetProps = yield select(getWidget, payload.entityId);
+      const widgetType = widget.type;
+      const propertyPath = `${widgetType}.${payload.propertyPath}`;
+
+      // Sending widget type for widgets
+      AnalyticsUtil.logEvent(payload.eventName, {
+        entityType: widgetType,
+        propertyPath,
+        errorMessages: payload.errorMessages,
+        pageId: currentPageId,
+      });
+    } else if (payload.entityType === ENTITY_TYPE.ACTION) {
+      const action: Action = yield select(getAction, payload.entityId);
+      const plugin: Plugin = yield select(getPlugin, action.pluginId);
+      const pluginName = plugin.name.replace(/ /g, "");
+      let propertyPath = `${pluginName}`;
+
+      if (payload.propertyPath) {
+        propertyPath += `.${payload.propertyPath}`;
+      }
+
+      // Sending plugin name for actions
+      AnalyticsUtil.logEvent(payload.eventName, {
+        entityType: pluginName,
+        propertyPath,
+        errorMessages: payload.errorMessages,
+        pageId: currentPageId,
+      });
+    }
+  } catch (e) {
+    console.error(e);
+  }
+}
+
+export default function* debuggerSagasListeners() {
+  yield all([
+    takeEvery(ReduxActionTypes.DEBUGGER_LOG_INIT, debuggerLogSaga),
+    takeEvery(
+      ReduxActionTypes.DEBUGGER_ERROR_ANALYTICS,
+      logDebuggerErrorAnalyticsSaga,
+    ),
+  ]);
 }
diff --git a/app/client/src/sagas/ErrorSagas.tsx b/app/client/src/sagas/ErrorSagas.tsx
index 799eb3a5b6..d4c9e2ab03 100644
--- a/app/client/src/sagas/ErrorSagas.tsx
+++ b/app/client/src/sagas/ErrorSagas.tsx
@@ -24,6 +24,8 @@ import {
   createMessage,
 } from "constants/messages";
 
+import * as Sentry from "@sentry/react";
+
 /**
  * making with error message with action name
  *
@@ -135,18 +137,20 @@ enum ErrorEffectTypes {
   SHOW_ALERT = "SHOW_ALERT",
   SAFE_CRASH = "SAFE_CRASH",
   LOG_ERROR = "LOG_ERROR",
+  LOG_TO_SENTRY = "LOG_TO_SENTRY",
 }
 
 export interface ErrorActionPayload {
   error: ErrorPayloadType;
   show?: boolean;
   crash?: boolean;
+  logToSentry?: boolean;
 }
 
 export function* errorSaga(errorAction: ReduxAction<ErrorActionPayload>) {
   const effects = [ErrorEffectTypes.LOG_ERROR];
-  const { type, payload } = errorAction;
-  const { show = true, error } = payload || {};
+  const { payload, type } = errorAction;
+  const { error, logToSentry, show = true } = payload || {};
   const message = getErrorMessageFromActionType(type, error);
 
   if (show) {
@@ -157,6 +161,10 @@ export function* errorSaga(errorAction: ReduxAction<ErrorActionPayload>) {
     effects.push(ErrorEffectTypes.SAFE_CRASH);
   }
 
+  if (error && logToSentry) {
+    effects.push(ErrorEffectTypes.LOG_TO_SENTRY);
+  }
+
   for (const effect of effects) {
     switch (effect) {
       case ErrorEffectTypes.LOG_ERROR: {
@@ -171,6 +179,10 @@ export function* errorSaga(errorAction: ReduxAction<ErrorActionPayload>) {
         yield call(crashAppSaga, error);
         break;
       }
+      case ErrorEffectTypes.LOG_TO_SENTRY: {
+        yield call(Sentry.captureException, error);
+        break;
+      }
     }
   }
 
diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts
index ef782826ee..ab34c60334 100644
--- a/app/client/src/sagas/EvaluationsSaga.ts
+++ b/app/client/src/sagas/EvaluationsSaga.ts
@@ -22,42 +22,186 @@ import {
   EVAL_WORKER_ACTIONS,
   EvalError,
   EvalErrorTypes,
+  EvaluationError,
+  getEvalErrorPath,
+  getEvalValuePath,
+  PropertyEvalErrorTypeDebugMessage,
+  PropertyEvaluationErrorType,
 } from "utils/DynamicBindingUtils";
 import log from "loglevel";
 import { WidgetProps } from "widgets/BaseWidget";
 import PerformanceTracker, {
   PerformanceTransactionName,
 } from "../utils/PerformanceTracker";
-import { Variant } from "components/ads/common";
-import { Toaster } from "components/ads/Toast";
 import * as Sentry from "@sentry/react";
 import { Action } from "redux";
 import _ from "lodash";
+import { ENTITY_TYPE, Message } from "entities/AppsmithConsole";
+import LOG_TYPE from "entities/AppsmithConsole/logtype";
+import { DataTree } from "entities/DataTree/dataTreeFactory";
+import { AppState } from "reducers";
+import {
+  getEntityNameAndPropertyPath,
+  isAction,
+  isWidget,
+} from "workers/evaluationUtils";
+import moment from "moment/moment";
+import { Toaster } from "components/ads/Toast";
+import { Variant } from "components/ads/common";
+import AppsmithConsole from "utils/AppsmithConsole";
+import AnalyticsUtil from "utils/AnalyticsUtil";
 import {
   createMessage,
   ERROR_EVAL_ERROR_GENERIC,
   ERROR_EVAL_TRIGGER,
 } from "constants/messages";
-import AppsmithConsole from "utils/AppsmithConsole";
-import LOG_TYPE from "entities/AppsmithConsole/logtype";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import { getAppMode } from "selectors/applicationSelectors";
+import { APP_MODE } from "reducers/entityReducers/appReducer";
+import { dataTreeTypeDefCreator } from "utils/autocomplete/dataTreeTypeDefCreator";
+import TernServer from "utils/autocomplete/TernServer";
+import store from "store";
+import { logDebuggerErrorAnalytics } from "actions/debuggerActions";
 
 let widgetTypeConfigMap: WidgetTypeConfigMap;
 
 const worker = new GracefulWorkerService(Worker);
 
-const evalErrorHandler = (errors: EvalError[]) => {
-  if (!errors) return;
+const getDebuggerErrors = (state: AppState) => state.ui.debugger.errors;
+
+function getLatestEvalPropertyErrors(
+  currentDebuggerErrors: Record<string, Message>,
+  dataTree: DataTree,
+  evaluationOrder: Array<string>,
+) {
+  const updatedDebuggerErrors: Record<string, Message> = {
+    ...currentDebuggerErrors,
+  };
+
+  for (const evaluatedPath of evaluationOrder) {
+    const { entityName, propertyPath } = getEntityNameAndPropertyPath(
+      evaluatedPath,
+    );
+    const entity = dataTree[entityName];
+    if (isWidget(entity) || isAction(entity)) {
+      if (propertyPath in entity.logBlackList) {
+        continue;
+      }
+      const allEvalErrors: EvaluationError[] = _.get(
+        entity,
+        getEvalErrorPath(evaluatedPath, false),
+        [],
+      );
+      const evaluatedValue = _.get(
+        entity,
+        getEvalValuePath(evaluatedPath, false),
+      );
+      const evalErrors = allEvalErrors.filter(
+        (error) => error.errorType !== PropertyEvaluationErrorType.LINT,
+      );
+      const idField = isWidget(entity) ? entity.widgetId : entity.actionId;
+      const nameField = isWidget(entity) ? entity.widgetName : entity.name;
+      const entityType = isWidget(entity)
+        ? ENTITY_TYPE.WIDGET
+        : ENTITY_TYPE.ACTION;
+      const debuggerKey = idField + "-" + propertyPath;
+      // if dataTree has error but debugger does not -> add
+      // if debugger has error and data tree has error -> update error
+      // if debugger has error but data tree does not -> remove
+      // if debugger or data tree does not have an error -> no change
+
+      if (evalErrors.length) {
+        // TODO Rank and set the most critical error
+        const error = evalErrors[0];
+        const errorMessages = evalErrors.map((e) => ({
+          message: e.errorMessage,
+        }));
+
+        if (!(debuggerKey in updatedDebuggerErrors)) {
+          store.dispatch(
+            logDebuggerErrorAnalytics({
+              eventName: "DEBUGGER_NEW_ERROR",
+              entityId: idField,
+              entityName: nameField,
+              entityType,
+              propertyPath,
+              errorMessages,
+            }),
+          );
+        }
+
+        // Add or update
+        updatedDebuggerErrors[debuggerKey] = {
+          logType: LOG_TYPE.EVAL_ERROR,
+          text: PropertyEvalErrorTypeDebugMessage[error.errorType](
+            propertyPath,
+          ),
+          messages: errorMessages,
+          severity: error.severity,
+          timestamp: moment().format("hh:mm:ss"),
+          source: {
+            id: idField,
+            name: nameField,
+            type: entityType,
+            propertyPath: propertyPath,
+          },
+          state: {
+            [propertyPath]: evaluatedValue,
+          },
+        };
+      } else if (debuggerKey in updatedDebuggerErrors) {
+        store.dispatch(
+          logDebuggerErrorAnalytics({
+            eventName: "DEBUGGER_RESOLVED_ERROR",
+            entityId: idField,
+            entityName: nameField,
+            entityType,
+            propertyPath:
+              updatedDebuggerErrors[debuggerKey].source?.propertyPath ?? "",
+            errorMessages: updatedDebuggerErrors[debuggerKey].messages ?? [],
+          }),
+        );
+        // Remove
+        delete updatedDebuggerErrors[debuggerKey];
+      }
+    }
+  }
+  return updatedDebuggerErrors;
+}
+
+function* evalErrorHandler(
+  errors: EvalError[],
+  dataTree?: DataTree,
+  evaluationOrder?: Array<string>,
+): any {
+  if (dataTree && evaluationOrder) {
+    const currentDebuggerErrors: Record<string, Message> = yield select(
+      getDebuggerErrors,
+    );
+    const evalPropertyErrors = getLatestEvalPropertyErrors(
+      currentDebuggerErrors,
+      dataTree,
+      evaluationOrder,
+    );
+
+    yield put({
+      type: ReduxActionTypes.DEBUGGER_UPDATE_ERROR_LOGS,
+      payload: evalPropertyErrors,
+    });
+  }
+
   errors.forEach((error) => {
     switch (error.type) {
-      case EvalErrorTypes.DEPENDENCY_ERROR: {
+      case EvalErrorTypes.CYCLICAL_DEPENDENCY_ERROR: {
         if (error.context) {
           // Add more info about node for the toast
-          const { node, entityType } = error.context;
+          const { entityType, node } = error.context;
           Toaster.show({
             text: `${error.message} Node was: ${node}`,
             variant: Variant.danger,
           });
+          AppsmithConsole.error({
+            text: `${error.message} Node was: ${node}`,
+          });
           // Send the generic error message to sentry for better grouping
           Sentry.captureException(new Error(error.message), {
             tags: {
@@ -94,29 +238,101 @@ const evalErrorHandler = (errors: EvalError[]) => {
         Toaster.show({
           text: createMessage(ERROR_EVAL_TRIGGER, error.message),
           variant: Variant.danger,
+          showDebugButton: true,
         });
-        break;
-      }
-      case EvalErrorTypes.EVAL_ERROR: {
-        log.debug(error);
-        break;
-      }
-      case EvalErrorTypes.WIDGET_PROPERTY_VALIDATION_ERROR: {
         AppsmithConsole.error({
-          logType: LOG_TYPE.WIDGET_PROPERTY_VALIDATION_ERROR,
-          text: `The value at ${error.context?.source.propertyPath} is invalid`,
-          message: error.message,
-          source: error.context?.source,
+          text: createMessage(ERROR_EVAL_TRIGGER, error.message),
         });
         break;
       }
+      case EvalErrorTypes.EVAL_PROPERTY_ERROR: {
+        log.debug(error);
+        break;
+      }
       default: {
         Sentry.captureException(error);
         log.debug(error);
       }
     }
   });
-};
+}
+
+function* logSuccessfulBindings(
+  unEvalTree: DataTree,
+  dataTree: DataTree,
+  evaluationOrder: string[],
+) {
+  const appMode = yield select(getAppMode);
+  if (appMode === APP_MODE.PUBLISHED) return;
+  if (!evaluationOrder) return;
+  evaluationOrder.forEach((evaluatedPath) => {
+    const { entityName, propertyPath } = getEntityNameAndPropertyPath(
+      evaluatedPath,
+    );
+    const entity = dataTree[entityName];
+    if (isAction(entity) || isWidget(entity)) {
+      const unevalValue = _.get(unEvalTree, evaluatedPath);
+      const entityType = isAction(entity) ? entity.pluginType : entity.type;
+      const isABinding = _.find(entity.dynamicBindingPathList, {
+        key: propertyPath,
+      });
+      const logBlackList = entity.logBlackList;
+      const errors: EvaluationError[] = _.get(
+        dataTree,
+        getEvalErrorPath(evaluatedPath),
+        [],
+      ) as EvaluationError[];
+      const criticalErrors = errors.filter(
+        (error) => error.errorType !== PropertyEvaluationErrorType.LINT,
+      );
+      const hasErrors = criticalErrors.length > 0;
+
+      if (isABinding && !hasErrors && !(propertyPath in logBlackList)) {
+        AnalyticsUtil.logEvent("BINDING_SUCCESS", {
+          unevalValue,
+          entityType,
+          propertyPath,
+        });
+      }
+    }
+  });
+}
+
+// Update only the changed entities on tern. We will pick up the updated
+// entities from the evaluation order and create a new def from them.
+// When there is a top level entity removed in removedPaths,
+// we will remove its def
+function* updateTernDefinitions(
+  dataTree: DataTree,
+  evaluationOrder: string[],
+  removedPaths: string[],
+  isFirstEvaluation: boolean,
+) {
+  const updatedEntities: Set<string> = new Set();
+  // If it is the first evaluation, we want to add everything in the data tree
+  if (isFirstEvaluation) {
+    Object.keys(dataTree).forEach((key) => updatedEntities.add(key));
+  } else {
+    evaluationOrder.forEach((path) => {
+      const { entityName } = getEntityNameAndPropertyPath(path);
+      updatedEntities.add(entityName);
+    });
+  }
+
+  updatedEntities.forEach((entityName) => {
+    const entity = dataTree[entityName];
+    if (entity) {
+      const { def, name } = dataTreeTypeDefCreator(entity, entityName);
+      TernServer.updateDef(name, def);
+    }
+  });
+  removedPaths.forEach((path) => {
+    // No '.' means that the path is an entity name
+    if (path.split(".").length === 1) {
+      TernServer.removeDef(path);
+    }
+  });
+}
 
 function* postEvalActionDispatcher(
   actions: Array<ReduxAction<unknown> | ReduxActionWithoutPayload>,
@@ -128,6 +344,7 @@ function* postEvalActionDispatcher(
 
 function* evaluateTreeSaga(
   postEvalActions?: Array<ReduxAction<unknown> | ReduxActionWithoutPayload>,
+  isFirstEvaluation = false,
 ) {
   const unevalTree = yield select(getUnevaluatedDataTree);
   log.debug({ unevalTree });
@@ -142,13 +359,29 @@ function* evaluateTreeSaga(
       widgetTypeConfigMap,
     },
   );
-  const { errors, dataTree, dependencies, logs } = workerResponse;
-  log.debug({ dataTree: dataTree });
-  logs.forEach((evalLog: any) => log.debug(evalLog));
-  evalErrorHandler(errors);
+  const {
+    dataTree,
+    dependencies,
+    errors,
+    evaluationOrder,
+    logs,
+    removedPaths,
+  } = workerResponse;
   PerformanceTracker.stopAsyncTracking(
     PerformanceTransactionName.DATA_TREE_EVALUATION,
   );
+  log.debug({ dataTree: dataTree });
+  logs.forEach((evalLog: any) => log.debug(evalLog));
+  yield call(evalErrorHandler, errors, dataTree, evaluationOrder);
+  yield fork(logSuccessfulBindings, unevalTree, dataTree, evaluationOrder);
+  yield fork(
+    updateTernDefinitions,
+    dataTree,
+    evaluationOrder,
+    removedPaths,
+    isFirstEvaluation,
+  );
+
   PerformanceTracker.startAsyncTracking(
     PerformanceTransactionName.SET_EVALUATED_TREE,
   );
@@ -183,7 +416,7 @@ export function* evaluateActionBindings(
 
   const { errors, values } = workerResponse;
 
-  evalErrorHandler(errors);
+  yield call(evalErrorHandler, errors);
   return values;
 }
 
@@ -200,7 +433,7 @@ export function* evaluateDynamicTrigger(
   );
 
   const { errors, triggers } = workerResponse;
-  evalErrorHandler(errors);
+  yield call(evalErrorHandler, errors);
   return triggers;
 }
 
@@ -288,7 +521,6 @@ const EVALUATE_REDUX_ACTIONS = [
 ];
 
 const shouldProcessAction = (action: ReduxAction<unknown>) => {
-  // debugger;
   if (
     action.type === ReduxActionTypes.BATCH_UPDATES_SUCCESS &&
     Array.isArray(action.payload)
@@ -350,7 +582,7 @@ function* evaluationChangeListenerSaga() {
   yield call(worker.start);
   widgetTypeConfigMap = WidgetFactory.getWidgetTypeConfigMap();
   const initAction = yield take(FIRST_EVAL_REDUX_ACTIONS);
-  yield fork(evaluateTreeSaga, initAction.postEvalActions);
+  yield fork(evaluateTreeSaga, initAction.postEvalActions, true);
   const evtActionChannel = yield actionChannel(
     EVALUATE_REDUX_ACTIONS,
     evalQueueBuffer(),
diff --git a/app/client/src/sagas/GlobalSearchSagas.ts b/app/client/src/sagas/GlobalSearchSagas.ts
index d2eebec0bf..7a2b03ea10 100644
--- a/app/client/src/sagas/GlobalSearchSagas.ts
+++ b/app/client/src/sagas/GlobalSearchSagas.ts
@@ -16,6 +16,7 @@ import {
 import { AppState } from "reducers";
 import { getIsEditorInitialized } from "selectors/editorSelectors";
 import { RecentEntity } from "components/editorComponents/GlobalSearch/utils";
+import log from "loglevel";
 
 export function* updateRecentEntity(actionPayload: ReduxAction<RecentEntity>) {
   try {
@@ -61,7 +62,7 @@ export function* updateRecentEntity(actionPayload: ReduxAction<RecentEntity>) {
       );
     }
   } catch (e) {
-    console.log(e, "error");
+    log.error(e);
   }
 }
 
diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts
index b062e74110..85c0b3e54e 100644
--- a/app/client/src/sagas/InitSagas.ts
+++ b/app/client/src/sagas/InitSagas.ts
@@ -24,7 +24,10 @@ import {
   setAppMode,
   updateAppPersistentStore,
 } from "actions/pageActions";
-import { fetchDatasources } from "actions/datasourceActions";
+import {
+  fetchDatasources,
+  fetchMockDatasources,
+} from "actions/datasourceActions";
 import { fetchPluginFormConfigs, fetchPlugins } from "actions/pluginActions";
 import { fetchActions, fetchActionsForView } from "actions/actionActions";
 import { fetchApplication } from "actions/applicationActions";
@@ -41,11 +44,12 @@ import {
   restoreRecentEntitiesRequest,
 } from "actions/globalSearchActions";
 import { resetEditorSuccess } from "actions/initActions";
-import { initCommentThreads } from "actions/commentActions";
 import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
 import { executePageLoadActions } from "actions/widgetActions";
+import { getIsEditorInitialized } from "selectors/editorSelectors";
+import { getIsInitialized as getIsViewerInitialized } from "selectors/appViewSelectors";
 
 function* failFastApiCalls(
   triggerActions: Array<ReduxAction<unknown> | ReduxActionWithoutPayload>,
@@ -96,7 +100,7 @@ function* initializeEditorSaga(
     const applicationAndLayoutCalls = yield failFastApiCalls(
       [
         fetchPageList(applicationId, APP_MODE.EDIT),
-        fetchPage(pageId),
+        fetchPage(pageId, true),
         fetchApplication(applicationId, APP_MODE.EDIT),
       ],
       [
@@ -113,14 +117,16 @@ function* initializeEditorSaga(
     if (!applicationAndLayoutCalls) return;
 
     const pluginsAndDatasourcesCalls = yield failFastApiCalls(
-      [fetchPlugins(), fetchDatasources()],
+      [fetchPlugins(), fetchDatasources(), fetchMockDatasources()],
       [
         ReduxActionTypes.FETCH_PLUGINS_SUCCESS,
         ReduxActionTypes.FETCH_DATASOURCES_SUCCESS,
+        ReduxActionTypes.FETCH_MOCK_DATASOURCES_SUCCESS,
       ],
       [
         ReduxActionErrorTypes.FETCH_PLUGINS_ERROR,
         ReduxActionErrorTypes.FETCH_DATASOURCES_ERROR,
+        ReduxActionErrorTypes.FETCH_MOCK_DATASOURCES_ERROR,
       ],
     );
     if (!pluginsAndDatasourcesCalls) return;
@@ -152,9 +158,6 @@ function* initializeEditorSaga(
       appName: appName,
     });
 
-    // todo remove (for dev)
-    yield put(initCommentThreads());
-
     yield put({
       type: ReduxActionTypes.INITIALIZE_EDITOR_SUCCESS,
     });
@@ -247,9 +250,6 @@ export function* initializeAppViewerSaga(
 
     yield put(setAppMode(APP_MODE.PUBLISHED));
 
-    // todo remove (for dev)
-    yield put(initCommentThreads());
-
     yield put({
       type: ReduxActionTypes.INITIALIZE_PAGE_VIEWER_SUCCESS,
     });
@@ -269,6 +269,17 @@ function* resetEditorSaga() {
   yield put(resetRecentEntities());
 }
 
+export function* waitForInit() {
+  const isEditorInitialised = yield select(getIsEditorInitialized);
+  const isViewerInitialized = yield select(getIsViewerInitialized);
+  if (!isEditorInitialised && !isViewerInitialized) {
+    yield take([
+      ReduxActionTypes.INITIALIZE_EDITOR_SUCCESS,
+      ReduxActionTypes.INITIALIZE_PAGE_VIEWER_SUCCESS,
+    ]);
+  }
+}
+
 export default function* watchInitSagas() {
   yield all([
     takeLatest(ReduxActionTypes.INITIALIZE_EDITOR, initializeEditorSaga),
diff --git a/app/client/src/sagas/ModalSagas.ts b/app/client/src/sagas/ModalSagas.ts
index 5b2c77deb3..b878edf3e1 100644
--- a/app/client/src/sagas/ModalSagas.ts
+++ b/app/client/src/sagas/ModalSagas.ts
@@ -28,10 +28,7 @@ import {
   getWidgetMetaProps,
 } from "sagas/selectors";
 import { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
-import {
-  resetChildrenMetaProperty,
-  updateWidgetMetaProperty,
-} from "actions/metaActions";
+import { updateWidgetMetaProperty } from "actions/metaActions";
 import { focusWidget } from "actions/widgetActions";
 import log from "loglevel";
 import { flatten } from "lodash";
@@ -119,7 +116,7 @@ export function* showModalSaga(action: ReduxAction<{ modalId: string }>) {
   });
 
   yield put({
-    type: ReduxActionTypes.SELECT_WIDGET,
+    type: ReduxActionTypes.SELECT_WIDGET_INIT,
     payload: { widgetId: action.payload.modalId },
   });
   yield put(focusWidget(action.payload.modalId));
@@ -186,7 +183,6 @@ export function* closeModalSaga(
           widgetIds.map((widgetId: string) => {
             return [
               put(updateWidgetMetaProperty(widgetId, "isVisible", false)),
-              put(resetChildrenMetaProperty(widgetId)),
             ];
           }),
         ),
diff --git a/app/client/src/sagas/NotificationsSagas.ts b/app/client/src/sagas/NotificationsSagas.ts
new file mode 100644
index 0000000000..0cf97a45a8
--- /dev/null
+++ b/app/client/src/sagas/NotificationsSagas.ts
@@ -0,0 +1,115 @@
+import { call, takeLatest, put, all } from "redux-saga/effects";
+import NotificationApi from "api/NotificationsAPI";
+import {
+  ReduxAction,
+  ReduxActionErrorTypes,
+  ReduxActionTypes,
+} from "constants/ReduxActionConstants";
+import { validateResponse } from "./ErrorSagas";
+
+import {
+  markAllNotificationsAsReadSuccess,
+  resetNotifications,
+  fetchNotificationsSuccess,
+  fetchUnreadNotificationsCountSuccess,
+  fetchUnreadNotificationsCountRequest,
+  markNotificationAsReadSuccess,
+} from "actions/notificationActions";
+
+export function* fetchNotifications(action: ReduxAction<string>) {
+  try {
+    const response = yield call(
+      NotificationApi.fetchNotifications,
+      action.payload,
+    );
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      yield put(fetchNotificationsSuccess({ notifications: response.data }));
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.FETCH_NOTIFICATIONS_ERROR,
+      payload: { error, logToSentry: true },
+    });
+  }
+}
+
+/**
+ * 1. mark all as read
+ * 2. reset notifications
+ * 3. reset unread notificaions count
+ */
+function* markAllNotificationsAsRead() {
+  try {
+    const response = yield call(NotificationApi.markAllNotificationsAsRead);
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      yield put(markAllNotificationsAsReadSuccess());
+      const response = yield call(NotificationApi.fetchNotifications);
+      const isValidResponse = yield validateResponse(response);
+      if (isValidResponse) {
+        yield put(resetNotifications({ notifications: response.data }));
+      }
+      yield put(fetchUnreadNotificationsCountRequest());
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.MARK_ALL_NOTIFICAIONS_AS_READ_ERROR,
+      payload: { error, logToSentry: true },
+    });
+  }
+}
+
+function* fetchUnreadNotificationsCount() {
+  try {
+    const response = yield call(NotificationApi.fetchUnreadNotificationsCount);
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      yield put(fetchUnreadNotificationsCountSuccess(response.data));
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.FETCH_UNREAD_NOTIFICATIONS_COUNT_ERROR,
+      payload: { error, logToSentry: true },
+    });
+  }
+}
+
+function* markNotificationAsRead(action: ReduxAction<string>) {
+  try {
+    const response = yield call(NotificationApi.markNotificationsAsRead, [
+      action.payload,
+    ]);
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      yield put(fetchUnreadNotificationsCountSuccess(response.data));
+      yield put(markNotificationAsReadSuccess(action.payload));
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.MARK_NOTIFICATION_AS_READ_ERROR,
+      payload: { error, logToSentry: true },
+    });
+  }
+}
+
+export default function* notificationsSagas() {
+  yield all([
+    takeLatest(
+      ReduxActionTypes.FETCH_NOTIFICATIONS_REQUEST,
+      fetchNotifications,
+    ),
+    takeLatest(
+      ReduxActionTypes.MARK_ALL_NOTIFICATIONS_AS_READ_REQUEST,
+      markAllNotificationsAsRead,
+    ),
+    takeLatest(
+      ReduxActionTypes.FETCH_UNREAD_NOTIFICATIONS_COUNT_REQUEST,
+      fetchUnreadNotificationsCount,
+    ),
+    takeLatest(
+      ReduxActionTypes.MARK_NOTIFICATION_AS_READ_REQUEST,
+      markNotificationAsRead,
+    ),
+  ]);
+}
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index 256836c9a3..04ed1491ca 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -74,7 +74,8 @@ import { createActionRequest, runActionInit } from "actions/actionActions";
 import {
   APPLICATIONS_URL,
   BUILDER_PAGE_URL,
-  QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID,
+  INTEGRATION_EDITOR_URL,
+  INTEGRATION_TABS,
 } from "constants/routes";
 import { QueryAction } from "entities/Action";
 import history from "utils/history";
@@ -83,13 +84,19 @@ import { getQueryIdFromURL } from "pages/Editor/Explorer/helpers";
 import { RenderModes, WidgetTypes } from "constants/WidgetConstants";
 import { generateReactKey } from "utils/generators";
 import { forceOpenPropertyPane } from "actions/widgetActions";
-import { navigateToCanvas } from "pages/Editor/Explorer/Widgets/WidgetEntity";
+import { navigateToCanvas } from "pages/Editor/Explorer/Widgets/utils";
 import {
   batchUpdateWidgetProperty,
   updateWidgetPropertyRequest,
-} from "../actions/controlActions";
+} from "actions/controlActions";
 import OnSubmitGif from "assets/gifs/onsubmit.gif";
 import { checkAndGetPluginFormConfigsSaga } from "sagas/PluginSagas";
+import { GRID_DENSITY_MIGRATION_V1 } from "mockResponses/WidgetConfigResponse";
+import {
+  EVAL_ERROR_PATH,
+  EvaluationError,
+  PropertyEvaluationErrorType,
+} from "utils/DynamicBindingUtils";
 
 export const getCurrentStep = (state: AppState) =>
   state.ui.onBoarding.currentStep;
@@ -288,7 +295,6 @@ function* listenForSuccessfulBinding() {
       const dataTree = yield select(getDataTree);
 
       if (dataTree[selectedWidget.widgetName]) {
-        const widgetProperties = dataTree[selectedWidget.widgetName];
         const dynamicBindingPathList =
           dataTree[selectedWidget.widgetName].dynamicBindingPathList;
         const tableHasData = dataTree[selectedWidget.widgetName].tableData;
@@ -298,18 +304,21 @@ function* listenForSuccessfulBinding() {
           dynamicBindingPathList.some(
             (item: { key: string }) => item.key === "tableData",
           );
+        const errors = get(
+          selectedWidget,
+          `${EVAL_ERROR_PATH}.tableData`,
+          [],
+        ).filter(
+          (error: EvaluationError) =>
+            error.errorType !== PropertyEvaluationErrorType.LINT,
+        );
 
         bindSuccessful =
-          bindSuccessful && hasBinding && tableHasData && tableHasData.length;
-
-        if (widgetProperties.invalidProps) {
-          bindSuccessful =
-            bindSuccessful &&
-            !(
-              "tableData" in widgetProperties.invalidProps &&
-              widgetProperties.invalidProps.tableData
-            );
-        }
+          bindSuccessful &&
+          hasBinding &&
+          Array.isArray(tableHasData) &&
+          tableHasData.length &&
+          errors.length === 0;
 
         if (bindSuccessful) {
           yield put(
@@ -587,6 +596,7 @@ function* createApplication() {
 function* createQuery() {
   const currentPageId = yield select(getCurrentPageId);
   const applicationId = yield select(getCurrentApplicationId);
+  const currentSubstep = yield select(getCurrentSubStep);
   const datasources: Datasource[] = yield select(getDatasources);
   const onboardingDatasource = datasources.find((datasource) => {
     const name = get(datasource, "name");
@@ -594,6 +604,20 @@ function* createQuery() {
     return name === "Super Updates DB";
   });
 
+  // If the user is on substep 2 of the CREATE_QUERY step
+  // just run the query.
+  if (currentSubstep == 2) {
+    yield put({
+      type: "ONBOARDING_RUN_QUERY",
+    });
+
+    AnalyticsUtil.logEvent("ONBOARDING_CHEAT", {
+      step: 1,
+    });
+
+    return;
+  }
+
   if (onboardingDatasource) {
     const payload = {
       name: "fetch_standup_updates",
@@ -611,10 +635,10 @@ function* createQuery() {
 
     yield put(createActionRequest(payload));
     history.push(
-      QUERY_EDITOR_URL_WITH_SELECTED_PAGE_ID(
+      INTEGRATION_EDITOR_URL(
         applicationId,
         currentPageId,
-        currentPageId,
+        INTEGRATION_TABS.ACTIVE,
       ),
     );
 
@@ -666,7 +690,7 @@ function* addWidget(widgetConfig: any) {
       newWidget.newWidgetId,
     );
     yield put({
-      type: ReduxActionTypes.SELECT_WIDGET,
+      type: ReduxActionTypes.SELECT_WIDGET_INIT,
       payload: { widgetId: newWidget.newWidgetId },
     });
     yield put(forceOpenPropertyPane(newWidget.newWidgetId));
@@ -674,14 +698,14 @@ function* addWidget(widgetConfig: any) {
 }
 
 const getStandupTableDimensions = () => {
-  const columns = 16;
-  const rows = 15;
-  const topRow = 2;
+  const columns = 16 * GRID_DENSITY_MIGRATION_V1;
+  const rows = 15 * GRID_DENSITY_MIGRATION_V1;
+  const topRow = 2 * GRID_DENSITY_MIGRATION_V1;
   const bottomRow = rows + topRow;
   return {
     parentRowSpace: 40,
     parentColumnSpace: 1,
-    topRow: 2,
+    topRow,
     bottomRow,
     leftColumn: 0,
     rightColumn: columns,
@@ -691,13 +715,13 @@ const getStandupTableDimensions = () => {
 };
 
 const getStandupInputDimensions = () => {
-  const columns = 6;
-  const rows = 1;
-  const leftColumn = 5;
+  const columns = 6 * GRID_DENSITY_MIGRATION_V1;
+  const rows = 1 * GRID_DENSITY_MIGRATION_V1;
+  const leftColumn = 5 * GRID_DENSITY_MIGRATION_V1;
   const rightColumn = leftColumn + columns;
   return {
-    topRow: 1,
-    bottomRow: 2,
+    topRow: 1 * GRID_DENSITY_MIGRATION_V1,
+    bottomRow: 2 * GRID_DENSITY_MIGRATION_V1,
     leftColumn,
     rightColumn,
     rows,
@@ -784,7 +808,7 @@ function* addOnSubmitHandler() {
         inputWidget.widgetId,
       );
       yield put({
-        type: ReduxActionTypes.SELECT_WIDGET,
+        type: ReduxActionTypes.SELECT_WIDGET_INIT,
         payload: { widgetId: inputWidget.widgetId },
       });
       yield put(forceOpenPropertyPane(inputWidget.widgetId));
diff --git a/app/client/src/sagas/OrgSagas.ts b/app/client/src/sagas/OrgSagas.ts
index f00e18dfe3..a7158c54ca 100644
--- a/app/client/src/sagas/OrgSagas.ts
+++ b/app/client/src/sagas/OrgSagas.ts
@@ -28,8 +28,10 @@ import { ApiResponse } from "api/ApiResponses";
 import { Toaster } from "components/ads/Toast";
 import { Variant } from "components/ads/common";
 import { getCurrentOrg } from "selectors/organizationSelectors";
+import { getCurrentUser } from "selectors/usersSelectors";
 import { Org } from "constants/orgConstants";
 import history from "utils/history";
+import { APPLICATIONS_URL } from "constants/routes";
 import { getAllApplications } from "actions/applicationActions";
 import log from "loglevel";
 
@@ -133,12 +135,17 @@ export function* deleteOrgUserSaga(action: ReduxAction<DeleteOrgUserRequest>) {
     const response: ApiResponse = yield call(OrgApi.deleteOrgUser, request);
     const isValidResponse = yield validateResponse(response);
     if (isValidResponse) {
-      yield put({
-        type: ReduxActionTypes.DELETE_ORG_USER_SUCCESS,
-        payload: {
-          username: action.payload.username,
-        },
-      });
+      const currentUser = yield select(getCurrentUser);
+      if (currentUser?.username == action.payload.username) {
+        history.replace(APPLICATIONS_URL);
+      } else {
+        yield put({
+          type: ReduxActionTypes.DELETE_ORG_USER_SUCCESS,
+          payload: {
+            username: action.payload.username,
+          },
+        });
+      }
       Toaster.show({
         text: `${response.data.username} has been removed successfully`,
         variant: Variant.success,
@@ -202,7 +209,7 @@ export function* saveOrgSaga(action: ReduxAction<SaveOrgRequest>) {
 export function* createOrgSaga(
   action: ReduxActionWithPromise<CreateOrgRequest>,
 ) {
-  const { resolve, reject, name } = action.payload;
+  const { name, reject, resolve } = action.payload;
   try {
     const request: CreateOrgRequest = { name };
     const response: ApiResponse = yield callAPI(OrgApi.createOrg, request);
diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx
index d8d0c5c06b..c477b29ade 100644
--- a/app/client/src/sagas/PageSagas.tsx
+++ b/app/client/src/sagas/PageSagas.tsx
@@ -20,6 +20,8 @@ import {
   updateCurrentPage,
   updateWidgetNameSuccess,
   updateAndSaveLayout,
+  saveLayout,
+  setLastUpdatedTime,
 } from "actions/pageActions";
 import PageApi, {
   ClonePageRequest,
@@ -49,7 +51,10 @@ import {
 import history from "utils/history";
 import { BUILDER_PAGE_URL } from "constants/routes";
 import { isNameValid } from "utils/helpers";
-import { extractCurrentDSL } from "utils/WidgetPropsUtils";
+import {
+  checkIfMigrationIsNeeded,
+  extractCurrentDSL,
+} from "utils/WidgetPropsUtils";
 import {
   getAllPageIds,
   getEditorConfigs,
@@ -85,6 +90,7 @@ import * as Sentry from "@sentry/react";
 import { ERROR_CODES } from "constants/ApiConstants";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import DEFAULT_TEMPLATE from "templates/default";
+import { getAppMode } from "selectors/applicationSelectors";
 
 const getWidgetName = (state: AppState, widgetId: string) =>
   state.entities.canvasWidgets[widgetId];
@@ -169,11 +175,14 @@ export const getCanvasWidgetsPayload = (
   };
 };
 
+const getLastUpdateTime = (pageResponse: FetchPageResponse): number =>
+  pageResponse.data.lastUpdatedTime;
+
 export function* fetchPageSaga(
   pageRequestAction: ReduxAction<FetchPageRequest>,
 ) {
   try {
-    const { id } = pageRequestAction.payload;
+    const { id, isFirstLoad } = pageRequestAction.payload;
     PerformanceTracker.startAsyncTracking(
       PerformanceTransactionName.FETCH_PAGE_API,
       { pageId: id },
@@ -182,6 +191,8 @@ export function* fetchPageSaga(
       id,
     });
     const isValidResponse = yield validateResponse(fetchPageResponse);
+    const willPageBeMigrated = checkIfMigrationIsNeeded(fetchPageResponse);
+    const lastUpdatedTime = getLastUpdateTime(fetchPageResponse);
 
     if (isValidResponse) {
       // Clear any existing caches
@@ -195,13 +206,24 @@ export function* fetchPageSaga(
       // set current page
       yield put(updateCurrentPage(id));
       // dispatch fetch page success
-      yield put(fetchPageSuccess());
-
+      yield put(
+        fetchPageSuccess(
+          // Execute page load actions post page load
+          isFirstLoad ? [] : [executePageLoadActions()],
+        ),
+      );
+      // Sets last updated time
+      yield put(setLastUpdatedTime(lastUpdatedTime));
+      const extractedDSL = extractCurrentDSL(fetchPageResponse);
       yield put({
         type: ReduxActionTypes.UPDATE_CANVAS_STRUCTURE,
-        payload: extractCurrentDSL(fetchPageResponse),
+        payload: extractedDSL,
       });
 
+      if (willPageBeMigrated) {
+        yield put(saveLayout());
+      }
+
       PerformanceTracker.stopAsyncTracking(
         PerformanceTransactionName.FETCH_PAGE_API,
       );
@@ -227,7 +249,7 @@ export function* fetchPublishedPageSaga(
   pageRequestAction: ReduxAction<{ pageId: string; bustCache: boolean }>,
 ) {
   try {
-    const { pageId, bustCache } = pageRequestAction.payload;
+    const { bustCache, pageId } = pageRequestAction.payload;
     PerformanceTracker.startAsyncTracking(
       PerformanceTransactionName.FETCH_PAGE_API,
       {
@@ -326,7 +348,7 @@ function* savePageSaga(action: ReduxAction<{ isRetry?: boolean }>) {
     );
     const isValidResponse = yield validateResponse(savePageResponse);
     if (isValidResponse) {
-      const { messages, actionUpdates } = savePageResponse.data;
+      const { actionUpdates, messages } = savePageResponse.data;
       // Show toast messages from the server
       if (messages && messages.length) {
         savePageResponse.data.messages.forEach((message) => {
@@ -340,6 +362,7 @@ function* savePageSaga(action: ReduxAction<{ isRetry?: boolean }>) {
       if (actionUpdates && actionUpdates.length > 0) {
         yield put(setActionsToExecuteOnPageLoad(actionUpdates));
       }
+      yield put(setLastUpdatedTime(Date.now() / 1000));
       yield put(savePageSuccess(savePageResponse));
       PerformanceTracker.stopAsyncTracking(
         PerformanceTransactionName.SAVE_PAGE_API,
@@ -362,7 +385,7 @@ function* savePageSaga(action: ReduxAction<{ isRetry?: boolean }>) {
     });
 
     if (error instanceof IncorrectBindingError) {
-      const { isRetry } = action.payload;
+      const { isRetry } = action?.payload;
       const incorrectBindingError = JSON.parse(error.message);
       const { message } = incorrectBindingError;
       if (isRetry) {
@@ -419,10 +442,10 @@ function getLayoutSavePayload(
 
 export function* saveLayoutSaga(action: ReduxAction<{ isRetry?: boolean }>) {
   try {
-    yield put({
-      type: ReduxActionTypes.SAVE_PAGE_INIT,
-      payload: action.payload,
-    });
+    const appMode: APP_MODE | undefined = yield select(getAppMode);
+    if (appMode === APP_MODE.EDIT) {
+      yield put(saveLayout(action.payload.isRetry));
+    }
   } catch (error) {
     yield put({
       type: ReduxActionErrorTypes.SAVE_PAGE_ERROR,
diff --git a/app/client/src/sagas/QueryPaneSagas.ts b/app/client/src/sagas/QueryPaneSagas.ts
index acdeb053e4..b1a452446b 100644
--- a/app/client/src/sagas/QueryPaneSagas.ts
+++ b/app/client/src/sagas/QueryPaneSagas.ts
@@ -14,7 +14,8 @@ import {
   APPLICATIONS_URL,
   DATA_SOURCES_EDITOR_ID_URL,
   QUERIES_EDITOR_ID_URL,
-  QUERIES_EDITOR_URL,
+  INTEGRATION_EDITOR_URL,
+  INTEGRATION_TABS,
 } from "constants/routes";
 import {
   getCurrentApplicationId,
@@ -37,6 +38,7 @@ import { Toaster } from "components/ads/Toast";
 import { Datasource } from "entities/Datasource";
 import _ from "lodash";
 import { createMessage, ERROR_ACTION_RENAME_FAIL } from "constants/messages";
+import get from "lodash/get";
 
 function* changeQuerySaga(actionPayload: ReduxAction<{ id: string }>) {
   const { id } = actionPayload.payload;
@@ -58,7 +60,9 @@ function* changeQuerySaga(actionPayload: ReduxAction<{ id: string }>) {
   }
   const action = yield select(getAction, id);
   if (!action) {
-    history.push(QUERIES_EDITOR_URL(applicationId, pageId));
+    history.push(
+      INTEGRATION_EDITOR_URL(applicationId, pageId, INTEGRATION_TABS.ACTIVE),
+    );
     return;
   }
 
@@ -91,7 +95,7 @@ function* changeQuerySaga(actionPayload: ReduxAction<{ id: string }>) {
 function* formValueChangeSaga(
   actionPayload: ReduxActionWithMeta<string, { field: string; form: string }>,
 ) {
-  const { form, field } = actionPayload.meta;
+  const { field, form } = actionPayload.meta;
   if (field === "dynamicBindingPathList" || field === "name") return;
   if (form !== QUERY_EDITOR_FORM_NAME) return;
   const { values } = yield select(getFormData, QUERY_EDITOR_FORM_NAME);
@@ -114,21 +118,35 @@ function* formValueChangeSaga(
     return;
   }
 
-  yield put(
-    setActionProperty({
-      actionId: values.id,
-      propertyName: field,
-      value: actionPayload.payload,
-    }),
-  );
+  if (
+    actionPayload.type === ReduxFormActionTypes.ARRAY_REMOVE ||
+    actionPayload.type === ReduxFormActionTypes.ARRAY_PUSH
+  ) {
+    const value = get(values, field);
+    yield put(
+      setActionProperty({
+        actionId: values.id,
+        propertyName: field,
+        value,
+      }),
+    );
+  } else {
+    yield put(
+      setActionProperty({
+        actionId: values.id,
+        propertyName: field,
+        value: actionPayload.payload,
+      }),
+    );
+  }
 }
 
 function* handleQueryCreatedSaga(actionPayload: ReduxAction<QueryAction>) {
   const {
-    id,
-    pluginType,
-    pluginId,
     actionConfiguration,
+    id,
+    pluginId,
+    pluginType,
   } = actionPayload.payload;
   if (pluginType === PluginType.DB) {
     yield put(initialize(QUERY_EDITOR_FORM_NAME, actionPayload.payload));
@@ -144,6 +162,7 @@ function* handleQueryCreatedSaga(actionPayload: ReduxAction<QueryAction>) {
       QUERIES_EDITOR_ID_URL(applicationId, pageId, id, {
         editName: "true",
         showTemplate,
+        from: "datasources",
       }),
     );
   }
@@ -161,7 +180,12 @@ function* handleDatasourceCreatedSaga(actionPayload: ReduxAction<Datasource>) {
     initialize(DATASOURCE_DB_FORM, _.omit(actionPayload.payload, "name")),
   );
   history.push(
-    DATA_SOURCES_EDITOR_ID_URL(applicationId, pageId, actionPayload.payload.id),
+    DATA_SOURCES_EDITOR_ID_URL(
+      applicationId,
+      pageId,
+      actionPayload.payload.id,
+      { from: "datasources" },
+    ),
   );
 }
 
diff --git a/app/client/src/sagas/RecentEntitiesSagas.ts b/app/client/src/sagas/RecentEntitiesSagas.ts
index cdeae94905..bcbaf77415 100644
--- a/app/client/src/sagas/RecentEntitiesSagas.ts
+++ b/app/client/src/sagas/RecentEntitiesSagas.ts
@@ -63,7 +63,7 @@ function* handleSelectWidget(action: ReduxAction<{ widgetId: string }>) {
 function* handlePathUpdated(
   action: ReduxAction<{ location: typeof window.location }>,
 ) {
-  const { type, id, params } = getRecentEntity(
+  const { id, params, type } = getRecentEntity(
     action.payload.location.pathname,
   );
   if (type && id && id.indexOf(":") === -1) {
@@ -73,7 +73,7 @@ function* handlePathUpdated(
 
 export default function* recentEntitiesSagas() {
   yield all([
-    takeLatest(ReduxActionTypes.SELECT_WIDGET, handleSelectWidget),
+    takeLatest(ReduxActionTypes.SELECT_WIDGET_INIT, handleSelectWidget),
     takeLatest(ReduxActionTypes.HANDLE_PATH_UPDATED, handlePathUpdated),
   ]);
 }
diff --git a/app/client/src/sagas/SaaSPaneSagas.ts b/app/client/src/sagas/SaaSPaneSagas.ts
index 4fbe7d7f6a..88f06089ac 100644
--- a/app/client/src/sagas/SaaSPaneSagas.ts
+++ b/app/client/src/sagas/SaaSPaneSagas.ts
@@ -37,6 +37,7 @@ function* handleDatasourceCreatedSaga(actionPayload: ReduxAction<Datasource>) {
       pageId,
       plugin.packageName,
       actionPayload.payload.id,
+      { from: "datasources" },
     ),
   );
 }
@@ -51,6 +52,7 @@ function* handleActionCreatedSaga(actionPayload: ReduxAction<Action>) {
   history.push(
     SAAS_EDITOR_API_ID_URL(applicationId, pageId, plugin.packageName, id, {
       editName: "true",
+      from: "datasources",
     }),
   );
 }
@@ -58,7 +60,7 @@ function* handleActionCreatedSaga(actionPayload: ReduxAction<Action>) {
 function* formValueChangeSaga(
   actionPayload: ReduxActionWithMeta<string, { field: string; form: string }>,
 ) {
-  const { form, field } = actionPayload.meta;
+  const { field, form } = actionPayload.meta;
   if (field === "dynamicBindingPathList" || field === "name") return;
   if (form !== SAAS_EDITOR_FORM) return;
   const { values } = yield select(getFormData, SAAS_EDITOR_FORM);
diff --git a/app/client/src/sagas/SelectionCanvasSagas.ts b/app/client/src/sagas/SelectionCanvasSagas.ts
new file mode 100644
index 0000000000..d464068bfe
--- /dev/null
+++ b/app/client/src/sagas/SelectionCanvasSagas.ts
@@ -0,0 +1,134 @@
+import { selectMultipleWidgetsAction } from "actions/widgetSelectionActions";
+import { OccupiedSpace } from "constants/editorConstants";
+import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
+import {
+  CONTAINER_GRID_PADDING,
+  MAIN_CONTAINER_WIDGET_ID,
+  WIDGET_PADDING,
+  GridDefaults,
+} from "constants/WidgetConstants";
+import { isEqual } from "lodash";
+import { SelectedArenaDimensions } from "pages/common/CanvasSelectionArena";
+import { all, cancel, put, select, take, takeLatest } from "redux-saga/effects";
+import { getOccupiedSpaces } from "selectors/editorSelectors";
+import { getSelectedWidgets } from "selectors/ui";
+import { snapToGrid } from "utils/helpers";
+import { areIntersecting } from "utils/WidgetPropsUtils";
+import { WidgetProps } from "widgets/BaseWidget";
+import { getWidget } from "./selectors";
+
+interface StartingSelectionState {
+  lastSelectedWidgets: string[];
+  mainContainer: WidgetProps;
+  widgetOccupiedSpaces:
+    | {
+        [containerWidgetId: string]: OccupiedSpace[];
+      }
+    | undefined;
+}
+function* selectAllWidgetsInAreaSaga(
+  StartingSelectionState: StartingSelectionState,
+  action: ReduxAction<any>,
+) {
+  const {
+    lastSelectedWidgets,
+    mainContainer,
+    widgetOccupiedSpaces,
+  } = StartingSelectionState;
+  const {
+    isMultiSelect,
+    selectionArena,
+    snapToNextColumn,
+    snapToNextRow,
+  }: {
+    selectionArena: SelectedArenaDimensions;
+    snapToNextColumn: boolean;
+    snapToNextRow: boolean;
+    isMultiSelect: boolean;
+  } = action.payload;
+
+  const padding = CONTAINER_GRID_PADDING + WIDGET_PADDING;
+  const snapSpace = {
+    snapColumnWidth:
+      (mainContainer.rightColumn - 2 * padding) / mainContainer.snapColumns,
+    snapColumnHeight: GridDefaults.DEFAULT_GRID_ROW_HEIGHT,
+  };
+  // we use snapToNextRow, snapToNextColumn to determine if the selection rectangle is inverted
+  // so to snap not to the next column or row like we usually do,
+  // but to snap it to the one before it coz the rectangle is inverted.
+  const topLeftCorner = snapToGrid(
+    snapSpace.snapColumnWidth,
+    snapSpace.snapColumnHeight,
+    selectionArena.left - (snapToNextRow ? snapSpace.snapColumnWidth : 0),
+    selectionArena.top - (snapToNextColumn ? snapSpace.snapColumnHeight : 0),
+  );
+  const bottomRightCorner = snapToGrid(
+    snapSpace.snapColumnWidth,
+    snapSpace.snapColumnHeight,
+    selectionArena.left + selectionArena.width,
+    selectionArena.top + selectionArena.height,
+  );
+
+  if (widgetOccupiedSpaces) {
+    const mainContainerWidgets = widgetOccupiedSpaces[MAIN_CONTAINER_WIDGET_ID];
+    const widgets = Object.values(mainContainerWidgets || {});
+    const widgetsToBeSelected = widgets.filter((eachWidget) => {
+      const { bottom, left, right, top } = eachWidget;
+      return areIntersecting(
+        { bottom, left, right, top },
+        {
+          bottom: bottomRightCorner[1],
+          right: bottomRightCorner[0],
+          top: topLeftCorner[1],
+          left: topLeftCorner[0],
+        },
+      );
+    });
+    const widgetIdsToSelect = widgetsToBeSelected.map((each) => each.id);
+    const filteredLastSelectedWidgets = isMultiSelect
+      ? lastSelectedWidgets.filter((each) => !widgetIdsToSelect.includes(each))
+      : lastSelectedWidgets;
+    const filteredWidgetsToSelect = isMultiSelect
+      ? [
+          ...filteredLastSelectedWidgets,
+          ...widgetIdsToSelect.filter(
+            (each) => !lastSelectedWidgets.includes(each),
+          ),
+        ]
+      : widgetIdsToSelect;
+    const currentSelectedWidgets: string[] = yield select(getSelectedWidgets);
+
+    if (!isEqual(filteredWidgetsToSelect, currentSelectedWidgets)) {
+      yield put(selectMultipleWidgetsAction(filteredWidgetsToSelect));
+    }
+  }
+}
+
+function* startCanvasSelectionSaga() {
+  const lastSelectedWidgets: string[] = yield select(getSelectedWidgets);
+  const mainContainer: WidgetProps = yield select(
+    getWidget,
+    MAIN_CONTAINER_WIDGET_ID,
+  );
+  const widgetOccupiedSpaces:
+    | {
+        [containerWidgetId: string]: OccupiedSpace[];
+      }
+    | undefined = yield select(getOccupiedSpaces);
+  const selectionTask = yield takeLatest(
+    ReduxActionTypes.SELECT_WIDGETS_IN_AREA,
+    selectAllWidgetsInAreaSaga,
+    { lastSelectedWidgets, mainContainer, widgetOccupiedSpaces },
+  );
+  yield take(ReduxActionTypes.STOP_CANVAS_SELECTION);
+  yield cancel(selectionTask);
+}
+
+export default function* selectionCanvasSagas() {
+  yield all([
+    takeLatest(
+      ReduxActionTypes.START_CANVAS_SELECTION,
+      startCanvasSelectionSaga,
+    ),
+  ]);
+}
diff --git a/app/client/src/sagas/TourSagas.ts b/app/client/src/sagas/TourSagas.ts
new file mode 100644
index 0000000000..21de821430
--- /dev/null
+++ b/app/client/src/sagas/TourSagas.ts
@@ -0,0 +1,30 @@
+import { ReduxActionTypes } from "constants/ReduxActionConstants";
+import { all, takeLatest, select, put } from "redux-saga/effects";
+import { getActiveTourIndex, getActiveTourType } from "selectors/tourSelectors";
+import { setActiveTourIndex, resetActiveTour } from "actions/tourActions";
+import TourSteps from "constants/TourSteps";
+import { TourType } from "entities/Tour";
+
+function* proceedToNextTourStep() {
+  const currentStep = yield select(getActiveTourIndex);
+  const activeTourType = yield select(getActiveTourType);
+  const activeTourSteps = TourSteps[activeTourType as TourType];
+
+  if (!activeTourSteps) return;
+
+  const lengthOfTour = activeTourSteps.length;
+  if (lengthOfTour - 1 === currentStep) {
+    yield put(resetActiveTour());
+  } else {
+    yield put(setActiveTourIndex(currentStep + 1));
+  }
+}
+
+export default function* themeSagas() {
+  yield all([
+    takeLatest(
+      ReduxActionTypes.PROCEED_TO_NEXT_TOUR_STEP,
+      proceedToNextTourStep,
+    ),
+  ]);
+}
diff --git a/app/client/src/sagas/WebsocketSagas.ts b/app/client/src/sagas/WebsocketSagas/WebsocketSagas.ts
similarity index 80%
rename from app/client/src/sagas/WebsocketSagas.ts
rename to app/client/src/sagas/WebsocketSagas/WebsocketSagas.ts
index 3f971d29f2..a321ef20d4 100644
--- a/app/client/src/sagas/WebsocketSagas.ts
+++ b/app/client/src/sagas/WebsocketSagas/WebsocketSagas.ts
@@ -13,20 +13,20 @@ import {
   ReduxActionTypes,
   ReduxSagaChannels,
 } from "constants/ReduxActionConstants";
-import { ANONYMOUS_USERNAME } from "constants/userConstants";
 import {
   WEBSOCKET_EVENTS,
   websocketDisconnectedEvent,
   websocketConnectedEvent,
 } from "constants/WebsocketConstants";
 
-import { commentEvent } from "actions/commentActions";
 import {
   setIsWebsocketConnected,
   retrySocketConnection,
 } from "actions/websocketActions";
 
-import { areCommentsEnabledForUser } from "selectors/commentsSelectors";
+import { areCommentsEnabledForUserAndApp } from "selectors/commentsSelectors";
+
+import handleSocketEvent from "./handleSocketEvent";
 
 function connect() {
   const socket = io();
@@ -69,8 +69,9 @@ function* read(socket: any) {
       case WEBSOCKET_EVENTS.CONNECTED:
         yield put(setIsWebsocketConnected(true));
         break;
-      default:
-        yield put(commentEvent(action));
+      default: {
+        yield call(handleSocketEvent, action);
+      }
     }
   }
 }
@@ -95,9 +96,9 @@ function* handleIO(socket: any) {
 
 function* flow() {
   while (true) {
-    const { payload } = yield take([
-      ReduxActionTypes.FETCH_USER_DETAILS_SUCCESS,
-      ReduxActionTypes.RETRY_WEBSOCKET_CONNECTION,
+    yield take([
+      ReduxActionTypes.SET_ARE_COMMENTS_ENABLED,
+      ReduxActionTypes.RETRY_WEBSOCKET_CONNECTION, // for manually triggering reconnection
     ]);
 
     try {
@@ -108,14 +109,17 @@ function* flow() {
        * We only need to retry incase the socket connection isn't made
        * in the first attempt itself
        */
-      if (payload.name !== ANONYMOUS_USERNAME) {
-        const commentsEnabled = yield select(areCommentsEnabledForUser);
-        if (!commentsEnabled) return;
-
+      const commentsEnabled = yield select(areCommentsEnabledForUserAndApp);
+      if (commentsEnabled) {
         const socket = yield call(connect);
         const task = yield fork(handleIO, socket);
         yield put(setIsWebsocketConnected(true));
-        yield take(ReduxActionTypes.LOGOUT_USER_INIT);
+        // Disconnect if comments are disabled or user is logged out
+        yield take([
+          ReduxActionTypes.SET_ARE_COMMENTS_ENABLED,
+          ReduxActionTypes.LOGOUT_USER_INIT,
+        ]);
+        yield take();
         yield cancel(task);
         socket.disconnect();
       }
diff --git a/app/client/src/sagas/WebsocketSagas/constants.ts b/app/client/src/sagas/WebsocketSagas/constants.ts
new file mode 100644
index 0000000000..30808d8bdb
--- /dev/null
+++ b/app/client/src/sagas/WebsocketSagas/constants.ts
@@ -0,0 +1,11 @@
+export const SOCKET_EVENTS = {
+  // comment events
+  // SET_COMMENTS: "SET_COMMENTS",
+  INSERT_COMMENT_THREAD: "insert:commentThread",
+  INSERT_COMMENT: "insert:comment",
+  UPDATE_COMMENT_THREAD: "update:commentThread",
+  UPDATE_COMMENT: "update:comment",
+
+  // notification events
+  INSERT_NOTIFICATION: "insert:notification",
+};
diff --git a/app/client/src/sagas/WebsocketSagas/handleSocketEvent.ts b/app/client/src/sagas/WebsocketSagas/handleSocketEvent.ts
new file mode 100644
index 0000000000..703a707a6b
--- /dev/null
+++ b/app/client/src/sagas/WebsocketSagas/handleSocketEvent.ts
@@ -0,0 +1,52 @@
+import { put, select } from "redux-saga/effects";
+import { SOCKET_EVENTS } from "./constants";
+
+import {
+  newCommentEvent,
+  newCommentThreadEvent,
+  updateCommentThreadEvent,
+  updateCommentEvent,
+  incrementThreadUnreadCount,
+} from "actions/commentActions";
+
+import { newNotificationEvent } from "actions/notificationActions";
+import { getCurrentUser } from "selectors/usersSelectors";
+import { getCurrentApplication } from "selectors/applicationSelectors";
+
+export default function* handleSocketEvent(event: any) {
+  const currentUser = yield select(getCurrentUser);
+  const currentApplication = yield select(getCurrentApplication);
+
+  switch (event.type) {
+    // comments
+    case SOCKET_EVENTS.INSERT_COMMENT_THREAD: {
+      yield put(newCommentThreadEvent(event.payload[0]));
+
+      const { thread } = event.payload[0];
+      const isForCurrentApplication =
+        thread?.applicationId === currentApplication.id;
+
+      const isCreatedByMe = thread?.authorUsername === currentUser.username;
+      if (!isCreatedByMe && isForCurrentApplication)
+        yield put(incrementThreadUnreadCount());
+      return;
+    }
+    case SOCKET_EVENTS.INSERT_COMMENT: {
+      yield put(newCommentEvent(event.payload[0]));
+      return;
+    }
+    case SOCKET_EVENTS.UPDATE_COMMENT_THREAD: {
+      yield put(updateCommentThreadEvent(event.payload[0].thread));
+      return;
+    }
+    case SOCKET_EVENTS.UPDATE_COMMENT: {
+      yield put(updateCommentEvent(event.payload[0].comment));
+      return;
+    }
+    // notifications
+    case SOCKET_EVENTS.INSERT_NOTIFICATION: {
+      yield put(newNotificationEvent(event.payload[0].notification));
+      return;
+    }
+  }
+}
diff --git a/app/client/src/sagas/WidgetBlueprintSagas.ts b/app/client/src/sagas/WidgetBlueprintSagas.ts
index 13499c496c..a596dda9c0 100644
--- a/app/client/src/sagas/WidgetBlueprintSagas.ts
+++ b/app/client/src/sagas/WidgetBlueprintSagas.ts
@@ -150,8 +150,8 @@ export function* executeWidgetBlueprintChildOperations(
   };
 
   const {
-    widgets,
     message,
+    widgets,
   } = (operation.fn as BlueprintOperationChildOperationsFn)(
     canvasWidgets,
     widgetId,
diff --git a/app/client/src/sagas/WidgetEnhancementHelpers.ts b/app/client/src/sagas/WidgetEnhancementHelpers.ts
index 72cc7dbbca..fe27e2614c 100644
--- a/app/client/src/sagas/WidgetEnhancementHelpers.ts
+++ b/app/client/src/sagas/WidgetEnhancementHelpers.ts
@@ -31,6 +31,7 @@ export enum WidgetEnhancementType {
   CUSTOM_CONTROL = "child.customJSControl",
   AUTOCOMPLETE = "child.autocomplete",
   HIDE_EVALUATED_VALUE = "child.hideEvaluatedValue",
+  UPDATE_DATA_TREE_PATH = "child.updateDataTreePath",
 }
 
 export function getParentWithEnhancementFn(
@@ -161,16 +162,18 @@ export function useChildWidgetEnhancementFn(
   }
 }
 
-type EnhancmentFns = {
-  propertyPaneEnhancmentFn: any;
+type EnhancementFns = {
+  updateDataTreePathFn: any;
+  propertyPaneEnhancementFn: any;
   autoCompleteEnhancementFn: any;
   customJSControlEnhancementFn: any;
   hideEvaluatedValueEnhancementFn: any;
 };
 
-export function useChildWidgetEnhancementFns(widgetId: string): EnhancmentFns {
-  const enhancmentFns = {
-    propertyPaneEnhancmentFn: undefined,
+export function useChildWidgetEnhancementFns(widgetId: string): EnhancementFns {
+  const enhancementFns = {
+    updateDataTreePathFn: undefined,
+    propertyPaneEnhancementFn: undefined,
     autoCompleteEnhancementFn: undefined,
     customJSControlEnhancementFn: undefined,
     hideEvaluatedValueEnhancementFn: undefined,
@@ -189,8 +192,12 @@ export function useChildWidgetEnhancementFns(widgetId: string): EnhancmentFns {
   if (parentWithEnhancementFn) {
     // Get the enhancement function based on the enhancementType
     // from the configs
-    const widgetEnhancmentFns = {
-      propertyPaneEnhancmentFn: getWidgetEnhancementFn(
+    const widgetEnhancementFns = {
+      updateDataTreePathFn: getWidgetEnhancementFn(
+        parentWithEnhancementFn.type,
+        WidgetEnhancementType.UPDATE_DATA_TREE_PATH,
+      ),
+      propertyPaneEnhancementFn: getWidgetEnhancementFn(
         parentWithEnhancementFn.type,
         WidgetEnhancementType.PROPERTY_UPDATE,
       ),
@@ -208,16 +215,16 @@ export function useChildWidgetEnhancementFns(widgetId: string): EnhancmentFns {
       ),
     };
 
-    Object.keys(widgetEnhancmentFns).map((key: string) => {
-      const enhancementFn = get(widgetEnhancmentFns, `${key}`);
+    Object.keys(widgetEnhancementFns).map((key: string) => {
+      const enhancementFn = get(widgetEnhancementFns, `${key}`);
 
       if (parentDataFromDataTree && enhancementFn) {
-        set(enhancmentFns, `${key}`, (...args: unknown[]) =>
+        set(enhancementFns, `${key}`, (...args: unknown[]) =>
           enhancementFn(parentDataFromDataTree, ...args),
         );
       }
     });
   }
 
-  return enhancmentFns;
+  return enhancementFns;
 }
diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index fa05b3a2e5..8c1642da5a 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -4,6 +4,7 @@ import {
   ReduxActionTypes,
 } from "constants/ReduxActionConstants";
 import {
+  MultipleWidgetDeletePayload,
   updateAndSaveLayout,
   WidgetAddChild,
   WidgetAddChildren,
@@ -16,9 +17,9 @@ import {
   FlattenedWidgetProps,
 } from "reducers/entityReducers/canvasWidgetsReducer";
 import {
+  getFocusedWidget,
   getSelectedWidget,
   getWidget,
-  getWidgetMetaProps,
   getWidgets,
 } from "./selectors";
 import {
@@ -28,6 +29,7 @@ import {
 import {
   all,
   call,
+  fork,
   put,
   select,
   takeEvery,
@@ -52,7 +54,7 @@ import {
   isPathADynamicTrigger,
 } from "utils/DynamicBindingUtils";
 import { WidgetProps } from "widgets/BaseWidget";
-import _, { cloneDeep, isString, set, remove } from "lodash";
+import _, { cloneDeep, flattenDeep, isString, set, remove } from "lodash";
 import WidgetFactory from "utils/WidgetFactory";
 import {
   buildWidgetBlueprint,
@@ -68,7 +70,9 @@ import {
   WidgetType,
   WidgetTypes,
 } from "constants/WidgetConstants";
-import WidgetConfigResponse from "mockResponses/WidgetConfigResponse";
+import WidgetConfigResponse, {
+  GRID_DENSITY_MIGRATION_V1,
+} from "mockResponses/WidgetConfigResponse";
 import {
   flushDeletedWidgets,
   getCopiedWidgets,
@@ -80,7 +84,7 @@ import { generateReactKey } from "utils/generators";
 import { flashElementById } from "utils/helpers";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import log from "loglevel";
-import { navigateToCanvas } from "pages/Editor/Explorer/Widgets/WidgetEntity";
+import { navigateToCanvas } from "pages/Editor/Explorer/Widgets/utils";
 import {
   getCurrentApplicationId,
   getCurrentPageId,
@@ -89,6 +93,11 @@ import {
   closePropertyPane,
   forceOpenPropertyPane,
 } from "actions/widgetActions";
+import {
+  selectMultipleWidgetsInitAction,
+  selectWidgetInitAction,
+} from "actions/widgetSelectionActions";
+
 import { getDataTree } from "selectors/dataTreeSelectors";
 import {
   clearEvalPropertyCacheOfWidget,
@@ -111,24 +120,29 @@ import {
   WIDGET_COPY,
   WIDGET_CUT,
   WIDGET_DELETE,
+  WIDGET_BULK_DELETE,
   ERROR_WIDGET_COPY_NOT_ALLOWED,
 } from "constants/messages";
 import AppsmithConsole from "utils/AppsmithConsole";
 import { ENTITY_TYPE } from "entities/AppsmithConsole";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
 import {
+  checkIfPastingIntoListWidget,
   doesTriggerPathsContainPropertyPath,
+  getParentWidgetIdForPasting,
+  getWidgetChildren,
   handleSpecificCasesWhilePasting,
 } from "./WidgetOperationUtils";
+import { getSelectedWidgets } from "selectors/ui";
 import { getParentWithEnhancementFn } from "./WidgetEnhancementHelpers";
-
+import { widgetSelectionSagas } from "./WidgetSelectionSagas";
 function* getChildWidgetProps(
   parent: FlattenedWidgetProps,
   params: WidgetAddChild,
   widgets: { [widgetId: string]: FlattenedWidgetProps },
 ) {
-  const { leftColumn, topRow, newWidgetId, props, type } = params;
-  let { rows, columns, parentColumnSpace, parentRowSpace, widgetName } = params;
+  const { leftColumn, newWidgetId, props, topRow, type } = params;
+  let { columns, parentColumnSpace, parentRowSpace, rows, widgetName } = params;
   let minHeight = undefined;
   /* eslint-disable @typescript-eslint/no-unused-vars */
   const { blueprint = undefined, ...restDefaultConfig } = {
@@ -359,7 +373,7 @@ export function* addChildrenSaga(
   addChildrenAction: ReduxAction<WidgetAddChildren>,
 ) {
   try {
-    const { widgetId, children } = addChildrenAction.payload;
+    const { children, widgetId } = addChildrenAction.payload;
     const stateWidgets = yield select(getWidgets);
     const widgets = { ...stateWidgets };
     const widgetNames = Object.keys(widgets).map((w) => widgets[w].widgetName);
@@ -434,7 +448,10 @@ const resizeCanvasToLowestWidget = (
     return;
   }
 
-  let lowestBottomRow = 0;
+  let lowestBottomRow = Math.ceil(
+    (finalWidgets[parentId].minHeight || 0) /
+      GridDefaults.DEFAULT_GRID_ROW_HEIGHT,
+  );
   const childIds = finalWidgets[parentId].children || [];
   // find lowest row
   childIds.forEach((cId) => {
@@ -448,9 +465,113 @@ const resizeCanvasToLowestWidget = (
     GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
 };
 
+export function* deleteAllSelectedWidgetsSaga(
+  deleteAction: ReduxAction<MultipleWidgetDeletePayload>,
+) {
+  try {
+    const { disallowUndo = false, isShortcut } = deleteAction.payload;
+    const stateWidgets = yield select(getWidgets);
+    const widgets = { ...stateWidgets };
+    const selectedWidgets: string[] = yield select(getSelectedWidgets);
+    if (!(selectedWidgets && selectedWidgets.length !== 1)) return;
+    const widgetsToBeDeleted = yield all(
+      selectedWidgets.map((eachId) => {
+        return call(getAllWidgetsInTree, eachId, widgets);
+      }),
+    );
+    const falttendedWidgets: any = flattenDeep(widgetsToBeDeleted);
+    const parentUpdatedWidgets = falttendedWidgets.reduce(
+      (allWidgets: any, eachWidget: any) => {
+        const { parentId, widgetId } = eachWidget;
+        const stateParent: FlattenedWidgetProps = allWidgets[parentId];
+        let parent = { ...stateParent };
+        if (parent.children) {
+          parent = {
+            ...parent,
+            children: parent.children.filter((c) => c !== widgetId),
+          };
+          allWidgets[parentId] = parent;
+        }
+        return allWidgets;
+      },
+      widgets,
+    );
+    const finalWidgets: CanvasWidgetsReduxState = _.omit(
+      parentUpdatedWidgets,
+      falttendedWidgets.map((widgets: any) => widgets.widgetId),
+    );
+    // assuming only widgets with same parent can be selected
+    const parentId = widgets[selectedWidgets[0]].parentId;
+    resizeCanvasToLowestWidget(finalWidgets, parentId);
+
+    yield put(updateAndSaveLayout(finalWidgets));
+    yield put(selectWidgetInitAction(""));
+    const bulkDeleteKey = selectedWidgets.join(",");
+    const saveStatus: boolean = yield saveDeletedWidgets(
+      falttendedWidgets,
+      bulkDeleteKey,
+    );
+    if (saveStatus && !disallowUndo) {
+      // close property pane after delete
+      yield put(closePropertyPane());
+      Toaster.show({
+        text: createMessage(WIDGET_BULK_DELETE, `${selectedWidgets.length}`),
+        hideProgressBar: false,
+        variant: Variant.success,
+        dispatchableAction: {
+          type: ReduxActionTypes.UNDO_DELETE_WIDGET,
+          payload: {
+            widgetId: bulkDeleteKey,
+          },
+        },
+      });
+      setTimeout(() => {
+        if (bulkDeleteKey) {
+          flushDeletedWidgets(bulkDeleteKey);
+          AppsmithConsole.info({
+            logType: LOG_TYPE.ENTITY_DELETED,
+            text: `${selectedWidgets.length} were deleted`,
+            source: {
+              name: "Group Delete",
+              type: ENTITY_TYPE.WIDGET,
+              id: bulkDeleteKey,
+            },
+          });
+        }
+      }, WIDGET_DELETE_UNDO_TIMEOUT);
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.WIDGET_OPERATION_ERROR,
+      payload: {
+        action: ReduxActionTypes.WIDGET_DELETE,
+        error,
+      },
+    });
+  }
+}
+
+export function* deleteSagaInit(deleteAction: ReduxAction<WidgetDelete>) {
+  const { widgetId } = deleteAction.payload;
+  const selectedWidget = yield select(getSelectedWidget);
+  const selectedWidgets: string[] = yield select(getSelectedWidgets);
+  if (selectedWidgets.length > 1) {
+    yield put({
+      type: ReduxActionTypes.WIDGET_BULK_DELETE,
+      payload: deleteAction.payload,
+    });
+  }
+  if (!!widgetId || !!selectedWidget) {
+    yield put({
+      type: ReduxActionTypes.WIDGET_SINGLE_DELETE,
+      payload: deleteAction.payload,
+    });
+  }
+}
+
 export function* deleteSaga(deleteAction: ReduxAction<WidgetDelete>) {
   try {
-    let { widgetId, parentId } = deleteAction.payload;
+    let { parentId, widgetId } = deleteAction.payload;
     const { disallowUndo, isShortcut } = deleteAction.payload;
 
     if (!widgetId) {
@@ -497,7 +618,7 @@ export function* deleteSaga(deleteAction: ReduxAction<WidgetDelete>) {
       widgets[parentId] = parent;
 
       const otherWidgetsToDelete = getAllWidgetsInTree(widgetId, widgets);
-      const saveStatus = yield saveDeletedWidgets(
+      const saveStatus: boolean = yield saveDeletedWidgets(
         otherWidgetsToDelete,
         widgetId,
       );
@@ -608,89 +729,115 @@ export function* undoDeleteSaga(action: ReduxAction<{ widgetId: string }>) {
   const deletedWidgets: FlattenedWidgetProps[] = yield getDeletedWidgets(
     action.payload.widgetId,
   );
+  const deletedWidgetIds = action.payload.widgetId.split(",");
   if (deletedWidgets && Array.isArray(deletedWidgets)) {
-    // Find the parent in the list of deleted widgets
-    const deletedWidget = deletedWidgets.find(
-      (widget) => widget.widgetId === action.payload.widgetId,
-    );
-
-    // If the deleted widget is in fact available.
-    if (deletedWidget) {
-      // Log an undo event
-      AnalyticsUtil.logEvent("WIDGET_DELETE_UNDO", {
-        widgetName: deletedWidget.widgetName,
-        widgetType: deletedWidget.type,
-      });
-    }
-
     // Get the current list of widgets from reducer
+    const formTree = deletedWidgets.reduce((widgetTree, each) => {
+      widgetTree[each.widgetId] = each;
+      return widgetTree;
+    }, {} as CanvasWidgetsReduxState);
     const stateWidgets = yield select(getWidgets);
-    let widgets = { ...stateWidgets };
-    // For each deleted widget
-    deletedWidgets.forEach((widget) => {
-      // Add it to the widgets list we fetched from reducer
-      widgets[widget.widgetId] = widget;
-      // If the widget in question is the deleted widget
-      if (widget.widgetId === action.payload.widgetId) {
-        //SPECIAL HANDLING FOR TAB IN A TABS WIDGET
-        if (
-          widget.tabId &&
-          widget.type === WidgetTypes.CANVAS_WIDGET &&
-          widget.parentId
-        ) {
-          const parent = cloneDeep(widgets[widget.parentId]);
-          if (parent.tabsObj) {
-            try {
-              const tabs = Object.values(parent.tabsObj);
-              parent.tabsObj[widget.tabId] = {
-                id: widget.tabId,
-                widgetId: widget.widgetId,
-                label: widget.tabName || widget.widgetName,
-                isVisible: true,
-              };
+    const deletedWidgetGroups = deletedWidgetIds.map((each) => ({
+      widget: formTree[each],
+      widgetsToRestore: getAllWidgetsInTree(each, formTree),
+    }));
+    const finalWidgets = deletedWidgetGroups.reduce(
+      (reducedWidgets, deletedWidgetGroup) => {
+        const {
+          widget: deletedWidget,
+          widgetsToRestore: deletedWidgets,
+        } = deletedWidgetGroup;
+        let widgets = cloneDeep(reducedWidgets);
+
+        // If the deleted widget is in fact available.
+        if (deletedWidget) {
+          // Log an undo event
+          AnalyticsUtil.logEvent("WIDGET_DELETE_UNDO", {
+            widgetName: deletedWidget.widgetName,
+            widgetType: deletedWidget.type,
+          });
+        }
+
+        // For each deleted widget
+        deletedWidgets.forEach((widget: FlattenedWidgetProps) => {
+          // Add it to the widgets list we fetched from reducer
+          widgets[widget.widgetId] = widget;
+          // If the widget in question is the deleted widget
+          if (deletedWidgetIds.includes(widget.widgetId)) {
+            //SPECIAL HANDLING FOR TAB IN A TABS WIDGET
+            if (
+              widget.tabId &&
+              widget.type === WidgetTypes.CANVAS_WIDGET &&
+              widget.parentId
+            ) {
+              const parent = cloneDeep(widgets[widget.parentId]);
+              if (parent.tabsObj) {
+                try {
+                  const tabs = Object.values(parent.tabsObj);
+                  parent.tabsObj[widget.tabId] = {
+                    id: widget.tabId,
+                    widgetId: widget.widgetId,
+                    label: widget.tabName || widget.widgetName,
+                    isVisible: true,
+                  };
+                  widgets = {
+                    ...widgets,
+                    [widget.parentId]: {
+                      ...widgets[widget.parentId],
+                      tabsObj: parent.tabsObj,
+                    },
+                  };
+                } catch (error) {
+                  log.debug("Error deleting tabs widget: ", { error });
+                }
+              } else {
+                parent.tabs = JSON.stringify([
+                  {
+                    id: widget.tabId,
+                    widgetId: widget.widgetId,
+                    label: widget.tabName || widget.widgetName,
+                  },
+                ]);
+                widgets = {
+                  ...widgets,
+                  [widget.parentId]: parent,
+                };
+              }
+            }
+            let newChildren = [widget.widgetId];
+            if (widget.parentId && widgets[widget.parentId].children) {
+              // Concatenate the list of parents children with the current widgetId
+              newChildren = newChildren.concat(
+                widgets[widget.parentId].children,
+              );
+            }
+            if (widget.parentId) {
               widgets = {
                 ...widgets,
                 [widget.parentId]: {
                   ...widgets[widget.parentId],
-                  tabsObj: parent.tabsObj,
+                  children: newChildren,
                 },
               };
-            } catch (error) {
-              log.debug("Error deleting tabs widget: ", { error });
             }
-          } else {
-            parent.tabs = JSON.stringify([
-              {
-                id: widget.tabId,
-                widgetId: widget.widgetId,
-                label: widget.tabName || widget.widgetName,
-              },
-            ]);
-            widgets = {
-              ...widgets,
-              [widget.parentId]: parent,
-            };
           }
-        }
-        let newChildren = [widget.widgetId];
-        if (widget.parentId && widgets[widget.parentId].children) {
-          // Concatenate the list of parents children with the current widgetId
-          newChildren = newChildren.concat(widgets[widget.parentId].children);
-        }
-        if (widget.parentId) {
-          widgets = {
-            ...widgets,
-            [widget.parentId]: {
-              ...widgets[widget.parentId],
-              children: newChildren,
-            },
-          };
-        }
-      }
+        });
+        return widgets;
+      },
+      stateWidgets,
+    );
+    const parentId = deletedWidgets[0].parentId;
+    if (parentId) {
+      resizeCanvasToLowestWidget(finalWidgets, parentId);
+    }
+    yield put(updateAndSaveLayout(finalWidgets));
+    deletedWidgetIds.forEach((widgetId) => {
+      setTimeout(() => flashElementById(widgetId), 100);
     });
-
-    yield put(updateAndSaveLayout(widgets));
-    yield put(forceOpenPropertyPane(action.payload.widgetId));
+    yield put(selectMultipleWidgetsInitAction(deletedWidgetIds));
+    if (deletedWidgetIds.length === 1) {
+      yield put(forceOpenPropertyPane(action.payload.widgetId));
+    }
     yield flushDeletedWidgets(action.payload.widgetId);
   }
 }
@@ -700,11 +847,11 @@ export function* moveSaga(moveAction: ReduxAction<WidgetMove>) {
     Toaster.clear();
     const start = performance.now();
     const {
-      widgetId,
       leftColumn,
-      topRow,
-      parentId,
       newParentId,
+      parentId,
+      topRow,
+      widgetId,
     } = moveAction.payload;
     const stateWidget: FlattenedWidgetProps = yield select(getWidget, widgetId);
     let widget = Object.assign({}, stateWidget);
@@ -764,11 +911,11 @@ export function* resizeSaga(resizeAction: ReduxAction<WidgetResize>) {
     Toaster.clear();
     const start = performance.now();
     const {
-      widgetId,
+      bottomRow,
       leftColumn,
       rightColumn,
       topRow,
-      bottomRow,
+      widgetId,
     } = resizeAction.payload;
 
     const stateWidget: FlattenedWidgetProps = yield select(getWidget, widgetId);
@@ -893,7 +1040,7 @@ function* updateWidgetPropertySaga(
   updateAction: ReduxAction<UpdateWidgetPropertyRequestPayload>,
 ) {
   const {
-    payload: { propertyValue, propertyPath, widgetId },
+    payload: { propertyPath, propertyValue, widgetId },
   } = updateAction;
 
   // Holder object to collect all updates
@@ -914,6 +1061,7 @@ function* setWidgetDynamicPropertySaga(
   const stateWidget: WidgetProps = yield select(getWidget, widgetId);
   let widget = cloneDeep({ ...stateWidget });
   const propertyValue = _.get(widget, propertyPath);
+
   let dynamicPropertyPathList = getWidgetDynamicPropertyPathList(widget);
   if (isDynamic) {
     const keyExists =
@@ -1044,9 +1192,9 @@ function* batchUpdateWidgetPropertySaga(
   try {
     if (Object.keys(modify).length > 0) {
       const {
-        propertyUpdates,
-        dynamicTriggerPathList,
         dynamicBindingPathList,
+        dynamicTriggerPathList,
+        propertyUpdates,
       } = getPropertiesToUpdate(widget, modify, triggerPaths);
 
       // We loop over all updates
@@ -1124,7 +1272,7 @@ function* removeWidgetProperties(widget: WidgetProps, paths: string[]) {
 function* deleteWidgetPropertySaga(
   action: ReduxAction<DeleteWidgetPropertyPayload>,
 ) {
-  const { widgetId, propertyPaths } = action.payload;
+  const { propertyPaths, widgetId } = action.payload;
   if (!widgetId) {
     // Handling the case where sometimes widget id is not passed through here
     return;
@@ -1156,34 +1304,13 @@ const unsetPropertyPath = (obj: Record<string, unknown>, path: string) => {
   return obj;
 };
 
-function* getWidgetChildren(widgetId: string): any {
-  const childrenIds: string[] = [];
-  const widget = yield select(getWidget, widgetId);
-  // When a form widget tries to resetChildrenMetaProperties
-  // But one or more of its container like children
-  // have just been deleted, widget can be undefined
-  if (widget === undefined) {
-    return [];
-  }
-  const { children = [] } = widget;
-  if (children && children.length) {
-    for (const childIndex in children) {
-      if (children.hasOwnProperty(childIndex)) {
-        const child = children[childIndex];
-        childrenIds.push(child);
-        const grandChildren = yield call(getWidgetChildren, child);
-        if (grandChildren.length) {
-          childrenIds.push(...grandChildren);
-        }
-      }
-    }
-  }
-  return childrenIds;
-}
-
 function* resetChildrenMetaSaga(action: ReduxAction<{ widgetId: string }>) {
   const parentWidgetId = action.payload.widgetId;
-  const childrenIds: string[] = yield call(getWidgetChildren, parentWidgetId);
+  const canvasWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
+  const childrenIds: string[] = getWidgetChildren(
+    canvasWidgets,
+    parentWidgetId,
+  );
   for (const childIndex in childrenIds) {
     const childId = childrenIds[childIndex];
     yield put(resetWidgetMetaProperty(childId));
@@ -1214,14 +1341,26 @@ function* updateCanvasSize(
   }
 }
 
-function* createWidgetCopy() {
-  const selectedWidget = yield select(getSelectedWidget);
-  if (!selectedWidget) return;
-  const widgets = yield select(getWidgets);
-  const widgetsToStore = getAllWidgetsInTree(selectedWidget.widgetId, widgets);
-  return yield saveCopiedWidgets(
-    JSON.stringify({ widgetId: selectedWidget.widgetId, list: widgetsToStore }),
+function* createWidgetCopy(widget: FlattenedWidgetProps) {
+  const allWidgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
+    getWidgets,
   );
+  const widgetsToStore = getAllWidgetsInTree(widget.widgetId, allWidgets);
+  return {
+    widgetId: widget.widgetId,
+    list: widgetsToStore,
+    parentId: widget.parentId,
+  };
+}
+
+function* createSelectedWidgetsCopy(selectedWidgets: FlattenedWidgetProps[]) {
+  if (!selectedWidgets || !selectedWidgets.length) return;
+  const widgetListsToStore: {
+    widgetId: string;
+    parentId: string;
+    list: FlattenedWidgetProps[];
+  }[] = yield all(selectedWidgets.map((each) => call(createWidgetCopy, each)));
+  return yield saveCopiedWidgets(JSON.stringify(widgetListsToStore));
 }
 
 /**
@@ -1232,8 +1371,11 @@ function* createWidgetCopy() {
  * @returns
  */
 function* copyWidgetSaga(action: ReduxAction<{ isShortcut: boolean }>) {
-  const selectedWidget = yield select(getSelectedWidget);
-  if (!selectedWidget) {
+  const allWidgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
+    getWidgets,
+  );
+  const selectedWidgets: string[] = yield select(getSelectedWidgets);
+  if (!selectedWidgets) {
     Toaster.show({
       text: createMessage(ERROR_WIDGET_COPY_NO_WIDGET_SELECTED),
       variant: Variant.info,
@@ -1241,7 +1383,11 @@ function* copyWidgetSaga(action: ReduxAction<{ isShortcut: boolean }>) {
     return;
   }
 
-  if (selectedWidget.disallowCopy === true) {
+  const allAllowedToCopy = selectedWidgets.some((each) => {
+    return !allWidgets[each].disallowCopy;
+  });
+
+  if (!allAllowedToCopy) {
     Toaster.show({
       text: createMessage(ERROR_WIDGET_COPY_NOT_ALLOWED),
       variant: Variant.info,
@@ -1249,20 +1395,28 @@ function* copyWidgetSaga(action: ReduxAction<{ isShortcut: boolean }>) {
 
     return;
   }
+  const selectedWidgetProps = selectedWidgets.map((each) => allWidgets[each]);
 
-  const saveResult = yield createWidgetCopy();
+  const saveResult = yield createSelectedWidgetsCopy(selectedWidgetProps);
 
-  const eventName = action.payload.isShortcut
-    ? "WIDGET_COPY_VIA_SHORTCUT"
-    : "WIDGET_COPY";
-  AnalyticsUtil.logEvent(eventName, {
-    widgetName: selectedWidget.widgetName,
-    widgetType: selectedWidget.type,
+  selectedWidgetProps.forEach((each) => {
+    const eventName = action.payload.isShortcut
+      ? "WIDGET_COPY_VIA_SHORTCUT"
+      : "WIDGET_COPY";
+    AnalyticsUtil.logEvent(eventName, {
+      widgetName: each.widgetName,
+      widgetType: each.type,
+    });
   });
 
   if (saveResult) {
     Toaster.show({
-      text: createMessage(WIDGET_COPY, selectedWidget.widgetName),
+      text: createMessage(
+        WIDGET_COPY,
+        selectedWidgetProps.length > 1
+          ? `${selectedWidgetProps.length} Widgets`
+          : selectedWidgetProps[0].widgetName,
+      ),
       variant: Variant.success,
     });
   }
@@ -1272,16 +1426,26 @@ export function calculateNewWidgetPosition(
   widget: WidgetProps,
   parentId: string,
   canvasWidgets: { [widgetId: string]: FlattenedWidgetProps },
+  parentBottomRow?: number,
+  persistColumnPosition = false,
 ) {
   // Note: This is a very simple algorithm.
   // We take the bottom most widget in the canvas, then calculate the top,left,right,bottom
   // co-ordinates for the new widget, such that it can be placed at the bottom of the canvas.
-  const nextAvailableRow = nextAvailableRowInContainer(parentId, canvasWidgets);
+  const nextAvailableRow = parentBottomRow
+    ? parentBottomRow
+    : nextAvailableRowInContainer(parentId, canvasWidgets);
   return {
-    leftColumn: 0,
-    rightColumn: widget.rightColumn - widget.leftColumn,
-    topRow: nextAvailableRow,
-    bottomRow: nextAvailableRow + (widget.bottomRow - widget.topRow),
+    leftColumn: persistColumnPosition ? widget.leftColumn : 0,
+    rightColumn: persistColumnPosition
+      ? widget.rightColumn
+      : widget.rightColumn - widget.leftColumn,
+    topRow: parentBottomRow
+      ? nextAvailableRow + widget.topRow
+      : nextAvailableRow,
+    bottomRow: parentBottomRow
+      ? nextAvailableRow + widget.bottomRow
+      : nextAvailableRow + (widget.bottomRow - widget.topRow),
   };
 }
 
@@ -1293,304 +1457,313 @@ function* getEntityNames() {
 function getNextWidgetName(
   widgets: CanvasWidgetsReduxState,
   type: WidgetType,
-  evalTree: Record<string, unknown>,
+  evalTree: {
+    bottomRow: any;
+    leftColumn: any;
+    rightColumn: any;
+    topRow: any;
+  },
+  options?: Record<string, unknown>,
 ) {
   // Compute the new widget's name
   const defaultConfig: any = WidgetConfigResponse.config[type];
   const widgetNames = Object.keys(widgets).map((w) => widgets[w].widgetName);
   const entityNames = Object.keys(evalTree);
+  let prefix = defaultConfig.widgetName;
+  if (options && options.prefix) {
+    prefix = `${options.prefix}${
+      widgetNames.indexOf(options.prefix as string) > -1 ? "Copy" : ""
+    }`;
+  }
 
-  return getNextEntityName(defaultConfig.widgetName, [
-    ...widgetNames,
-    ...entityNames,
-  ]);
+  return getNextEntityName(
+    prefix,
+    [...widgetNames, ...entityNames],
+    options?.startWithoutIndex as boolean,
+  );
 }
 
 /**
  * this saga create a new widget from the copied one to store
  */
 function* pasteWidgetSaga() {
-  const copiedWidgets: {
+  const copiedWidgetGroups: {
     widgetId: string;
+    parentId: string;
     list: WidgetProps[];
-  } = yield getCopiedWidgets();
-  // Don't try to paste if there is no copied widget
-  if (!copiedWidgets) return;
-  const copiedWidgetId = copiedWidgets.widgetId;
-  const copiedWidget = copiedWidgets.list.find(
-    (widget) => widget.widgetId === copiedWidgetId,
+  }[] = yield getCopiedWidgets();
+
+  if (!Array.isArray(copiedWidgetGroups)) {
+    return;
+    // to avoid invoking old copied widgets
+  }
+  const stateWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
+  let selectedWidget: FlattenedWidgetProps | undefined = yield select(
+    getSelectedWidget,
+  );
+  const focusedWidget: FlattenedWidgetProps | undefined = yield select(
+    getFocusedWidget,
   );
-  if (copiedWidget) {
-    // Log the paste event
-    AnalyticsUtil.logEvent("WIDGET_PASTE", {
-      widgetName: copiedWidget.widgetName,
-      widgetType: copiedWidget.type,
-    });
 
-    const stateWidgets = yield select(getWidgets);
-    let widgets = { ...stateWidgets };
+  selectedWidget = yield checkIfPastingIntoListWidget(
+    stateWidgets,
+    selectedWidget || focusedWidget,
+    copiedWidgetGroups,
+  );
 
-    let selectedWidget = yield select(getSelectedWidget);
+  selectedWidget = yield checkIfPastingIntoListWidget(
+    stateWidgets,
+    selectedWidget,
+    copiedWidgetGroups,
+  );
 
-    // when list widget is selected, if the user is pasting, we want it to be pasted in the template
-    // which is first children of list widget
-    if (selectedWidget?.type === WidgetTypes.LIST_WIDGET) {
-      const childrenIds: string[] = yield call(
-        getWidgetChildren,
-        selectedWidget.children[0],
-      );
-      const firstChildId = childrenIds[0];
+  const pastingIntoWidgetId: string = yield getParentWidgetIdForPasting(
+    { ...stateWidgets },
+    selectedWidget,
+  );
 
-      selectedWidget = yield select(getWidget, firstChildId);
-    }
-
-    let newWidgetParentId = MAIN_CONTAINER_WIDGET_ID;
-    let parentWidget = widgets[MAIN_CONTAINER_WIDGET_ID];
-
-    // If the selected widget is not the main container
-    if (
-      selectedWidget &&
-      selectedWidget.widgetId !== MAIN_CONTAINER_WIDGET_ID
-    ) {
-      // Select the parent of the selected widget if parent is not
-      // the main container
-      if (
-        selectedWidget.parentId !== MAIN_CONTAINER_WIDGET_ID &&
-        widgets[selectedWidget.parentId] &&
-        widgets[selectedWidget.parentId].children &&
-        widgets[selectedWidget.parentId].children.length > 0
-      ) {
-        parentWidget = widgets[selectedWidget.parentId];
-        newWidgetParentId = selectedWidget.parentId;
-      }
-      // Select the selected widget if the widget is container like
-      if (selectedWidget.children) {
-        parentWidget = widgets[selectedWidget.widgetId];
-      }
-    }
-
-    // If the parent widget in which to paste the copied widget
-    // is not the main container and is not a canvas widget
-    if (
-      parentWidget.widgetId !== MAIN_CONTAINER_WIDGET_ID &&
-      parentWidget.type !== WidgetTypes.CANVAS_WIDGET
-    ) {
-      let childWidget;
-      // If the widget in which to paste the new widget is NOT
-      // a tabs widget
-      if (parentWidget.type !== WidgetTypes.TABS_WIDGET) {
-        // The child will be a CANVAS_WIDGET, as we've established
-        // this parent widget to be a container like widget
-        // Which always has its first child as a canvas widget
-        childWidget = widgets[parentWidget.children[0]];
-      } else {
-        // If the widget in which to paste the new widget is a tabs widget
-        // Find the currently selected tab canvas widget
-        const { selectedTabWidgetId } = yield select(
-          getWidgetMetaProps,
-          parentWidget.widgetId,
+  let widgets = { ...stateWidgets };
+  const newlyCreatedWidgetIds: string[] = [];
+  const sortedWidgetList = copiedWidgetGroups.sort(
+    (a, b) => a.list[0].topRow - b.list[0].topRow,
+  );
+  const copiedGroupTopRow = sortedWidgetList[0].list[0].topRow;
+  const nextAvailableRow: number = nextAvailableRowInContainer(
+    pastingIntoWidgetId,
+    widgets,
+  );
+  yield all(
+    copiedWidgetGroups.map((copiedWidgets) =>
+      call(function*() {
+        // Don't try to paste if there is no copied widget
+        if (!copiedWidgets) return;
+        const copiedWidgetId = copiedWidgets.widgetId;
+        const unUpdatedCopyOfWidget = copiedWidgets.list.find(
+          (widget) => widget.widgetId === copiedWidgetId,
         );
-        if (selectedTabWidgetId) childWidget = widgets[selectedTabWidgetId];
-      }
-      // If the finally selected parent in which to paste the widget
-      // is a CANVAS_WIDGET, use its widgetId as the new widget's parent Id
-      if (childWidget && childWidget.type === WidgetTypes.CANVAS_WIDGET) {
-        newWidgetParentId = childWidget.widgetId;
-      }
-    }
 
-    // Compute the new widget's positional properties
-    const {
-      leftColumn,
-      topRow,
-      rightColumn,
-      bottomRow,
-    } = yield calculateNewWidgetPosition(
-      copiedWidget,
-      newWidgetParentId,
-      widgets,
-    );
+        if (unUpdatedCopyOfWidget) {
+          const copiedWidget = {
+            ...unUpdatedCopyOfWidget,
+            topRow: unUpdatedCopyOfWidget.topRow - copiedGroupTopRow,
+            bottomRow: unUpdatedCopyOfWidget.bottomRow - copiedGroupTopRow,
+          };
 
-    const evalTree = yield select(getDataTree);
+          // Log the paste event
+          AnalyticsUtil.logEvent("WIDGET_PASTE", {
+            widgetName: copiedWidget.widgetName,
+            widgetType: copiedWidget.type,
+          });
 
-    // Get a flat list of all the widgets to be updated
-    const widgetList = copiedWidgets.list;
-    const widgetIdMap: Record<string, string> = {};
-    const widgetNameMap: Record<string, string> = {};
-    const newWidgetList: FlattenedWidgetProps[] = [];
-    let newWidgetId: string = copiedWidget.widgetId;
-    // Generate new widgetIds for the flat list of all the widgets to be updated
-    widgetList.forEach((widget) => {
-      // Create a copy of the widget properties
-      const newWidget = cloneDeep(widget);
-      newWidget.widgetId = generateReactKey();
-      // Add the new widget id so that it maps the previous widget id
-      widgetIdMap[widget.widgetId] = newWidget.widgetId;
-
-      // Add the new widget to the list
-      newWidgetList.push(newWidget);
-    });
-
-    // For each of the new widgets generated
-    for (let i = 0; i < newWidgetList.length; i++) {
-      const widget = newWidgetList[i];
-      const oldWidgetName = widget.widgetName;
-
-      // Update the children widgetIds if it has children
-      if (widget.children && widget.children.length > 0) {
-        widget.children.forEach((childWidgetId: string, index: number) => {
-          if (widget.children) {
-            widget.children[index] = widgetIdMap[childWidgetId];
-          }
-        });
-      }
-
-      // Update the tabs for the tabs widget.
-      if (widget.tabsObj && widget.type === WidgetTypes.TABS_WIDGET) {
-        try {
-          const tabs = Object.values(widget.tabsObj);
-          if (Array.isArray(tabs)) {
-            widget.tabsObj = tabs.reduce((obj: any, tab) => {
-              tab.widgetId = widgetIdMap[tab.widgetId];
-              obj[tab.id] = tab;
-              return obj;
-            }, {});
-          }
-        } catch (error) {
-          log.debug("Error updating tabs", error);
-        }
-      }
-
-      // Update the table widget column properties
-      if (widget.type === WidgetTypes.TABLE_WIDGET) {
-        try {
-          const oldWidgetName = widget.widgetName;
-          const newWidgetName = getNextWidgetName(
+          // Compute the new widget's positional properties
+          const {
+            bottomRow,
+            leftColumn,
+            rightColumn,
+            topRow,
+          } = yield calculateNewWidgetPosition(
+            copiedWidget,
+            pastingIntoWidgetId,
             widgets,
-            widget.type,
-            evalTree,
+            nextAvailableRow,
+            true,
           );
-          // If the primaryColumns of the table exist
-          if (widget.primaryColumns) {
-            // For each column
-            for (const [columnId, column] of Object.entries(
-              widget.primaryColumns,
-            )) {
-              // For each property in the column
-              for (const [key, value] of Object.entries(
-                column as ColumnProperties,
-              )) {
-                // Replace reference of previous widget with the new widgetName
-                // This handles binding scenarios like `{{Table2.tableData.map((currentRow) => (currentRow.id))}}`
-                widget.primaryColumns[columnId][key] = isString(value)
-                  ? value.replace(`${oldWidgetName}.`, `${newWidgetName}.`)
-                  : value;
+          // goToNextAvailableRow = true,
+          // persistColumnPosition = false,
+
+          const evalTree = yield select(getDataTree);
+
+          // Get a flat list of all the widgets to be updated
+          const widgetList = copiedWidgets.list;
+          const widgetIdMap: Record<string, string> = {};
+          const widgetNameMap: Record<string, string> = {};
+          const newWidgetList: FlattenedWidgetProps[] = [];
+          let newWidgetId: string = copiedWidget.widgetId;
+          // Generate new widgetIds for the flat list of all the widgets to be updated
+          widgetList.forEach((widget) => {
+            // Create a copy of the widget properties
+            const newWidget = cloneDeep(widget);
+            newWidget.widgetId = generateReactKey();
+            // Add the new widget id so that it maps the previous widget id
+            widgetIdMap[widget.widgetId] = newWidget.widgetId;
+
+            // Add the new widget to the list
+            newWidgetList.push(newWidget);
+          });
+
+          // For each of the new widgets generated
+          for (let i = 0; i < newWidgetList.length; i++) {
+            const widget = newWidgetList[i];
+            const oldWidgetName = widget.widgetName;
+            // Generate a new unique widget name
+            const newWidgetName = getNextWidgetName(
+              widgets,
+              widget.type,
+              evalTree,
+              {
+                prefix: oldWidgetName,
+                startWithoutIndex: true,
+              },
+            );
+            // Update the children widgetIds if it has children
+            if (widget.children && widget.children.length > 0) {
+              widget.children.forEach(
+                (childWidgetId: string, index: number) => {
+                  if (widget.children) {
+                    widget.children[index] = widgetIdMap[childWidgetId];
+                  }
+                },
+              );
+            }
+
+            // Update the tabs for the tabs widget.
+            if (widget.tabsObj && widget.type === WidgetTypes.TABS_WIDGET) {
+              try {
+                const tabs = Object.values(widget.tabsObj);
+                if (Array.isArray(tabs)) {
+                  widget.tabsObj = tabs.reduce((obj: any, tab) => {
+                    tab.widgetId = widgetIdMap[tab.widgetId];
+                    obj[tab.id] = tab;
+                    return obj;
+                  }, {});
+                }
+              } catch (error) {
+                log.debug("Error updating tabs", error);
               }
             }
+
+            // Update the table widget column properties
+            if (widget.type === WidgetTypes.TABLE_WIDGET) {
+              try {
+                // If the primaryColumns of the table exist
+                if (widget.primaryColumns) {
+                  // For each column
+                  for (const [columnId, column] of Object.entries(
+                    widget.primaryColumns,
+                  )) {
+                    // For each property in the column
+                    for (const [key, value] of Object.entries(
+                      column as ColumnProperties,
+                    )) {
+                      // Replace reference of previous widget with the new widgetName
+                      // This handles binding scenarios like `{{Table2.tableData.map((currentRow) => (currentRow.id))}}`
+                      widget.primaryColumns[columnId][key] = isString(value)
+                        ? value.replace(
+                            `${oldWidgetName}.`,
+                            `${newWidgetName}.`,
+                          )
+                        : value;
+                    }
+                  }
+                }
+                // Use the new widget name we used to replace the column properties above.
+                widget.widgetName = newWidgetName;
+              } catch (error) {
+                log.debug("Error updating table widget properties", error);
+              }
+            }
+
+            // If it is the copied widget, update position properties
+            if (widget.widgetId === widgetIdMap[copiedWidget.widgetId]) {
+              newWidgetId = widget.widgetId;
+              widget.leftColumn = leftColumn;
+              widget.topRow = topRow;
+              widget.bottomRow = bottomRow;
+              widget.rightColumn = rightColumn;
+              widget.parentId = pastingIntoWidgetId;
+              // Also, update the parent widget in the canvas widgets
+              // to include this new copied widget's id in the parent's children
+              let parentChildren = [widget.widgetId];
+              const widgetChildren = widgets[pastingIntoWidgetId].children;
+              if (widgetChildren && Array.isArray(widgetChildren)) {
+                // Add the new child to existing children
+                parentChildren = parentChildren.concat(widgetChildren);
+              }
+              const updateBottomRow =
+                widget.bottomRow * widget.parentRowSpace >
+                widgets[pastingIntoWidgetId].bottomRow;
+              widgets = {
+                ...widgets,
+                [pastingIntoWidgetId]: {
+                  ...widgets[pastingIntoWidgetId],
+                  ...(updateBottomRow
+                    ? {
+                        bottomRow: widget.bottomRow * widget.parentRowSpace,
+                      }
+                    : {}),
+                  children: parentChildren,
+                },
+              };
+              // If the copied widget's boundaries exceed the parent's
+              // Make the parent scrollable
+              if (
+                widgets[pastingIntoWidgetId].bottomRow *
+                  widgets[widget.parentId].parentRowSpace <=
+                widget.bottomRow * widget.parentRowSpace
+              ) {
+                const parentOfPastingWidget =
+                  widgets[pastingIntoWidgetId].parentId;
+                if (
+                  parentOfPastingWidget &&
+                  widget.parentId !== MAIN_CONTAINER_WIDGET_ID
+                ) {
+                  const parent = widgets[parentOfPastingWidget];
+                  widgets[parentOfPastingWidget] = {
+                    ...parent,
+                    shouldScrollContents: true,
+                  };
+                }
+              }
+            } else {
+              // For all other widgets in the list
+              // (These widgets will be descendants of the copied widget)
+              // This means, that their parents will also be newly copied widgets
+              // Update widget's parent widget ids with the new parent widget ids
+              const newParentId = newWidgetList.find((newWidget) =>
+                widget.parentId
+                  ? newWidget.widgetId === widgetIdMap[widget.parentId]
+                  : false,
+              )?.widgetId;
+              if (newParentId) widget.parentId = newParentId;
+            }
+            widget.widgetName = newWidgetName;
+            widgetNameMap[oldWidgetName] = widget.widgetName;
+            // Add the new widget to the canvas widgets
+            widgets[widget.widgetId] = widget;
           }
-          // Use the new widget name we used to replace the column properties above.
-          widget.widgetName = newWidgetName;
-        } catch (error) {
-          log.debug("Error updating table widget properties", error);
-        }
-      } else {
-        // Generate a new unique widget name
-        widget.widgetName = getNextWidgetName(widgets, widget.type, evalTree);
-      }
+          newlyCreatedWidgetIds.push(widgetIdMap[copiedWidgetId]);
+          // 1. updating template in the copied widget and deleting old template associations
+          // 2. updating dynamicBindingPathList in the copied grid widget
+          for (let i = 0; i < newWidgetList.length; i++) {
+            const widget = newWidgetList[i];
 
-      widgetNameMap[oldWidgetName] = widget.widgetName;
-
-      // If it is the copied widget, update position properties
-      if (widget.widgetId === widgetIdMap[copiedWidget.widgetId]) {
-        newWidgetId = widget.widgetId;
-        widget.leftColumn = leftColumn;
-        widget.topRow = topRow;
-        widget.bottomRow = bottomRow;
-        widget.rightColumn = rightColumn;
-        widget.parentId = newWidgetParentId;
-        // Also, update the parent widget in the canvas widgets
-        // to include this new copied widget's id in the parent's children
-        let parentChildren = [widget.widgetId];
-        if (
-          widgets[newWidgetParentId].children &&
-          Array.isArray(widgets[newWidgetParentId].children)
-        ) {
-          // Add the new child to existing children
-          parentChildren = parentChildren.concat(
-            widgets[newWidgetParentId].children,
-          );
-        }
-        widgets = {
-          ...widgets,
-          [newWidgetParentId]: {
-            ...widgets[newWidgetParentId],
-            children: parentChildren,
-          },
-        };
-        // If the copied widget's boundaries exceed the parent's
-        // Make the parent scrollable
-        if (
-          widgets[newWidgetParentId].bottomRow *
-            widgets[widget.parentId].parentRowSpace <=
-          widget.bottomRow * widget.parentRowSpace
-        ) {
-          if (widget.parentId !== MAIN_CONTAINER_WIDGET_ID) {
-            const parent = widgets[widgets[newWidgetParentId].parentId];
-            widgets[widgets[newWidgetParentId].parentId] = {
-              ...parent,
-              shouldScrollContents: true,
-            };
+            widgets = handleSpecificCasesWhilePasting(
+              widget,
+              widgets,
+              widgetNameMap,
+              newWidgetList,
+            );
           }
         }
-      } else {
-        // For all other widgets in the list
-        // (These widgets will be descendants of the copied widget)
-        // This means, that their parents will also be newly copied widgets
-        // Update widget's parent widget ids with the new parent widget ids
-        const newParentId = newWidgetList.find((newWidget) =>
-          widget.parentId
-            ? newWidget.widgetId === widgetIdMap[widget.parentId]
-            : false,
-        )?.widgetId;
-        if (newParentId) widget.parentId = newParentId;
-      }
-      // Generate a new unique widget name
-      widget.widgetName = getNextWidgetName(widgets, widget.type, evalTree);
-      // Add the new widget to the canvas widgets
-      widgets[widget.widgetId] = widget;
-    }
-
-    // 1. updating template in the copied widget and deleting old template associations
-    // 2. updating dynamicBindingPathList in the copied grid widget
-    for (let i = 0; i < newWidgetList.length; i++) {
-      const widget = newWidgetList[i];
-
-      widgets = handleSpecificCasesWhilePasting(
-        widget,
-        widgets,
-        widgetNameMap,
-        newWidgetList,
-      );
-    }
-
-    // save the new DSL
-    yield put(updateAndSaveLayout(widgets));
-
-    // hydrating enhancements map after save layout so that enhancement map
-    // for newly copied widget is hydrated
-
-    // Flash the newly pasted widget once the DSL is re-rendered
+      }),
+    ),
+  );
+  // save the new DSL
+  yield put(updateAndSaveLayout(widgets));
+  newlyCreatedWidgetIds.forEach((newWidgetId) => {
     setTimeout(() => flashElementById(newWidgetId), 100);
-    yield put({
-      type: ReduxActionTypes.SELECT_WIDGET,
-      payload: { widgetId: newWidgetId },
-    });
-  }
+  });
+  // hydrating enhancements map after save layout so that enhancement map
+  // for newly copied widget is hydrated
+  yield put(selectMultipleWidgetsInitAction(newlyCreatedWidgetIds));
 }
 
 function* cutWidgetSaga() {
-  const selectedWidget = yield select(getSelectedWidget);
-  if (!selectedWidget) {
+  const allWidgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
+    getWidgets,
+  );
+  const selectedWidgets: string[] = yield select(getSelectedWidgets);
+  if (!selectedWidgets) {
     Toaster.show({
       text: createMessage(ERROR_WIDGET_CUT_NO_WIDGET_SELECTED),
       variant: Variant.info,
@@ -1598,17 +1771,26 @@ function* cutWidgetSaga() {
     return;
   }
 
-  const saveResult = yield createWidgetCopy();
+  const selectedWidgetProps = selectedWidgets.map((each) => allWidgets[each]);
 
-  const eventName = "WIDGET_CUT_VIA_SHORTCUT"; // cut only supported through a shortcut
-  AnalyticsUtil.logEvent(eventName, {
-    widgetName: selectedWidget.widgetName,
-    widgetType: selectedWidget.type,
+  const saveResult = yield createSelectedWidgetsCopy(selectedWidgetProps);
+
+  selectedWidgetProps.forEach((each) => {
+    const eventName = "WIDGET_CUT_VIA_SHORTCUT"; // cut only supported through a shortcut
+    AnalyticsUtil.logEvent(eventName, {
+      widgetName: each.widgetName,
+      widgetType: each.type,
+    });
   });
 
   if (saveResult) {
     Toaster.show({
-      text: createMessage(WIDGET_CUT, selectedWidget.widgetName),
+      text: createMessage(
+        WIDGET_CUT,
+        selectedWidgetProps.length > 1
+          ? `${selectedWidgetProps.length} Widgets`
+          : selectedWidgetProps[0].widgetName,
+      ),
       variant: Variant.success,
     });
   }
@@ -1624,8 +1806,8 @@ function* cutWidgetSaga() {
 
 function* addTableWidgetFromQuerySaga(action: ReduxAction<string>) {
   try {
-    const columns = 8;
-    const rows = 7;
+    const columns = 8 * GRID_DENSITY_MIGRATION_V1;
+    const rows = 7 * GRID_DENSITY_MIGRATION_V1;
     const queryName = action.payload;
     const widgets = yield select(getWidgets);
     const evalTree = yield select(getDataTree);
@@ -1654,10 +1836,10 @@ function* addTableWidgetFromQuerySaga(action: ReduxAction<string>) {
       },
     };
     const {
-      leftColumn,
-      topRow,
-      rightColumn,
       bottomRow,
+      leftColumn,
+      rightColumn,
+      topRow,
     } = yield calculateNewWidgetPosition(
       newWidget,
       MAIN_CONTAINER_WIDGET_ID,
@@ -1690,7 +1872,7 @@ function* addTableWidgetFromQuerySaga(action: ReduxAction<string>) {
       newWidget.newWidgetId,
     );
     yield put({
-      type: ReduxActionTypes.SELECT_WIDGET,
+      type: ReduxActionTypes.SELECT_WIDGET_INIT,
       payload: { widgetId: newWidget.newWidgetId },
     });
     yield put(forceOpenPropertyPane(newWidget.newWidgetId));
@@ -1702,48 +1884,20 @@ function* addTableWidgetFromQuerySaga(action: ReduxAction<string>) {
   }
 }
 
-// The following is computed to be used in the entity explorer
-// Every time a widget is selected, we need to expand widget entities
-// in the entity explorer so that the selected widget is visible
-function* selectedWidgetAncestrySaga(
-  action: ReduxAction<{ widgetId: string }>,
-) {
-  try {
-    const canvasWidgets = yield select(getWidgets);
-    const widgetIdsExpandList = [];
-    const selectedWidget = action.payload.widgetId;
-
-    // Make sure that the selected widget exists in canvasWidgets
-    let widgetId = canvasWidgets[selectedWidget]
-      ? canvasWidgets[selectedWidget].parentId
-      : undefined;
-    // If there is a parentId for the selectedWidget
-    if (widgetId) {
-      // Keep including the parent until we reach the main container
-      while (widgetId !== MAIN_CONTAINER_WIDGET_ID) {
-        widgetIdsExpandList.push(widgetId);
-        if (canvasWidgets[widgetId] && canvasWidgets[widgetId].parentId)
-          widgetId = canvasWidgets[widgetId].parentId;
-        else break;
-      }
-    }
-    yield put({
-      type: ReduxActionTypes.SET_SELECTED_WIDGET_ANCESTORY,
-      payload: widgetIdsExpandList,
-    });
-  } catch (error) {
-    log.debug("Could not compute selected widget's ancestry", error);
-  }
-}
-
 export default function* widgetOperationSagas() {
+  yield fork(widgetSelectionSagas);
   yield all([
     takeEvery(
       ReduxActionTypes.ADD_TABLE_WIDGET_FROM_QUERY,
       addTableWidgetFromQuerySaga,
     ),
     takeEvery(ReduxActionTypes.WIDGET_ADD_CHILD, addChildSaga),
-    takeEvery(ReduxActionTypes.WIDGET_DELETE, deleteSaga),
+    takeEvery(ReduxActionTypes.WIDGET_DELETE, deleteSagaInit),
+    takeEvery(ReduxActionTypes.WIDGET_SINGLE_DELETE, deleteSaga),
+    takeEvery(
+      ReduxActionTypes.WIDGET_BULK_DELETE,
+      deleteAllSelectedWidgetsSaga,
+    ),
     takeLatest(ReduxActionTypes.WIDGET_MOVE, moveSaga),
     takeLatest(ReduxActionTypes.WIDGET_RESIZE, resizeSaga),
     takeEvery(
@@ -1776,6 +1930,5 @@ export default function* widgetOperationSagas() {
     takeEvery(ReduxActionTypes.UNDO_DELETE_WIDGET, undoDeleteSaga),
     takeEvery(ReduxActionTypes.CUT_SELECTED_WIDGET, cutWidgetSaga),
     takeEvery(ReduxActionTypes.WIDGET_ADD_CHILDREN, addChildrenSaga),
-    takeLatest(ReduxActionTypes.SELECT_WIDGET, selectedWidgetAncestrySaga),
   ]);
 }
diff --git a/app/client/src/sagas/WidgetOperationUtils.test.ts b/app/client/src/sagas/WidgetOperationUtils.test.ts
index 56bb2fa02e..6b5f2dbee0 100644
--- a/app/client/src/sagas/WidgetOperationUtils.test.ts
+++ b/app/client/src/sagas/WidgetOperationUtils.test.ts
@@ -3,6 +3,7 @@ import {
   handleIfParentIsListWidgetWhilePasting,
   handleSpecificCasesWhilePasting,
   doesTriggerPathsContainPropertyPath,
+  checkIfPastingIntoListWidget,
 } from "./WidgetOperationUtils";
 
 describe("WidgetOperationSaga", () => {
@@ -41,7 +42,7 @@ describe("WidgetOperationSaga", () => {
         topRow: 1,
         bottomRow: 3,
         isLoading: false,
-        items: [],
+        listData: [],
         text: "{{currentItem.text}}",
         version: 16,
         disablePropertyPane: false,
@@ -60,7 +61,7 @@ describe("WidgetOperationSaga", () => {
           topRow: 1,
           bottomRow: 3,
           isLoading: false,
-          items: [],
+          listData: [],
           version: 16,
           disablePropertyPane: false,
           template: {},
@@ -79,7 +80,7 @@ describe("WidgetOperationSaga", () => {
           topRow: 1,
           bottomRow: 3,
           isLoading: false,
-          items: [],
+          listData: [],
           version: 16,
           disablePropertyPane: false,
           template: {},
@@ -88,7 +89,7 @@ describe("WidgetOperationSaga", () => {
     );
 
     expect(result.list1.template["Text1"].text).toStrictEqual(
-      "{{List1.items.map((currentItem) => currentItem.text)}}",
+      "{{List1.listData.map((currentItem) => currentItem.text)}}",
     );
     expect(get(result, "list1.dynamicBindingPathList.0.key")).toStrictEqual(
       "template.Text1.text",
@@ -110,7 +111,7 @@ describe("WidgetOperationSaga", () => {
         topRow: 1,
         bottomRow: 3,
         isLoading: false,
-        items: [],
+        listData: [],
         text: "{{currentItem.text}}",
         version: 16,
         disablePropertyPane: false,
@@ -129,7 +130,7 @@ describe("WidgetOperationSaga", () => {
           topRow: 1,
           bottomRow: 3,
           isLoading: false,
-          items: [],
+          listData: [],
           version: 16,
           disablePropertyPane: false,
           template: {},
@@ -148,7 +149,7 @@ describe("WidgetOperationSaga", () => {
           topRow: 1,
           bottomRow: 3,
           isLoading: false,
-          items: [],
+          listData: [],
           version: 16,
           disablePropertyPane: false,
           template: {},
@@ -166,7 +167,7 @@ describe("WidgetOperationSaga", () => {
           topRow: 1,
           bottomRow: 3,
           isLoading: false,
-          items: [],
+          listData: [],
           version: 16,
           disablePropertyPane: false,
           template: {},
@@ -189,7 +190,7 @@ describe("WidgetOperationSaga", () => {
           topRow: 1,
           bottomRow: 3,
           isLoading: false,
-          items: [],
+          listData: [],
           version: 16,
           disablePropertyPane: false,
           template: {},
@@ -198,10 +199,261 @@ describe("WidgetOperationSaga", () => {
     );
 
     expect(result.list2.template["Text2"].text).toStrictEqual(
-      "{{List2.items.map((currentItem) => currentItem.text)}}",
+      "{{List2.listData.map((currentItem) => currentItem.text)}}",
     );
     expect(get(result, "list2.dynamicBindingPathList.0.key")).toStrictEqual(
       "template.Text2.text",
     );
   });
+
+  it("should returns correct close model reference name after executing handleSpecificCasesWhilePasting", async () => {
+    const result = handleSpecificCasesWhilePasting(
+      {
+        widgetName: "Modal1Copy",
+        rightColumn: 24,
+        detachFromLayout: true,
+        widgetId: "k441huwm77",
+        topRow: 34,
+        bottomRow: 58,
+        parentRowSpace: 10,
+        canOutsideClickClose: true,
+        type: "MODAL_WIDGET",
+        canEscapeKeyClose: true,
+        version: 1,
+        parentId: "0",
+        shouldScrollContents: true,
+        isLoading: false,
+        parentColumnSpace: 17.21875,
+        size: "MODAL_SMALL",
+        leftColumn: 0,
+        children: ["ihxw5r23hd"],
+        renderMode: "CANVAS",
+      },
+      {
+        k441huwm77: {
+          widgetName: "Modal1Copy",
+          rightColumn: 24,
+          detachFromLayout: true,
+          widgetId: "k441huwm77",
+          topRow: 34,
+          bottomRow: 58,
+          parentRowSpace: 10,
+          canOutsideClickClose: true,
+          type: "MODAL_WIDGET",
+          canEscapeKeyClose: true,
+          version: 1,
+          parentId: "0",
+          shouldScrollContents: true,
+          isLoading: false,
+          parentColumnSpace: 17.21875,
+          size: "MODAL_SMALL",
+          leftColumn: 0,
+          children: ["ihxw5r23hd"],
+          renderMode: "CANVAS",
+        },
+        suhkuyfpk3: {
+          widgetName: "Icon1Copy",
+          rightColumn: 64,
+          onClick: "{{closeModal('Modal1')}}",
+          color: "#040627",
+          iconName: "cross",
+          widgetId: "suhkuyfpk3",
+          topRow: 1,
+          bottomRow: 5,
+          isVisible: true,
+          type: "ICON_WIDGET",
+          version: 1,
+          parentId: "ihxw5r23hd",
+          isLoading: false,
+          leftColumn: 56,
+          iconSize: 24,
+          renderMode: "CANVAS",
+          parentColumnSpace: 2,
+          parentRowSpace: 3,
+        },
+        twnxjwy3r1: {
+          widgetName: "Button1Copy",
+          rightColumn: 48,
+          onClick: "{{closeModal('Modal1')}}",
+          isDefaultClickDisabled: true,
+          widgetId: "twnxjwy3r1",
+          buttonStyle: "SECONDARY_BUTTON",
+          topRow: 16,
+          bottomRow: 20,
+          isVisible: true,
+          type: "BUTTON_WIDGET",
+          version: 1,
+          parentId: "ihxw5r23hd",
+          isLoading: false,
+          dynamicTriggerPathList: [
+            {
+              key: "onClick",
+            },
+          ],
+          leftColumn: 36,
+          dynamicBindingPathList: [],
+          text: "Cancel",
+          isDisabled: false,
+          renderMode: "CANVAS",
+          parentColumnSpace: 2,
+          parentRowSpace: 3,
+        },
+      },
+      {
+        Modal1: "Modal1Copy",
+        Canvas1: "Canvas1Copy",
+        Icon1: "Icon1Copy",
+        Text1: "Text1Copy",
+        Button1: "Button1Copy",
+        Button2: "Button2Copy",
+      },
+      [
+        {
+          widgetName: "Modal1Copy",
+          rightColumn: 24,
+          detachFromLayout: true,
+          widgetId: "k441huwm77",
+          topRow: 34,
+          bottomRow: 58,
+          parentRowSpace: 10,
+          canOutsideClickClose: true,
+          type: "MODAL_WIDGET",
+          canEscapeKeyClose: true,
+          version: 1,
+          parentId: "0",
+          shouldScrollContents: true,
+          isLoading: false,
+          parentColumnSpace: 17.21875,
+          size: "MODAL_SMALL",
+          leftColumn: 0,
+          children: ["ihxw5r23hd"],
+          renderMode: "CANVAS",
+        },
+        {
+          widgetName: "Icon1Copy",
+          rightColumn: 64,
+          onClick: "{{closeModal('Modal1')}}",
+          color: "#040627",
+          iconName: "cross",
+          widgetId: "suhkuyfpk3",
+          topRow: 1,
+          bottomRow: 5,
+          isVisible: true,
+          type: "ICON_WIDGET",
+          version: 1,
+          parentId: "ihxw5r23hd",
+          isLoading: false,
+          leftColumn: 56,
+          iconSize: 24,
+          renderMode: "CANVAS",
+          parentColumnSpace: 2,
+          parentRowSpace: 3,
+        },
+        {
+          widgetName: "Button1Copy",
+          rightColumn: 48,
+          onClick: "{{closeModal('Modal1')}}",
+          isDefaultClickDisabled: true,
+          widgetId: "twnxjwy3r1",
+          buttonStyle: "SECONDARY_BUTTON",
+          topRow: 16,
+          bottomRow: 20,
+          isVisible: true,
+          type: "BUTTON_WIDGET",
+          version: 1,
+          parentId: "ihxw5r23hd",
+          isLoading: false,
+          dynamicTriggerPathList: [
+            {
+              key: "onClick",
+            },
+          ],
+          leftColumn: 36,
+          dynamicBindingPathList: [],
+          text: "Cancel",
+          isDisabled: false,
+          renderMode: "CANVAS",
+          parentColumnSpace: 2,
+          parentRowSpace: 3,
+        },
+      ],
+    );
+    expect(result["suhkuyfpk3"].onClick).toStrictEqual(
+      "{{closeModal('Modal1Copy')}}",
+    );
+    expect(result["twnxjwy3r1"].onClick).toStrictEqual(
+      "{{closeModal('Modal1Copy')}}",
+    );
+  });
+
+  it("should returns widgets after executing checkIfPastingIntoListWidget", async () => {
+    const result = checkIfPastingIntoListWidget(
+      {
+        list2: {
+          widgetId: "list2",
+          type: "LIST_WIDGET",
+          widgetName: "List2",
+          parentId: "0",
+          renderMode: "CANVAS",
+          parentColumnSpace: 2,
+          parentRowSpace: 3,
+          leftColumn: 2,
+          rightColumn: 3,
+          topRow: 1,
+          bottomRow: 3,
+          isLoading: false,
+          listData: [],
+          version: 16,
+          disablePropertyPane: false,
+          template: {},
+        },
+      },
+      {
+        widgetId: "list2",
+        type: "LIST_WIDGET",
+        widgetName: "List2",
+        parentId: "0",
+        renderMode: "CANVAS",
+        parentColumnSpace: 2,
+        parentRowSpace: 3,
+        leftColumn: 2,
+        rightColumn: 3,
+        topRow: 1,
+        bottomRow: 3,
+        isLoading: false,
+        listData: [],
+        version: 16,
+        disablePropertyPane: false,
+        template: {},
+      },
+      [
+        {
+          widgetId: "list2",
+          parentId: "0",
+          list: [
+            {
+              widgetId: "list2",
+              type: "LIST_WIDGET",
+              widgetName: "List2",
+              parentId: "0",
+              renderMode: "CANVAS",
+              parentColumnSpace: 2,
+              parentRowSpace: 3,
+              leftColumn: 2,
+              rightColumn: 3,
+              topRow: 1,
+              bottomRow: 3,
+              isLoading: false,
+              listData: [],
+              version: 16,
+              disablePropertyPane: false,
+              template: {},
+            },
+          ],
+        },
+      ],
+    );
+
+    expect(result?.type).toStrictEqual("LIST_WIDGET");
+  });
 });
diff --git a/app/client/src/sagas/WidgetOperationUtils.ts b/app/client/src/sagas/WidgetOperationUtils.ts
index 8a12124c9d..bef4b8e497 100644
--- a/app/client/src/sagas/WidgetOperationUtils.ts
+++ b/app/client/src/sagas/WidgetOperationUtils.ts
@@ -2,9 +2,15 @@ import {
   MAIN_CONTAINER_WIDGET_ID,
   WidgetTypes,
 } from "constants/WidgetConstants";
-import { cloneDeep, get, isString } from "lodash";
-import { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
+import { cloneDeep, get, isString, filter, set } from "lodash";
+import {
+  CanvasWidgetsReduxState,
+  FlattenedWidgetProps,
+} from "reducers/entityReducers/canvasWidgetsReducer";
+import { select } from "redux-saga/effects";
 import { getDynamicBindings } from "utils/DynamicBindingUtils";
+import { WidgetProps } from "widgets/BaseWidget";
+import { getWidgetMetaProps } from "./selectors";
 
 /**
  * checks if triggerpaths contains property path passed
@@ -79,7 +85,7 @@ export const handleIfParentIsListWidgetWhilePasting = (
             "",
           );
 
-          value = `{{${listWidget.widgetName}.items.map((currentItem) => ${modifiedAction})}}`;
+          value = `{{${listWidget.widgetName}.listData.map((currentItem) => ${modifiedAction})}}`;
 
           currentWidget[key] = value;
 
@@ -169,9 +175,160 @@ export const handleSpecificCasesWhilePasting = (
     });
 
     widgets[widget.widgetId] = widget;
+  } else if (widget.type === WidgetTypes.MODAL_WIDGET) {
+    // if Modal is being coppied handle all onClose action rename
+    const oldWidgetName = Object.keys(widgetNameMap).find(
+      (key) => widgetNameMap[key] === widget.widgetName,
+    );
+    // get all the button, icon widgets
+    const copiedBtnIcnWidgets = filter(
+      newWidgetList,
+      (copyWidget) =>
+        copyWidget.type === "BUTTON_WIDGET" ||
+        copyWidget.type === "ICON_WIDGET",
+    );
+    // replace oldName with new one if any of this widget have onClick action for old modal
+    copiedBtnIcnWidgets.map((copyWidget) => {
+      if (copyWidget.onClick) {
+        const newOnClick = widgets[copyWidget.widgetId].onClick.replace(
+          oldWidgetName,
+          widget.widgetName,
+        );
+        set(widgets[copyWidget.widgetId], "onClick", newOnClick);
+      }
+    });
   }
 
   widgets = handleIfParentIsListWidgetWhilePasting(widget, widgets);
 
   return widgets;
 };
+
+export function getWidgetChildren(
+  canvasWidgets: CanvasWidgetsReduxState,
+  widgetId: string,
+): any {
+  const childrenIds: string[] = [];
+  const widget = get(canvasWidgets, widgetId);
+  // When a form widget tries to resetChildrenMetaProperties
+  // But one or more of its container like children
+  // have just been deleted, widget can be undefined
+  if (widget === undefined) {
+    return [];
+  }
+  const { children = [] } = widget;
+  if (children && children.length) {
+    for (const childIndex in children) {
+      if (children.hasOwnProperty(childIndex)) {
+        const child = children[childIndex];
+        childrenIds.push(child);
+        const grandChildren = getWidgetChildren(canvasWidgets, child);
+        if (grandChildren.length) {
+          childrenIds.push(...grandChildren);
+        }
+      }
+    }
+  }
+  return childrenIds;
+}
+
+export const getParentWidgetIdForPasting = function*(
+  widgets: CanvasWidgetsReduxState,
+  selectedWidget: FlattenedWidgetProps | undefined,
+) {
+  let newWidgetParentId = MAIN_CONTAINER_WIDGET_ID;
+  let parentWidget = widgets[MAIN_CONTAINER_WIDGET_ID];
+
+  // If the selected widget is not the main container
+  if (selectedWidget && selectedWidget.widgetId !== MAIN_CONTAINER_WIDGET_ID) {
+    // Select the parent of the selected widget if parent is not
+    // the main container
+    if (
+      selectedWidget &&
+      selectedWidget.parentId &&
+      selectedWidget.parentId !== MAIN_CONTAINER_WIDGET_ID &&
+      widgets[selectedWidget.parentId]
+    ) {
+      const children = widgets[selectedWidget.parentId].children || [];
+      if (children.length > 0) {
+        parentWidget = widgets[selectedWidget.parentId];
+        newWidgetParentId = selectedWidget.parentId;
+      }
+    }
+    // Select the selected widget if the widget is container like ( excluding list widget )
+    if (
+      selectedWidget.children &&
+      selectedWidget.type !== WidgetTypes.LIST_WIDGET
+    ) {
+      parentWidget = widgets[selectedWidget.widgetId];
+    }
+  }
+
+  // If the parent widget in which to paste the copied widget
+  // is not the main container and is not a canvas widget
+  if (
+    parentWidget.widgetId !== MAIN_CONTAINER_WIDGET_ID &&
+    parentWidget.type !== WidgetTypes.CANVAS_WIDGET
+  ) {
+    let childWidget;
+    // If the widget in which to paste the new widget is NOT
+    // a tabs widget
+    if (parentWidget.type !== WidgetTypes.TABS_WIDGET) {
+      // The child will be a CANVAS_WIDGET, as we've established
+      // this parent widget to be a container like widget
+      // Which always has its first child as a canvas widget
+      childWidget = parentWidget.children && widgets[parentWidget.children[0]];
+    } else {
+      // If the widget in which to paste the new widget is a tabs widget
+      // Find the currently selected tab canvas widget
+      const { selectedTabWidgetId } = yield select(
+        getWidgetMetaProps,
+        parentWidget.widgetId,
+      );
+      if (selectedTabWidgetId) childWidget = widgets[selectedTabWidgetId];
+    }
+    // If the finally selected parent in which to paste the widget
+    // is a CANVAS_WIDGET, use its widgetId as the new widget's parent Id
+    if (childWidget && childWidget.type === WidgetTypes.CANVAS_WIDGET) {
+      newWidgetParentId = childWidget.widgetId;
+    }
+  }
+  return newWidgetParentId;
+};
+
+export const checkIfPastingIntoListWidget = function(
+  canvasWidgets: CanvasWidgetsReduxState,
+  selectedWidget: FlattenedWidgetProps | undefined,
+  copiedWidgets: {
+    widgetId: string;
+    parentId: string;
+    list: WidgetProps[];
+  }[],
+) {
+  // when list widget is selected, if the user is pasting, we want it to be pasted in the template
+  // which is first children of list widget
+  if (
+    selectedWidget &&
+    selectedWidget.children &&
+    selectedWidget?.type === WidgetTypes.LIST_WIDGET
+  ) {
+    const childrenIds: string[] = getWidgetChildren(
+      canvasWidgets,
+      selectedWidget.children[0],
+    );
+    const firstChildId = childrenIds[0];
+
+    // if any copiedWidget is a list widget, we will paste into the parent of list widget
+    for (let i = 0; i < copiedWidgets.length; i++) {
+      const copiedWidgetId = copiedWidgets[i].widgetId;
+      const copiedWidget = canvasWidgets[copiedWidgetId];
+
+      if (copiedWidget.type === WidgetTypes.LIST_WIDGET) {
+        return selectedWidget;
+      }
+    }
+
+    return get(canvasWidgets, firstChildId);
+  }
+  return selectedWidget;
+};
diff --git a/app/client/src/sagas/WidgetSelectionSagas.ts b/app/client/src/sagas/WidgetSelectionSagas.ts
new file mode 100644
index 0000000000..67fe87e16e
--- /dev/null
+++ b/app/client/src/sagas/WidgetSelectionSagas.ts
@@ -0,0 +1,181 @@
+import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
+import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
+import { all, put, select, takeLatest } from "redux-saga/effects";
+import { getWidgetImmediateChildren, getWidgets } from "./selectors";
+import log from "loglevel";
+import {
+  deselectMultipleWidgetsAction,
+  selectMultipleWidgetsAction,
+  selectWidgetAction,
+  selectWidgetInitAction,
+  silentAddSelectionsAction,
+} from "actions/widgetSelectionActions";
+import { Toaster } from "components/ads/Toast";
+import { createMessage, SELECT_ALL_WIDGETS_MSG } from "constants/messages";
+import { Variant } from "components/ads/common";
+import { getSelectedWidget, getSelectedWidgets } from "selectors/ui";
+import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
+
+// The following is computed to be used in the entity explorer
+// Every time a widget is selected, we need to expand widget entities
+// in the entity explorer so that the selected widget is visible
+function* selectedWidgetAncestrySaga(
+  action: ReduxAction<{ widgetId: string; isMultiSelect: boolean }>,
+) {
+  try {
+    const canvasWidgets = yield select(getWidgets);
+    const widgetIdsExpandList = [];
+    const { isMultiSelect, widgetId: selectedWidget } = action.payload;
+
+    // Make sure that the selected widget exists in canvasWidgets
+    let widgetId = canvasWidgets[selectedWidget]
+      ? canvasWidgets[selectedWidget].parentId
+      : undefined;
+    // If there is a parentId for the selectedWidget
+    if (widgetId) {
+      // Keep including the parent until we reach the main container
+      while (widgetId !== MAIN_CONTAINER_WIDGET_ID) {
+        widgetIdsExpandList.push(widgetId);
+        if (canvasWidgets[widgetId] && canvasWidgets[widgetId].parentId)
+          widgetId = canvasWidgets[widgetId].parentId;
+        else break;
+      }
+    }
+    if (isMultiSelect) {
+      // Deselect the parents if this is a Multi select.
+      const parentsToDeselect = widgetIdsExpandList.filter(
+        (each) => each !== selectedWidget,
+      );
+      if (parentsToDeselect && parentsToDeselect.length) {
+        yield put(deselectMultipleWidgetsAction(parentsToDeselect));
+      }
+    }
+
+    yield put({
+      type: ReduxActionTypes.SET_SELECTED_WIDGET_ANCESTORY,
+      payload: widgetIdsExpandList,
+    });
+  } catch (error) {
+    log.debug("Could not compute selected widget's ancestry", error);
+  }
+}
+
+function* selectAllWidgetsInCanvasSaga(
+  action: ReduxAction<{ canvasId: string }>,
+) {
+  const { canvasId } = action.payload;
+  const allWidgetsOnCanvas: string[] = yield select(
+    getWidgetImmediateChildren,
+    canvasId,
+  );
+  if (allWidgetsOnCanvas && allWidgetsOnCanvas.length) {
+    yield put(selectMultipleWidgetsAction(allWidgetsOnCanvas));
+    Toaster.show({
+      text: createMessage(SELECT_ALL_WIDGETS_MSG),
+      variant: Variant.info,
+      duration: 3000,
+    });
+  }
+}
+
+function* deselectNonSiblingsOfWidgetSaga(
+  action: ReduxAction<{ widgetId: string; isMultiSelect: boolean }>,
+) {
+  const { isMultiSelect, widgetId } = action.payload;
+  if (isMultiSelect) {
+    const allWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
+    const parentId: any = allWidgets[widgetId].parentId;
+    const childWidgets: string[] = yield select(
+      getWidgetImmediateChildren,
+      parentId,
+    );
+    const currentSelectedWidgets: string[] = yield select(getSelectedWidgets);
+
+    const nonSiblings = currentSelectedWidgets.filter(
+      (each) => !childWidgets.includes(each),
+    );
+    if (nonSiblings && nonSiblings.length) {
+      yield put(
+        deselectMultipleWidgetsAction(
+          nonSiblings.filter((each) => each !== widgetId),
+        ),
+      );
+    }
+  }
+}
+
+function* selectWidgetSaga(
+  action: ReduxAction<{ widgetId: string; isMultiSelect: boolean }>,
+) {
+  const { isMultiSelect, widgetId } = action.payload;
+  yield put(selectWidgetAction(widgetId, isMultiSelect));
+}
+
+function* shiftSelectWidgetsSaga(
+  action: ReduxAction<{ widgetId: string; siblingWidgets: string[] }>,
+) {
+  const { siblingWidgets, widgetId } = action.payload;
+  const selectedWidgets: string[] = yield select(getSelectedWidgets);
+  const lastSelectedWidget: string = yield select(getSelectedWidget);
+  const lastSelectedWidgetIndex = siblingWidgets.indexOf(lastSelectedWidget);
+  const isWidgetSelected = selectedWidgets.includes(widgetId);
+  if (!isWidgetSelected && lastSelectedWidgetIndex > -1) {
+    const selectedWidgetIndex = siblingWidgets.indexOf(widgetId);
+    const start =
+      lastSelectedWidgetIndex < selectedWidgetIndex
+        ? lastSelectedWidgetIndex
+        : selectedWidgetIndex;
+    const end =
+      lastSelectedWidgetIndex < selectedWidgetIndex
+        ? selectedWidgetIndex
+        : lastSelectedWidgetIndex;
+    const unSelectedSiblings = siblingWidgets.slice(start + 1, end);
+    if (unSelectedSiblings && unSelectedSiblings.length) {
+      yield put(silentAddSelectionsAction(unSelectedSiblings));
+    }
+  }
+  yield put(selectWidgetInitAction(widgetId, true));
+}
+
+function* selectMultipleWidgetsSaga(
+  action: ReduxAction<{ widgetIds: string[] }>,
+) {
+  const { widgetIds } = action.payload;
+  if (!widgetIds || !widgetIds.length) {
+    return;
+  }
+  const allWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
+  const parentToMatch = allWidgets[widgetIds[0]].parentId;
+  const doesNotMatchParent = widgetIds.some((each) => {
+    return allWidgets[each].parentId !== parentToMatch;
+  });
+  if (doesNotMatchParent) {
+    return;
+  } else {
+    yield put(selectWidgetAction());
+    yield put(selectMultipleWidgetsAction(widgetIds));
+  }
+}
+
+export function* widgetSelectionSagas() {
+  yield all([
+    takeLatest(
+      ReduxActionTypes.SHIFT_SELECT_WIDGET_INIT,
+      shiftSelectWidgetsSaga,
+    ),
+    takeLatest(ReduxActionTypes.SELECT_WIDGET_INIT, selectWidgetSaga),
+    takeLatest(ReduxActionTypes.SELECT_WIDGET_INIT, selectedWidgetAncestrySaga),
+    takeLatest(
+      ReduxActionTypes.SELECT_WIDGET_INIT,
+      deselectNonSiblingsOfWidgetSaga,
+    ),
+    takeLatest(
+      ReduxActionTypes.SELECT_ALL_WIDGETS_IN_CANVAS_INIT,
+      selectAllWidgetsInCanvasSaga,
+    ),
+    takeLatest(
+      ReduxActionTypes.SELECT_MULTIPLE_WIDGETS_INIT,
+      selectMultipleWidgetsSaga,
+    ),
+  ]);
+}
diff --git a/app/client/src/sagas/index.tsx b/app/client/src/sagas/index.tsx
index 6caee17a09..b01b9e92c4 100644
--- a/app/client/src/sagas/index.tsx
+++ b/app/client/src/sagas/index.tsx
@@ -20,55 +20,60 @@ import modalSagas from "./ModalSagas";
 import batchSagas from "./BatchSagas";
 import themeSagas from "./ThemeSaga";
 import evaluationsSaga from "./EvaluationsSaga";
-import onboardingSaga from "./OnboardingSagas";
+import onboardingSagas from "./OnboardingSagas";
 import utilSagas from "./UtilSagas";
 import saaSPaneSagas from "./SaaSPaneSagas";
 import actionExecutionChangeListeners from "./WidgetLoadingSaga";
 import globalSearchSagas from "./GlobalSearchSagas";
 import recentEntitiesSagas from "./RecentEntitiesSagas";
 import commentSagas from "./CommentSagas";
-import websocketSagas from "./WebsocketSagas";
+import websocketSagas from "./WebsocketSagas/WebsocketSagas";
 import debuggerSagas from "./DebuggerSagas";
+import tourSagas from "./TourSagas";
+import notificationsSagas from "./NotificationsSagas";
+import selectionCanvasSagas from "./SelectionCanvasSagas";
 import log from "loglevel";
 import * as sentry from "@sentry/react";
 
-export function* rootSaga() {
-  const sagas = [
-    initSagas,
-    pageSagas,
-    fetchWidgetCardsSaga,
-    watchActionSagas,
-    watchActionExecutionSagas,
-    widgetOperationSagas,
-    errorSagas,
-    watchDatasourcesSagas,
-    applicationSagas,
-    apiPaneSagas,
-    userSagas,
-    pluginSagas,
-    orgSagas,
-    importedCollectionsSagas,
-    providersSagas,
-    curlImportSagas,
-    queryPaneSagas,
-    modalSagas,
-    batchSagas,
-    themeSagas,
-    evaluationsSaga,
-    onboardingSaga,
-    actionExecutionChangeListeners,
-    utilSagas,
-    saaSPaneSagas,
-    globalSearchSagas,
-    recentEntitiesSagas,
-    commentSagas,
-    websocketSagas,
-    debuggerSagas,
-    utilSagas,
-    saaSPaneSagas,
-  ];
+const sagas = [
+  initSagas,
+  pageSagas,
+  fetchWidgetCardsSaga,
+  watchActionSagas,
+  watchActionExecutionSagas,
+  widgetOperationSagas,
+  errorSagas,
+  watchDatasourcesSagas,
+  applicationSagas,
+  apiPaneSagas,
+  userSagas,
+  pluginSagas,
+  orgSagas,
+  importedCollectionsSagas,
+  providersSagas,
+  curlImportSagas,
+  queryPaneSagas,
+  modalSagas,
+  batchSagas,
+  themeSagas,
+  evaluationsSaga,
+  onboardingSagas,
+  actionExecutionChangeListeners,
+  utilSagas,
+  globalSearchSagas,
+  recentEntitiesSagas,
+  commentSagas,
+  websocketSagas,
+  debuggerSagas,
+  saaSPaneSagas,
+  tourSagas,
+  notificationsSagas,
+  selectionCanvasSagas,
+];
+
+export function* rootSaga(sagasToRun = sagas) {
   yield all(
-    sagas.map((saga) =>
+    sagasToRun.map((saga) =>
       spawn(function*() {
         while (true) {
           try {
diff --git a/app/client/src/sagas/selectors.tsx b/app/client/src/sagas/selectors.tsx
index 05acd6e33d..82559b7bab 100644
--- a/app/client/src/sagas/selectors.tsx
+++ b/app/client/src/sagas/selectors.tsx
@@ -6,7 +6,8 @@ import _ from "lodash";
 import { WidgetType } from "constants/WidgetConstants";
 import { ActionData } from "reducers/entityReducers/actionsReducer";
 import { Page } from "constants/ReduxActionConstants";
-import { getActions } from "../selectors/entitiesSelector";
+import { getActions, getPlugins } from "../selectors/entitiesSelector";
+import { Plugin } from "api/PluginApi";
 
 export const getWidgets = (
   state: AppState,
@@ -82,6 +83,15 @@ export const getExistingActionNames = createSelector(
   },
 );
 
+export const getPluginIdToImageLocation = createSelector(
+  getPlugins,
+  (plugins) =>
+    plugins.reduce((acc: any, p: Plugin) => {
+      acc[p.id] = p.iconLocation;
+      return acc;
+    }, {}),
+);
+
 /**
  * returns a objects of existing page name in data tree
  *
@@ -123,7 +133,33 @@ export const getPluginIdOfPackageName = (
 };
 
 export const getSelectedWidget = (state: AppState) => {
-  const selectedWidgetId = state.ui.widgetDragResize.selectedWidget;
+  const selectedWidgetId = state.ui.widgetDragResize.lastSelectedWidget;
   if (!selectedWidgetId) return;
   return state.entities.canvasWidgets[selectedWidgetId];
 };
+
+export const getFocusedWidget = (state: AppState) => {
+  const focusedWidgetId = state.ui.widgetDragResize.focusedWidget;
+  if (!focusedWidgetId) return;
+  return state.entities.canvasWidgets[focusedWidgetId];
+};
+
+export const getWidgetImmediateChildren = createSelector(
+  getWidget,
+  (widget: WidgetProps) => {
+    const childrenIds: string[] = [];
+    if (widget === undefined) {
+      return [];
+    }
+    const { children = [] } = widget;
+    if (children && children.length) {
+      for (const childIndex in children) {
+        if (children.hasOwnProperty(childIndex)) {
+          const child = children[childIndex];
+          childrenIds.push(child);
+        }
+      }
+    }
+    return childrenIds;
+  },
+);
diff --git a/app/client/src/sagas/userSagas.tsx b/app/client/src/sagas/userSagas.tsx
index ac59d26b38..6589f2ef14 100644
--- a/app/client/src/sagas/userSagas.tsx
+++ b/app/client/src/sagas/userSagas.tsx
@@ -1,4 +1,4 @@
-import { call, takeLatest, put, all } from "redux-saga/effects";
+import { call, takeLatest, put, all, select, take } from "redux-saga/effects";
 import {
   ReduxAction,
   ReduxActionWithPromise,
@@ -13,6 +13,7 @@ import UserApi, {
   VerifyTokenRequest,
   TokenPasswordUpdateRequest,
   UpdateUserRequest,
+  LeaveOrgRequest,
 } from "api/UserApi";
 import { APPLICATIONS_URL, AUTH_LOGIN_URL, BASE_URL } from "constants/routes";
 import history from "utils/history";
@@ -39,12 +40,16 @@ import { ERROR_CODES } from "constants/ApiConstants";
 import { ANONYMOUS_USERNAME } from "constants/userConstants";
 import { flushErrorsAndRedirect } from "actions/errorActions";
 import localStorage from "utils/localStorage";
+import { Toaster } from "components/ads/Toast";
+import { Variant } from "components/ads/common";
 import log from "loglevel";
 
+import { getCurrentUser } from "selectors/usersSelectors";
+
 export function* createUserSaga(
   action: ReduxActionWithPromise<CreateUserRequest>,
 ) {
-  const { email, password, resolve, reject } = action.payload;
+  const { email, password, reject, resolve } = action.payload;
   try {
     const request: CreateUserRequest = { email, password };
     const response: CreateUserResponse = yield callAPI(
@@ -57,7 +62,7 @@ export function* createUserSaga(
       const errorMessage = getResponseErrorMessage(response);
       yield call(reject, { _error: errorMessage });
     } else {
-      const { email, name, id } = response.data;
+      const { email, id, name } = response.data;
       yield put({
         type: ReduxActionTypes.CREATE_USER_SUCCESS,
         payload: {
@@ -133,7 +138,7 @@ export function* getCurrentUserSaga() {
 export function* forgotPasswordSaga(
   action: ReduxActionWithPromise<ForgotPasswordRequest>,
 ) {
-  const { email, resolve, reject } = action.payload;
+  const { email, reject, resolve } = action.payload;
 
   try {
     const request: ForgotPasswordRequest = { email };
@@ -163,7 +168,7 @@ export function* forgotPasswordSaga(
 export function* resetPasswordSaga(
   action: ReduxActionWithPromise<TokenPasswordUpdateRequest>,
 ) {
-  const { email, token, password, resolve, reject } = action.payload;
+  const { email, password, reject, resolve, token } = action.payload;
   try {
     const request: TokenPasswordUpdateRequest = {
       email,
@@ -196,7 +201,7 @@ export function* resetPasswordSaga(
 export function* invitedUserSignupSaga(
   action: ReduxActionWithPromise<TokenPasswordUpdateRequest>,
 ) {
-  const { email, token, password, resolve, reject } = action.payload;
+  const { email, password, reject, resolve, token } = action.payload;
   try {
     const request: TokenPasswordUpdateRequest = { email, password, token };
     const response: ApiResponse = yield callAPI(
@@ -240,7 +245,7 @@ export function* inviteUsers(
     data: { usernames: string[]; orgId: string; roleName: string };
   }>,
 ) {
-  const { data, resolve, reject } = action.payload;
+  const { data, reject, resolve } = action.payload;
   try {
     const response: ApiResponse = yield callAPI(UserApi.inviteUser, {
       usernames: data.usernames,
@@ -274,8 +279,9 @@ export function* inviteUsers(
 
 export function* updateUserDetailsSaga(action: ReduxAction<UpdateUserRequest>) {
   try {
-    const { name } = action.payload;
+    const { email, name } = action.payload;
     const response: ApiResponse = yield callAPI(UserApi.updateUser, {
+      email,
       name,
     });
     const isValidResponse = yield validateResponse(response);
@@ -348,6 +354,33 @@ export function* logoutSaga(action: ReduxAction<{ redirectURL: string }>) {
   }
 }
 
+export function* waitForFetchUserSuccess() {
+  const currentUser = yield select(getCurrentUser);
+  if (!currentUser) {
+    yield take(ReduxActionTypes.FETCH_USER_DETAILS_SUCCESS);
+  }
+}
+
+function* removePhoto(action: ReduxAction<{ callback: () => void }>) {
+  try {
+    yield call(UserApi.deletePhoto);
+    if (action.payload.callback) action.payload.callback();
+  } catch (error) {
+    log.error(error);
+  }
+}
+
+function* updatePhoto(
+  action: ReduxAction<{ file: File; callback: () => void }>,
+) {
+  try {
+    yield call(UserApi.uploadPhoto, { file: action.payload.file });
+    if (action.payload.callback) action.payload.callback();
+  } catch (error) {
+    log.error(error);
+  }
+}
+
 export default function* userSagas() {
   yield all([
     takeLatest(ReduxActionTypes.CREATE_USER_INIT, createUserSaga),
@@ -369,5 +402,27 @@ export default function* userSagas() {
       ReduxActionTypes.UPDATE_USER_DETAILS_INIT,
       updateUserDetailsSaga,
     ),
+    takeLatest(ReduxActionTypes.REMOVE_PROFILE_PHOTO, removePhoto),
+    takeLatest(ReduxActionTypes.UPLOAD_PROFILE_PHOTO, updatePhoto),
+    takeLatest(ReduxActionTypes.LEAVE_ORG_INIT, leaveOrgSaga),
   ]);
 }
+
+export function* leaveOrgSaga(action: ReduxAction<LeaveOrgRequest>) {
+  try {
+    const request: LeaveOrgRequest = action.payload;
+    const response: ApiResponse = yield call(UserApi.leaveOrg, request);
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      yield put({
+        type: ReduxActionTypes.GET_ALL_APPLICATION_INIT,
+      });
+      Toaster.show({
+        text: `You have successfully left the organization`,
+        variant: Variant.success,
+      });
+    }
+  } catch (error) {
+    // do nothing as it's already handled globally
+  }
+}
diff --git a/app/client/src/selectors/applicationSelectors.tsx b/app/client/src/selectors/applicationSelectors.tsx
index 12326e87ad..3cd62820ea 100644
--- a/app/client/src/selectors/applicationSelectors.tsx
+++ b/app/client/src/selectors/applicationSelectors.tsx
@@ -36,6 +36,8 @@ export const getIsDuplicatingApplication = (state: AppState) =>
   state.ui.applications.duplicatingApplication;
 export const getIsSavingAppName = (state: AppState) =>
   state.ui.applications.isSavingAppName;
+export const getIsErroredSavingAppName = (state: AppState) =>
+  state.ui.applications.isErrorSavingAppName;
 export const getUserApplicationsOrgs = (state: AppState) => {
   return state.ui.applications.userOrgs;
 };
@@ -141,3 +143,6 @@ export const getIsDeletingApplications = createSelector(
 
 export const getIsSavingOrgInfo = (state: AppState) =>
   state.ui.applications.isSavingOrgInfo;
+
+export const showAppInviteUsersDialogSelector = (state: AppState) =>
+  state.ui.applications.showAppInviteUsersDialog;
diff --git a/app/client/src/selectors/commentsSelectors.ts b/app/client/src/selectors/commentsSelectors.ts
index 8f7d77b8b0..8f1bd23fda 100644
--- a/app/client/src/selectors/commentsSelectors.ts
+++ b/app/client/src/selectors/commentsSelectors.ts
@@ -1,7 +1,7 @@
 import { AppState } from "reducers";
 import { get } from "lodash";
-import { getCurrentUser } from "selectors/usersSelectors";
-import { CommentThread } from "entities/Comments/CommentsInterfaces";
+import { CommentThread, Comment } from "entities/Comments/CommentsInterfaces";
+import { options as filterOptions } from "comments/AppComments/AppCommentsFilterPopover";
 
 export const refCommentThreadsSelector = (
   refId: string,
@@ -28,12 +28,8 @@ export const applicationCommentsSelector = (applicationId: string) => (
   state: AppState,
 ) => state.ui.comments.applicationCommentThreadsByRef[applicationId];
 
-export const areCommentsEnabledForUser = (state: AppState) => {
-  const user = getCurrentUser(state);
-  const email = get(user, "email", "");
-  const isAppsmithEmail = email.toLowerCase().indexOf("@appsmith.com") !== -1;
-  return isAppsmithEmail;
-};
+export const areCommentsEnabledForUserAndApp = (state: AppState) =>
+  state.ui.comments?.areCommentsEnabled;
 
 /**
  * Comments are stored as a map of refs (for example widgetIds)
@@ -54,18 +50,105 @@ export const getAppCommentThreads = (
 export const allCommentThreadsMap = (state: AppState) =>
   state.ui.comments.commentThreadsMap;
 
-export const getSortedAppCommentThreadIds = (
+const getSortIndexBool = (a: boolean, b: boolean) => {
+  if (a && b) return 0;
+  if (a) return -1;
+  if (b) return 1;
+  else return 0;
+};
+
+const getSortIndexTime = (
+  a: string | number = new Date().toISOString(),
+  b: string | number = new Date().toISOString(),
+) => {
+  const tsA = new Date(a).valueOf();
+  const tsB = new Date(b).valueOf();
+
+  if (tsA === tsB) return 0;
+  else if (tsA > tsB) return -1;
+  else return 1;
+};
+
+const getContainsMyComment = (
+  thread: CommentThread,
+  currentUserUsername?: string,
+) =>
+  thread.comments.some(
+    (comment: Comment) => comment.authorUsername === currentUserUsername,
+  );
+
+export const getSortedAndFilteredAppCommentThreadIds = (
   applicationThreadIds: Array<string>,
   commentThreadsMap: Record<string, CommentThread>,
+  shouldShowResolved: boolean,
+  appCommentsFilter: typeof filterOptions[number]["value"],
+  currentUserUsername?: string,
 ): Array<string> => {
   if (!applicationThreadIds) return [];
-  return applicationThreadIds.sort((a, b) => {
-    const { isPinned: isAPinned } = commentThreadsMap[a];
-    const { isPinned: isBPinned } = commentThreadsMap[b];
+  const result = applicationThreadIds
+    .sort((a, b) => {
+      // TODO verify cases where commentThread can be undefined
+      if (!commentThreadsMap[a] || !commentThreadsMap[b]) return -1;
 
-    if (isAPinned && isBPinned) return -0;
-    if (isAPinned) return -1;
-    if (isBPinned) return 1;
-    else return 0;
-  });
+      const {
+        pinnedState: isAPinned,
+        updationTime: updationTimeA,
+      } = commentThreadsMap[a];
+      const {
+        pinnedState: isBPinned,
+        updationTime: updationTimeB,
+      } = commentThreadsMap[b];
+
+      const sortIdx = getSortIndexBool(
+        !!isAPinned?.active,
+        !!isBPinned?.active,
+      );
+      if (sortIdx !== 0) return sortIdx;
+
+      const result = getSortIndexTime(updationTimeA, updationTimeB);
+
+      return result;
+    })
+    .filter((threadId: string) => {
+      const thread = commentThreadsMap[threadId];
+
+      // Happens during delete thread
+      if (!thread) return false;
+
+      const isResolved = thread.resolvedState?.active;
+      const isPinned = thread.pinnedState?.active;
+
+      switch (appCommentsFilter) {
+        case "show-only-yours": {
+          const containsMyComment = getContainsMyComment(
+            thread,
+            currentUserUsername,
+          );
+          return containsMyComment;
+        }
+        case "show-only-pinned": {
+          return isPinned && (!isResolved || shouldShowResolved);
+        }
+        default: {
+          return shouldShowResolved || !isResolved;
+        }
+      }
+    });
+
+  return result;
 };
+
+export const shouldShowResolved = (state: AppState) =>
+  state.ui.comments.shouldShowResolvedAppCommentThreads;
+
+export const appCommentsFilter = (state: AppState) =>
+  state.ui.comments.appCommentsFilter;
+
+export const showUnreadIndicator = (state: AppState) =>
+  state.ui.comments.unreadCommentThreadsCount > 0;
+
+export const visibleCommentThread = (state: AppState) =>
+  state.ui.comments.visibleCommentThreadId;
+
+export const isIntroCarouselVisibleSelector = (state: AppState) =>
+  state.ui.comments.isIntroCarouselVisible;
diff --git a/app/client/src/selectors/editorSelectors.tsx b/app/client/src/selectors/editorSelectors.tsx
index 632f88e28e..97ce93c0e2 100644
--- a/app/client/src/selectors/editorSelectors.tsx
+++ b/app/client/src/selectors/editorSelectors.tsx
@@ -124,9 +124,9 @@ export const getWidgetCards = createSelector(
     return cards
       .map((widget: WidgetCardProps) => {
         const {
-          rows,
           columns,
           detachFromLayout = false,
+          rows,
         }: any = widgetConfigs.config[widget.type];
         return { ...widget, rows, columns, detachFromLayout };
       })
@@ -264,6 +264,7 @@ const createLoadingWidget = (
     bindingPaths: {},
     triggerPaths: {},
     validationPaths: {},
+    logBlackList: {},
     isLoading: true,
   };
 };
diff --git a/app/client/src/selectors/entitiesSelector.ts b/app/client/src/selectors/entitiesSelector.ts
index cbcfcdf01f..5ad7ba33d6 100644
--- a/app/client/src/selectors/entitiesSelector.ts
+++ b/app/client/src/selectors/entitiesSelector.ts
@@ -5,7 +5,7 @@ import {
 } from "reducers/entityReducers/actionsReducer";
 import { ActionResponse } from "api/ActionAPI";
 import { createSelector } from "reselect";
-import { Datasource } from "entities/Datasource";
+import { Datasource, MockDatasource } from "entities/Datasource";
 import { Action, PluginType } from "entities/Action";
 import { find } from "lodash";
 import ImageAlt from "assets/images/placeholder-image.svg";
@@ -20,6 +20,10 @@ export const getDatasources = (state: AppState): Datasource[] => {
   return state.entities.datasources.list;
 };
 
+export const getMockDatasources = (state: AppState): MockDatasource[] => {
+  return state.entities.datasources.mockDatasourceList;
+};
+
 export const getPluginIdsOfNames = (
   state: AppState,
   names: Array<string>,
@@ -299,7 +303,12 @@ export const getCanvasWidgets = (state: AppState): CanvasWidgetsReduxState =>
   state.entities.canvasWidgets;
 
 const getPageWidgets = (state: AppState) => state.ui.pageWidgets;
-
+export const getCurrentPageWidgets = createSelector(
+  getPageWidgets,
+  getCurrentPageId,
+  (widgetsByPage, currentPageId) =>
+    currentPageId ? widgetsByPage[currentPageId] : {},
+);
 export const getAllWidgetsMap = createSelector(
   getPageWidgets,
   (widgetsByPage) => {
diff --git a/app/client/src/selectors/notificationSelectors.ts b/app/client/src/selectors/notificationSelectors.ts
new file mode 100644
index 0000000000..c409452b35
--- /dev/null
+++ b/app/client/src/selectors/notificationSelectors.ts
@@ -0,0 +1,13 @@
+import { AppState } from "reducers";
+
+export const notificationsSelector = (state: AppState) =>
+  state.ui.notifications.notifications;
+
+export const unreadCountSelector = (state: AppState) =>
+  state.ui.notifications.unreadNotificationsCount;
+
+export const isNotificationsListVisibleSelector = (state: AppState) =>
+  state.ui.notifications.showNotificationsMenu;
+
+export const fetchingNotificationsSelector = (state: AppState) =>
+  state.ui.notifications.fetchingNotifications;
diff --git a/app/client/src/selectors/propertyPaneSelectors.tsx b/app/client/src/selectors/propertyPaneSelectors.tsx
index 0c8d3b453e..f59163af24 100644
--- a/app/client/src/selectors/propertyPaneSelectors.tsx
+++ b/app/client/src/selectors/propertyPaneSelectors.tsx
@@ -8,6 +8,8 @@ import { getDataTree } from "selectors/dataTreeSelectors";
 import { DataTree, DataTreeWidget } from "entities/DataTree/dataTreeFactory";
 import { PropertyPaneReduxState } from "reducers/uiReducers/propertyPaneReducer";
 import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
+import { getSelectedWidget, getSelectedWidgets } from "./ui";
+import { EVALUATION_PATH } from "utils/DynamicBindingUtils";
 
 const getPropertyPaneState = (state: AppState): PropertyPaneReduxState =>
   state.ui.propertyPane;
@@ -42,17 +44,7 @@ export const getWidgetPropsForPropertyPane = createSelector(
     const widgetProperties = { ...widget };
 
     if (evaluatedWidget) {
-      if (evaluatedWidget.evaluatedValues) {
-        widgetProperties.evaluatedValues = {
-          ...evaluatedWidget.evaluatedValues,
-        };
-      }
-
-      if (evaluatedWidget.invalidProps) {
-        const { invalidProps, validationMessages } = evaluatedWidget;
-        widgetProperties.invalidProps = invalidProps;
-        widgetProperties.validationMessages = validationMessages;
-      }
+      widgetProperties[EVALUATION_PATH] = evaluatedWidget[EVALUATION_PATH];
     }
     return widgetProperties;
   },
@@ -64,6 +56,24 @@ const isResizingorDragging = (state: AppState) =>
 export const getIsPropertyPaneVisible = createSelector(
   getPropertyPaneState,
   isResizingorDragging,
-  (pane: PropertyPaneReduxState, isResizingorDragging: boolean) =>
-    !!(!isResizingorDragging && pane.isVisible && pane.widgetId),
+  getSelectedWidget,
+  getSelectedWidgets,
+  (
+    pane: PropertyPaneReduxState,
+    isResizingorDragging: boolean,
+    lastSelectedWidget,
+    widgets,
+  ) => {
+    const isWidgetSelected = pane.widgetId
+      ? lastSelectedWidget === pane.widgetId || widgets.includes(pane.widgetId)
+      : false;
+    const multipleWidgetsSelected = !!(widgets && widgets.length >= 2);
+    return !!(
+      isWidgetSelected &&
+      !multipleWidgetsSelected &&
+      !isResizingorDragging &&
+      pane.isVisible &&
+      pane.widgetId
+    );
+  },
 );
diff --git a/app/client/src/selectors/themeSelectors.tsx b/app/client/src/selectors/themeSelectors.tsx
index 23f1b14ed3..aeb85b86ae 100644
--- a/app/client/src/selectors/themeSelectors.tsx
+++ b/app/client/src/selectors/themeSelectors.tsx
@@ -6,14 +6,13 @@ export enum ThemeMode {
   DARK = "DARK",
 }
 
+const lightTheme = { ...theme, colors: { ...theme.colors, ...light } };
+
+const darkTheme = { ...theme, colors: { ...theme.colors, ...dark } };
+
 // Only for usage with ThemeProvider
-export const getThemeDetails = (
-  state: AppState,
-  themeMode: ThemeMode,
-): Theme => {
-  const colors = themeMode === ThemeMode.LIGHT ? light : dark;
-  return { ...theme, colors: { ...theme.colors, ...colors } };
-};
+export const getThemeDetails = (state: AppState, themeMode: ThemeMode): Theme =>
+  themeMode === ThemeMode.LIGHT ? lightTheme : darkTheme;
 
 // Use to get the current theme of the app set via the theme switcher
 export const getCurrentThemeDetails = (state: AppState): Theme =>
diff --git a/app/client/src/selectors/tourSelectors.tsx b/app/client/src/selectors/tourSelectors.tsx
new file mode 100644
index 0000000000..4b2867a6e1
--- /dev/null
+++ b/app/client/src/selectors/tourSelectors.tsx
@@ -0,0 +1,7 @@
+import { AppState } from "reducers";
+
+export const getActiveTourIndex = (state: AppState) =>
+  state.ui.tour?.activeTourIndex;
+
+export const getActiveTourType = (state: AppState) =>
+  state.ui.tour?.activeTourType;
diff --git a/app/client/src/selectors/ui.tsx b/app/client/src/selectors/ui.tsx
index b506d7d803..a0de172b7a 100644
--- a/app/client/src/selectors/ui.tsx
+++ b/app/client/src/selectors/ui.tsx
@@ -1,4 +1,7 @@
 import { AppState } from "reducers";
 
 export const getSelectedWidget = (state: AppState) =>
-  state.ui.widgetDragResize.selectedWidget;
+  state.ui.widgetDragResize.lastSelectedWidget;
+
+export const getSelectedWidgets = (state: AppState) =>
+  state.ui.widgetDragResize.selectedWidgets;
diff --git a/app/client/src/templates/default.ts b/app/client/src/templates/default.ts
index 7755fa680b..249f498bbd 100644
--- a/app/client/src/templates/default.ts
+++ b/app/client/src/templates/default.ts
@@ -1,8 +1,10 @@
+import { GridDefaults } from "constants/WidgetConstants";
+
 export default {
   widgetName: "MainContainer",
   backgroundColor: "none",
   rightColumn: 1242,
-  snapColumns: 16,
+  snapColumns: GridDefaults.DEFAULT_GRID_COLUMNS,
   widgetId: "0",
   topRow: 0,
   bottomRow: 1292,
diff --git a/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts b/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts
index e6f1dbf14e..8a10dac832 100644
--- a/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts
+++ b/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts
@@ -8,6 +8,9 @@ import {
   ClientCredentials,
   GrantType,
   Oauth2Common,
+  Basic,
+  ApiKey,
+  BearerToken,
 } from "entities/Datasource/RestAPIForm";
 import _ from "lodash";
 
@@ -83,6 +86,8 @@ const formToDatasourceAuthentication = (
       scopeString: authentication.scopeString,
       clientSecret: authentication.clientSecret,
       isTokenHeader: authentication.isTokenHeader,
+      audience: authentication.audience,
+      resource: authentication.resource,
     };
     if (isClientCredentials(authType, authentication)) {
       return {
@@ -103,6 +108,36 @@ const formToDatasourceAuthentication = (
       };
     }
   }
+  if (authType === AuthType.basic) {
+    if ("username" in authentication) {
+      const basic: Basic = {
+        authenticationType: AuthType.basic,
+        username: authentication.username,
+        password: authentication.password,
+      };
+      return basic;
+    }
+  }
+  if (authType === AuthType.apiKey) {
+    if ("label" in authentication) {
+      const apiKey: ApiKey = {
+        authenticationType: AuthType.apiKey,
+        label: authentication.label,
+        value: authentication.value,
+        addTo: authentication.addTo,
+      };
+      return apiKey;
+    }
+  }
+  if (authType === AuthType.bearerToken) {
+    if ("bearerToken" in authentication) {
+      const bearerToken: BearerToken = {
+        authenticationType: AuthType.bearerToken,
+        bearerToken: authentication.bearerToken,
+      };
+      return bearerToken;
+    }
+  }
   return null;
 };
 
@@ -131,6 +166,8 @@ const datasourceToFormAuthentication = (
       scopeString: authentication.scopeString || "",
       clientSecret: authentication.clientSecret,
       isTokenHeader: !!authentication.isTokenHeader,
+      audience: authentication.audience || "",
+      resource: authentication.resource || "",
     };
     if (isClientCredentials(authType, authentication)) {
       return {
@@ -154,6 +191,30 @@ const datasourceToFormAuthentication = (
       };
     }
   }
+  if (authType === AuthType.basic) {
+    const basic: Basic = {
+      authenticationType: AuthType.basic,
+      username: authentication.username || "",
+      password: authentication.password || "",
+    };
+    return basic;
+  }
+  if (authType === AuthType.apiKey) {
+    const apiKey: ApiKey = {
+      authenticationType: AuthType.apiKey,
+      label: authentication.label || "",
+      value: authentication.value || "",
+      addTo: authentication.addTo || "",
+    };
+    return apiKey;
+  }
+  if (authType === AuthType.bearerToken) {
+    const bearerToken: BearerToken = {
+      authenticationType: AuthType.bearerToken,
+      bearerToken: authentication.bearerToken || "",
+    };
+    return bearerToken;
+  }
 };
 
 const isClientCredentials = (
diff --git a/app/client/src/utils/AnalyticsUtil.tsx b/app/client/src/utils/AnalyticsUtil.tsx
index 534208b675..0dc9e0174a 100644
--- a/app/client/src/utils/AnalyticsUtil.tsx
+++ b/app/client/src/utils/AnalyticsUtil.tsx
@@ -11,7 +11,8 @@ export type EventLocation =
   | "LIGHTNING_MENU"
   | "API_PANE"
   | "QUERY_PANE"
-  | "QUERY_TEMPLATE";
+  | "QUERY_TEMPLATE"
+  | "QUICK_COMMANDS";
 
 export type EventName =
   | "LOGIN_CLICK"
@@ -45,6 +46,7 @@ export type EventName =
   | "SAVE_API_CLICK"
   | "RUN_API"
   | "RUN_API_CLICK"
+  | "RUN_API_SHORTCUT"
   | "DELETE_API"
   | "DELETE_API_CLICK"
   | "IMPORT_API"
@@ -56,13 +58,14 @@ export type EventName =
   | "DUPLICATE_API_CLICK"
   | "RUN_QUERY"
   | "RUN_QUERY_CLICK"
+  | "RUN_QUERY_SHORTCUT"
   | "DELETE_QUERY"
   | "SAVE_QUERY"
   | "MOVE_API"
   | "3P_PROVIDER_CLICK"
   | "API_SELECT"
   | "CREATE_API_CLICK"
-  | "AUTO_COMPELTE_SHOW"
+  | "AUTO_COMPLETE_SHOW"
   | "AUTO_COMPLETE_SELECT"
   | "CREATE_APP_CLICK"
   | "CREATE_APP"
@@ -120,7 +123,12 @@ export type EventName =
   | "DEBUGGER_ENTITY_NAVIGATION"
   | "GSHEET_AUTH_INIT"
   | "GSHEET_AUTH_COMPLETE"
-  | "CYCLICAL_DEPENDENCY_ERROR";
+  | "CYCLICAL_DEPENDENCY_ERROR"
+  | "DISCORD_LINK_CLICK"
+  | "BINDING_SUCCESS"
+  | "SLASH_COMMAND"
+  | "DEBUGGER_NEW_ERROR"
+  | "DEBUGGER_RESOLVED_ERROR";
 
 function getApplicationId(location: Location) {
   const pathSplit = location.pathname.split("/");
diff --git a/app/client/src/utils/ApiPaneUtils.test.ts b/app/client/src/utils/ApiPaneUtils.test.ts
index f1640e7bc9..a924bf7e19 100644
--- a/app/client/src/utils/ApiPaneUtils.test.ts
+++ b/app/client/src/utils/ApiPaneUtils.test.ts
@@ -1,7 +1,7 @@
-import { getIndextoUpdate } from "utils/ApiPaneUtils";
+import { getIndextoUpdate, parseUrlForQueryParams } from "utils/ApiPaneUtils";
 
 describe("api pane header insertion or removal", () => {
-  describe("index for header needs to be retuened", () => {
+  describe("index for header needs to be returned", () => {
     test("it gives correct index", () => {
       const headers = [
         { key: "content-type", value: "application/json" },
@@ -29,3 +29,30 @@ describe("api pane header insertion or removal", () => {
     });
   });
 });
+
+describe("Api pane query parameters parsing", () => {
+  test("It gives correct query parameters", () => {
+    const url1 = "user?q=2&b='Auth=xyz'";
+    const params1 = [
+      { key: "q", value: "2" },
+      { key: "b", value: "'Auth=xyz'" },
+    ];
+    expect(parseUrlForQueryParams(url1)).toEqual(params1);
+    const url2 = "/user?q=2&b='Auth=xyz'";
+    expect(parseUrlForQueryParams(url2)).toEqual(params1);
+    const url3 = "user?q=2&b={{Api1.data.isLatest ? 'v1' : 'v2'}}";
+    const params2 = [
+      { key: "q", value: "2" },
+      { key: "b", value: "{{Api1.data.isLatest ? 'v1' : 'v2'}}" },
+    ];
+    expect(parseUrlForQueryParams(url3)).toEqual(params2);
+    const url4 = "";
+    const params3 = [
+      { key: "", value: "" },
+      { key: "", value: "" },
+    ];
+    expect(parseUrlForQueryParams(url4)).toEqual(params3);
+    const url5 = "/";
+    expect(parseUrlForQueryParams(url5)).toEqual(params3);
+  });
+});
diff --git a/app/client/src/utils/ApiPaneUtils.tsx b/app/client/src/utils/ApiPaneUtils.tsx
index b60d8f292b..13d2e158df 100644
--- a/app/client/src/utils/ApiPaneUtils.tsx
+++ b/app/client/src/utils/ApiPaneUtils.tsx
@@ -12,3 +12,26 @@ export const getIndextoUpdate = (
     contentTypeHeaderIndex > -1 ? contentTypeHeaderIndex : newHeaderIndex;
   return indexToUpdate;
 };
+
+export const queryParamsRegEx = /([\s\S]*?)(\?(?![^{]*})[\s\S]*)?$/;
+
+export function parseUrlForQueryParams(url: string) {
+  const padQueryParams = { key: "", value: "" };
+  let params = Array(2).fill(padQueryParams);
+  const matchGroup = url.match(queryParamsRegEx) || [];
+  const parsedUrlWithQueryParams = matchGroup[2] || "";
+  if (parsedUrlWithQueryParams.indexOf("?") > -1) {
+    const paramsString = parsedUrlWithQueryParams.substr(
+      parsedUrlWithQueryParams.indexOf("?") + 1,
+    );
+    params = paramsString.split("&").map((p) => {
+      const firstEqualPos = p.indexOf("=");
+      const keyValue =
+        firstEqualPos > -1
+          ? [p.substring(0, firstEqualPos), p.substring(firstEqualPos + 1)]
+          : [];
+      return { key: keyValue[0] || "", value: keyValue[1] || "" };
+    });
+  }
+  return params;
+}
diff --git a/app/client/src/utils/AppsmithConsole.ts b/app/client/src/utils/AppsmithConsole.ts
index 4cde432cb7..bfa1f4fd70 100644
--- a/app/client/src/utils/AppsmithConsole.ts
+++ b/app/client/src/utils/AppsmithConsole.ts
@@ -3,15 +3,10 @@ import { Message, Severity, LogActionPayload } from "entities/AppsmithConsole";
 import moment from "moment";
 import store from "store";
 
-// Eventually, if/when we need to dispatch events, we can import store and use store.dispatch
 function log(ev: Message) {
   store.dispatch(debuggerLogInit(ev));
 }
 
-/**
- * Helper functions, always supposed to be 1:1 mapped with `entities/AppsmithConsole/index.ts`
- */
-
 function getTimeStamp() {
   return moment().format("hh:mm:ss");
 }
diff --git a/app/client/src/utils/AppsmithUtils.tsx b/app/client/src/utils/AppsmithUtils.tsx
index ae8d6dc29b..96bca7620f 100644
--- a/app/client/src/utils/AppsmithUtils.tsx
+++ b/app/client/src/utils/AppsmithUtils.tsx
@@ -150,7 +150,11 @@ export const createNewApiName = (actions: ActionDataState, pageId: string) => {
 };
 
 export const noop = () => {
-  console.log("noop");
+  log.debug("noop");
+};
+
+export const stopEventPropagation = (e: any) => {
+  e.stopPropagation();
 };
 
 export const createNewQueryName = (
@@ -178,7 +182,9 @@ export const convertToString = (value: any): string => {
 const getEnvLogLevel = (configLevel: LogLevelDesc): LogLevelDesc => {
   let logLevel = configLevel;
   if (localStorage && localStorage.getItem) {
-    const localStorageLevel = localStorage.getItem("logLevel") as LogLevelDesc;
+    const localStorageLevel = localStorage.getItem(
+      "logLevelOverride",
+    ) as LogLevelDesc;
     if (localStorageLevel) logLevel = localStorageLevel;
   }
   return logLevel;
@@ -190,14 +196,14 @@ export const getInitialsAndColorCode = (
 ): string[] => {
   let inits = "";
   // if name contains space. eg: "Full Name"
-  if (fullName.includes(" ")) {
+  if (fullName && fullName.includes(" ")) {
     const namesArr = fullName.split(" ");
     let initials = namesArr.map((name: string) => name.charAt(0));
     initials = initials.join("").toUpperCase();
     inits = initials.slice(0, 2);
   } else {
     // handle for camelCase
-    const str = fullName.replace(/([a-z])([A-Z])/g, "$1 $2");
+    const str = fullName ? fullName.replace(/([a-z])([A-Z])/g, "$1 $2") : "";
     const namesArr = str.split(" ");
     let initials = namesArr.map((name: string) => name.charAt(0));
     initials = initials.join("").toUpperCase();
diff --git a/app/client/src/utils/DynamicBindingUtils.ts b/app/client/src/utils/DynamicBindingUtils.ts
index a3db79aa8e..e09e3ea5b3 100644
--- a/app/client/src/utils/DynamicBindingUtils.ts
+++ b/app/client/src/utils/DynamicBindingUtils.ts
@@ -7,6 +7,9 @@ import { Action } from "entities/Action";
 import moment from "moment-timezone";
 import { WidgetProps } from "widgets/BaseWidget";
 import parser from "fast-xml-parser";
+import { Severity } from "entities/AppsmithConsole";
+import { getEntityNameAndPropertyPath } from "workers/evaluationUtils";
+import forge from "node-forge";
 
 export type DependencyMap = Record<string, Array<string>>;
 
@@ -84,12 +87,9 @@ export const getDynamicBindings = (
 };
 
 export enum EvalErrorTypes {
-  DEPENDENCY_ERROR = "DEPENDENCY_ERROR",
+  CYCLICAL_DEPENDENCY_ERROR = "CYCLICAL_DEPENDENCY_ERROR",
   EVAL_PROPERTY_ERROR = "EVAL_PROPERTY_ERROR",
-  WIDGET_PROPERTY_VALIDATION_ERROR = "WIDGET_PROPERTY_VALIDATION_ERROR",
   EVAL_TREE_ERROR = "EVAL_TREE_ERROR",
-  UNESCAPE_STRING_ERROR = "UNESCAPE_STRING_ERROR",
-  EVAL_ERROR = "EVAL_ERROR",
   UNKNOWN_ERROR = "UNKNOWN_ERROR",
   BAD_UNEVAL_TREE_ERROR = "BAD_UNEVAL_TREE_ERROR",
   EVAL_TRIGGER_ERROR = "EVAL_TRIGGER_ERROR",
@@ -141,6 +141,15 @@ export const extraLibraries: ExtraLibrary[] = [
     docsURL: "https://github.com/NaturalIntelligence/fast-xml-parser",
     displayName: "xmlParser",
   },
+  {
+    accessor: "forge",
+    // We are removing some functionalities of node-forge because they wont
+    // work in the worker thread
+    lib: _.omit(forge, ["tls", "http", "xhr", "socket", "task"]),
+    version: "0.10.0",
+    docsURL: "https://github.com/digitalbazaar/forge",
+    displayName: "forge",
+  },
 ];
 
 export interface DynamicPath {
@@ -154,12 +163,6 @@ export interface WidgetDynamicPathListProps {
   dynamicPropertyPathList?: DynamicPath[];
 }
 
-export interface WidgetEvaluatedProps {
-  invalidProps?: Record<string, boolean>;
-  validationMessages?: Record<string, string>;
-  evaluatedValues?: Record<string, any>;
-}
-
 export interface EntityWithBindings {
   dynamicBindingPathList?: DynamicPath[];
 }
@@ -259,3 +262,73 @@ export const isChildPropertyPath = (
   parentPropertyPath === childPropertyPath ||
   childPropertyPath.startsWith(`${parentPropertyPath}.`) ||
   childPropertyPath.startsWith(`${parentPropertyPath}[`);
+
+/**
+ * Paths set via evaluator on entities
+ * During evaluation, the evaluator will set various data points
+ * on the entity objects to describe their state while evaluating.
+ * This information can be found on the following paths
+ * These paths are meant to be objects with
+ * information about the properties in
+ * a single place
+ *
+ * Stored in a flattened object like
+ * widget.__evaluation__.errors.primaryColumns.customColumn.computedValue = [...]
+ **/
+export const EVALUATION_PATH = "__evaluation__";
+export const EVAL_ERROR_PATH = `${EVALUATION_PATH}.errors`;
+export const EVAL_VALUE_PATH = `${EVALUATION_PATH}.evaluatedValues`;
+
+const getNestedEvalPath = (
+  fullPropertyPath: string,
+  pathType: string,
+  fullPath = true,
+) => {
+  const { entityName, propertyPath } = getEntityNameAndPropertyPath(
+    fullPropertyPath,
+  );
+  const nestedPath = `${pathType}.['${propertyPath}']`;
+  if (fullPath) {
+    return `${entityName}.${nestedPath}`;
+  }
+  return nestedPath;
+};
+
+export const getEvalErrorPath = (fullPropertyPath: string, fullPath = true) => {
+  return getNestedEvalPath(fullPropertyPath, EVAL_ERROR_PATH, fullPath);
+};
+
+export const getEvalValuePath = (fullPropertyPath: string, fullPath = true) => {
+  return getNestedEvalPath(fullPropertyPath, EVAL_VALUE_PATH, fullPath);
+};
+
+export enum PropertyEvaluationErrorType {
+  VALIDATION = "VALIDATION",
+  PARSE = "PARSE",
+  LINT = "LINT",
+}
+
+export type EvaluationError = {
+  raw: string;
+  errorType: PropertyEvaluationErrorType;
+  errorMessage: string;
+  severity: Severity.WARNING | Severity.ERROR;
+  errorSegment?: string;
+};
+
+export interface DataTreeEvaluationProps {
+  __evaluation__?: {
+    errors: Record<string, EvaluationError[]>;
+    evaluatedValues?: Record<string, unknown>;
+  };
+}
+
+export const PropertyEvalErrorTypeDebugMessage: Record<
+  PropertyEvaluationErrorType,
+  (propertyPath: string) => string
+> = {
+  [PropertyEvaluationErrorType.VALIDATION]: (propertyPath: string) =>
+    `The value at ${propertyPath} is invalid`,
+  [PropertyEvaluationErrorType.PARSE]: () => `Could not parse the binding`,
+  [PropertyEvaluationErrorType.LINT]: () => `Errors found while evaluating`,
+};
diff --git a/app/client/src/utils/FormControlRegistry.tsx b/app/client/src/utils/FormControlRegistry.tsx
index d66a647f09..c25ae1440d 100644
--- a/app/client/src/utils/FormControlRegistry.tsx
+++ b/app/client/src/utils/FormControlRegistry.tsx
@@ -31,6 +31,9 @@ import DynamicInputTextControl, {
   DynamicInputControlProps,
 } from "components/formControls/DynamicInputTextControl";
 import InputNumberControl from "components/formControls/InputNumberControl";
+import FieldArrayControl, {
+  FieldArrayControlProps,
+} from "components/formControls/FieldArrayControl";
 
 class FormControlRegistry {
   static registerFormControlBuilders() {
@@ -93,6 +96,11 @@ class FormControlRegistry {
         return <InputNumberControl {...controlProps} />;
       },
     });
+    FormControlFactory.registerControlBuilder("ARRAY_FIELD", {
+      buildPropertyControl(controlProps: FieldArrayControlProps): JSX.Element {
+        return <FieldArrayControl {...controlProps} />;
+      },
+    });
   }
 }
 
diff --git a/app/client/src/utils/PerformanceTracker.ts b/app/client/src/utils/PerformanceTracker.ts
index 42651f8353..99f56fccea 100644
--- a/app/client/src/utils/PerformanceTracker.ts
+++ b/app/client/src/utils/PerformanceTracker.ts
@@ -17,7 +17,9 @@ export enum PerformanceTransactionName {
   CHANGE_API_SAGA = "CHANGE_API_SAGA",
   SYNC_PARAMS_SAGA = "SYNC_PARAMS_SAGA",
   RUN_API_CLICK = "RUN_API_CLICK",
+  RUN_API_SHORTCUT = "RUN_API_SHORTCUT",
   RUN_QUERY_CLICK = "RUN_QUERY_CLICK",
+  RUN_QUERY_SHORTCUT = "RUN_QUERY_SHORTCUT",
   FETCH_ACTIONS_API = "FETCH_ACTIONS_API",
   FETCH_PAGE_LIST_API = "FETCH_PAGE_LIST_API",
   FETCH_PAGE_ACTIONS_API = "FETCH_PAGE_ACTIONS_API",
@@ -31,8 +33,13 @@ export enum PerformanceTransactionName {
   LOGIN_CLICK = "LOGIN_CLICK",
   INIT_EDIT_APP = "INIT_EDIT_APP",
   INIT_VIEW_APP = "INIT_VIEW_APP",
+  SHOW_RESIZE_HANDLES = "SHOW_RESIZE_HANDLES",
 }
 
+export type PerfTag = {
+  name: string;
+  value: string;
+};
 export interface PerfLog {
   sentrySpan: Span;
   skipLog?: boolean;
@@ -49,6 +56,7 @@ class PerformanceTracker {
     eventName: PerformanceTransactionName,
     data?: any,
     skipLog = false,
+    tags: Array<PerfTag> = [],
   ) => {
     if (appsmithConfigs.sentry.enabled) {
       const currentTransaction = Sentry.getCurrentHub()
@@ -76,6 +84,11 @@ class PerformanceTracker {
           );
         }
         const newTransaction = Sentry.startTransaction({ name: eventName });
+
+        tags.forEach(({ name: tagName, value }) => {
+          newTransaction.setTag(tagName, value);
+        });
+
         newTransaction.setData("startData", data);
         Sentry.getCurrentHub().configureScope((scope) =>
           scope.setSpan(newTransaction),
diff --git a/app/client/src/utils/PropertyControlFactory.tsx b/app/client/src/utils/PropertyControlFactory.tsx
index 2a1a804ab4..7c182b65ae 100644
--- a/app/client/src/utils/PropertyControlFactory.tsx
+++ b/app/client/src/utils/PropertyControlFactory.tsx
@@ -29,6 +29,7 @@ class PropertyControlFactory {
       if (customEditor) controlBuilder = this.controlMap.get(customEditor);
       else controlBuilder = this.controlMap.get("CODE_EDITOR");
     }
+
     if (controlBuilder) {
       const controlProps: ControlProps = {
         ...controlData,
diff --git a/app/client/src/utils/WidgetFactory.tsx b/app/client/src/utils/WidgetFactory.tsx
index cc5418552b..a133eebddd 100644
--- a/app/client/src/utils/WidgetFactory.tsx
+++ b/app/client/src/utils/WidgetFactory.tsx
@@ -136,7 +136,7 @@ class WidgetFactory {
 
   static getWidgetMetaPropertiesMap(
     widgetType: WidgetType,
-  ): Record<string, any> {
+  ): Record<string, string> {
     const map = this.metaPropertiesMap.get(widgetType);
     if (!map) {
       console.error("Widget meta properties not defined: ", widgetType);
@@ -172,9 +172,9 @@ class WidgetFactory {
 export type WidgetTypeConfigMap = Record<
   string,
   {
-    derivedProperties: WidgetDerivedPropertyType;
     defaultProperties: Record<string, string>;
     metaProperties: Record<string, any>;
+    derivedProperties: WidgetDerivedPropertyType;
   }
 >;
 
diff --git a/app/client/src/utils/WidgetPropsUtils.test.tsx b/app/client/src/utils/WidgetPropsUtils.test.tsx
index 592130a3b0..c4b9565c3d 100644
--- a/app/client/src/utils/WidgetPropsUtils.test.tsx
+++ b/app/client/src/utils/WidgetPropsUtils.test.tsx
@@ -1,6 +1,18 @@
 import * as generators from "../utils/generators";
 import { RenderModes, WidgetTypes } from "constants/WidgetConstants";
-import { migrateChartDataFromArrayToObject } from "./WidgetPropsUtils";
+import {
+  migrateChartDataFromArrayToObject,
+  migrateToNewLayout,
+  migrateInitialValues,
+  extractCurrentDSL,
+} from "./WidgetPropsUtils";
+import {
+  buildChildren,
+  widgetCanvasFactory,
+  buildDslWithChildren,
+} from "test/factories/WidgetFactoryUtils";
+import { cloneDeep } from "lodash";
+import { GRID_DENSITY_MIGRATION_V1 } from "mockResponses/WidgetConfigResponse";
 
 describe("WidgetProps tests", () => {
   it("it checks if array to object migration functions for chart widget ", () => {
@@ -87,4 +99,645 @@ describe("WidgetProps tests", () => {
 
     expect(result).toStrictEqual(output);
   });
+  it("Grid density migration - Main container widgets", () => {
+    const dsl: any = buildDslWithChildren([{ type: "TABS_WIDGET" }]);
+    const newMigratedDsl: any = migrateToNewLayout(cloneDeep(dsl));
+    expect(dsl.children[0].topRow * GRID_DENSITY_MIGRATION_V1).toBe(
+      newMigratedDsl.children[0].topRow,
+    );
+    expect(dsl.children[0].bottomRow * GRID_DENSITY_MIGRATION_V1).toBe(
+      newMigratedDsl.children[0].bottomRow,
+    );
+    expect(dsl.children[0].rightColumn * GRID_DENSITY_MIGRATION_V1).toBe(
+      newMigratedDsl.children[0].rightColumn,
+    );
+    expect(dsl.children[0].leftColumn * GRID_DENSITY_MIGRATION_V1).toBe(
+      newMigratedDsl.children[0].leftColumn,
+    );
+  });
+
+  it("Grid density migration - widgets inside a container", () => {
+    const childrenInsideContainer = buildChildren([
+      { type: "SWITCH_WIDGET" },
+      { type: "FORM_WIDGET" },
+      { type: "CONTAINER_WIDGET" },
+    ]);
+    const dslWithContainer: any = buildDslWithChildren([
+      { type: "CONTAINER_WIDGET", children: childrenInsideContainer },
+    ]);
+    const newMigratedDsl: any = migrateToNewLayout(cloneDeep(dslWithContainer));
+    // Container migrated checks
+    const containerWidget = dslWithContainer.children[0];
+    const migratedContainer = newMigratedDsl.children[0];
+    expect(containerWidget.topRow * GRID_DENSITY_MIGRATION_V1).toBe(
+      migratedContainer.topRow,
+    );
+    expect(containerWidget.bottomRow * GRID_DENSITY_MIGRATION_V1).toBe(
+      migratedContainer.bottomRow,
+    );
+    expect(containerWidget.rightColumn * GRID_DENSITY_MIGRATION_V1).toBe(
+      migratedContainer.rightColumn,
+    );
+    expect(containerWidget.leftColumn * GRID_DENSITY_MIGRATION_V1).toBe(
+      migratedContainer.leftColumn,
+    );
+    // Children inside container miragted
+
+    containerWidget.children.forEach((eachChild: any, index: any) => {
+      const migratedChild = migratedContainer.children[index];
+      expect(eachChild.topRow * GRID_DENSITY_MIGRATION_V1).toBe(
+        migratedChild.topRow,
+      );
+      expect(eachChild.bottomRow * GRID_DENSITY_MIGRATION_V1).toBe(
+        migratedChild.bottomRow,
+      );
+      expect(eachChild.rightColumn * GRID_DENSITY_MIGRATION_V1).toBe(
+        migratedChild.rightColumn,
+      );
+      expect(eachChild.leftColumn * GRID_DENSITY_MIGRATION_V1).toBe(
+        migratedChild.leftColumn,
+      );
+    });
+  });
+});
+
+describe("Initial value migration test", () => {
+  const containerWidget = {
+    widgetName: "MainContainer",
+    backgroundColor: "none",
+    rightColumn: 1118,
+    snapColumns: 16,
+    detachFromLayout: true,
+    widgetId: "0",
+    topRow: 0,
+    bottomRow: 560,
+    snapRows: 33,
+    isLoading: false,
+    parentRowSpace: 1,
+    type: WidgetTypes.CANVAS_WIDGET,
+    renderMode: RenderModes.CANVAS,
+    canExtend: true,
+    version: 18,
+    minHeight: 600,
+    parentColumnSpace: 1,
+    dynamicTriggerPathList: [],
+    dynamicBindingPathList: [],
+    leftColumn: 0,
+  };
+
+  it("Input widget", () => {
+    const input = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "Input1",
+          rightColumn: 8,
+          widgetId: "ra3vyy3nt2",
+          topRow: 1,
+          bottomRow: 2,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "",
+          type: WidgetTypes.INPUT_WIDGET,
+          version: 1,
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 3,
+          inputType: "TEXT",
+          renderMode: RenderModes.CANVAS,
+          resetOnSubmit: false,
+        },
+      ],
+    };
+    const output = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "Input1",
+          rightColumn: 8,
+          widgetId: "ra3vyy3nt2",
+          topRow: 1,
+          bottomRow: 2,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "",
+          type: "INPUT_WIDGET",
+          version: 1,
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          renderMode: "CANVAS",
+          leftColumn: 3,
+          inputType: "TEXT",
+          // will not override existing property
+          resetOnSubmit: false,
+          // following properties get added
+          isRequired: false,
+          isDisabled: false,
+        },
+      ],
+    };
+
+    expect(migrateInitialValues(input)).toEqual(output);
+  });
+
+  it("DROP_DOWN_WIDGET", () => {
+    const input = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "Select1",
+          rightColumn: 6,
+          widgetId: "1e3ytl2pl9",
+          topRow: 3,
+          bottomRow: 4,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "",
+          type: WidgetTypes.DROP_DOWN_WIDGET,
+          version: 1,
+          parentId: "0",
+          isLoading: false,
+          defaultOptionValue: "GREEN",
+          selectionType: "SINGLE_SELECT",
+          parentColumnSpace: 67.375,
+          renderMode: RenderModes.CANVAS,
+          leftColumn: 1,
+          options: [
+            {
+              label: "Blue",
+              value: "BLUE",
+            },
+            {
+              label: "Green",
+              value: "GREEN",
+            },
+            {
+              label: "Red",
+              value: "RED",
+            },
+          ],
+        },
+      ],
+    };
+
+    const output = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "Select1",
+          rightColumn: 6,
+          widgetId: "1e3ytl2pl9",
+          topRow: 3,
+          bottomRow: 4,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "",
+          type: WidgetTypes.DROP_DOWN_WIDGET,
+          version: 1,
+          parentId: "0",
+          isLoading: false,
+          defaultOptionValue: "GREEN",
+          selectionType: "SINGLE_SELECT",
+          parentColumnSpace: 67.375,
+          renderMode: "CANVAS",
+          leftColumn: 1,
+          options: [
+            {
+              label: "Blue",
+              value: "BLUE",
+            },
+            {
+              label: "Green",
+              value: "GREEN",
+            },
+            {
+              label: "Red",
+              value: "RED",
+            },
+          ],
+          // following properties get added
+          isRequired: false,
+          isDisabled: false,
+        },
+      ],
+    };
+
+    expect(migrateInitialValues(input)).toEqual(output);
+  });
+
+  it("DATE_PICKER_WIDGET2", () => {
+    const input = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "DatePicker1",
+          defaultDate: "2021-05-12T06:50:51.743Z",
+          rightColumn: 7,
+          dateFormat: "YYYY-MM-DD HH:mm",
+          widgetId: "5jbfazqnca",
+          topRow: 2,
+          bottomRow: 3,
+          parentRowSpace: 40,
+          isVisible: true,
+          datePickerType: "DATE_PICKER",
+          label: "",
+          type: WidgetTypes.DATE_PICKER_WIDGET2,
+          renderMode: RenderModes.CANVAS,
+          version: 2,
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 2,
+          isDisabled: false,
+        },
+      ],
+    };
+
+    const output = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "DatePicker1",
+          defaultDate: "2021-05-12T06:50:51.743Z",
+          rightColumn: 7,
+          dateFormat: "YYYY-MM-DD HH:mm",
+          widgetId: "5jbfazqnca",
+          topRow: 2,
+          bottomRow: 3,
+          parentRowSpace: 40,
+          isVisible: true,
+          datePickerType: "DATE_PICKER",
+          label: "",
+          type: WidgetTypes.DATE_PICKER_WIDGET2,
+          renderMode: RenderModes.CANVAS,
+          version: 2,
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 2,
+          isDisabled: false,
+          // following properties get added
+          isRequired: false,
+          minDate: "2001-01-01 00:00",
+          maxDate: "2041-12-31 23:59",
+        },
+      ],
+    };
+
+    expect(migrateInitialValues(input)).toEqual(output);
+  });
+
+  it("SWITCH_WIDGET", () => {
+    const input = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "Switch1",
+          rightColumn: 5,
+          widgetId: "4ksqurxmwn",
+          topRow: 2,
+          bottomRow: 3,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "Label",
+          type: WidgetTypes.SWITCH_WIDGET,
+          renderMode: RenderModes.CANVAS,
+          defaultSwitchState: true,
+          version: 1,
+          alignWidget: "LEFT",
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 3,
+        },
+      ],
+    };
+
+    const output = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "Switch1",
+          rightColumn: 5,
+          widgetId: "4ksqurxmwn",
+          topRow: 2,
+          bottomRow: 3,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "Label",
+          type: WidgetTypes.SWITCH_WIDGET,
+          renderMode: RenderModes.CANVAS,
+          defaultSwitchState: true,
+          version: 1,
+          alignWidget: "LEFT",
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 3,
+          // following properties get added
+          isDisabled: false,
+        },
+      ],
+    };
+
+    expect(migrateInitialValues(input)).toEqual(output);
+  });
+
+  it("Video widget", () => {
+    const input = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "Video1",
+          rightColumn: 9,
+          dynamicPropertyPathList: [],
+          widgetId: "ti5b5f5hvq",
+          topRow: 3,
+          bottomRow: 10,
+          parentRowSpace: 40,
+          isVisible: true,
+          type: WidgetTypes.VIDEO_WIDGET,
+          renderMode: RenderModes.CANVAS,
+          version: 1,
+          onPlay: "",
+          url: "https://www.youtube.com/watch?v=mzqK0QIZRLs",
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 2,
+          autoPlay: false,
+        },
+      ],
+    };
+    const output = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "Video1",
+          rightColumn: 9,
+          dynamicPropertyPathList: [],
+          widgetId: "ti5b5f5hvq",
+          topRow: 3,
+          bottomRow: 10,
+          parentRowSpace: 40,
+          isVisible: true,
+          type: WidgetTypes.VIDEO_WIDGET,
+          renderMode: RenderModes.CANVAS,
+          version: 1,
+          onPlay: "",
+          url: "https://www.youtube.com/watch?v=mzqK0QIZRLs",
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 2,
+          autoPlay: false,
+          // following properties get added
+          isRequired: false,
+          isDisabled: false,
+        },
+      ],
+    };
+
+    expect(migrateInitialValues(input)).toEqual(output);
+  });
+
+  it("CHECKBOX_WIDGET", () => {
+    const input = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "Checkbox1",
+          rightColumn: 8,
+          widgetId: "djxhhl1p7t",
+          topRow: 4,
+          bottomRow: 5,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "Label",
+          type: WidgetTypes.CHECKBOX_WIDGET,
+          renderMode: RenderModes.CANVAS,
+          version: 1,
+          alignWidget: "LEFT",
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 5,
+          defaultCheckedState: true,
+        },
+      ],
+    };
+    const output = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "Checkbox1",
+          rightColumn: 8,
+          widgetId: "djxhhl1p7t",
+          topRow: 4,
+          bottomRow: 5,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "Label",
+          type: WidgetTypes.CHECKBOX_WIDGET,
+          renderMode: RenderModes.CANVAS,
+          version: 1,
+          alignWidget: "LEFT",
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 5,
+          defaultCheckedState: true,
+          // following properties get added
+          isDisabled: false,
+          isRequired: false,
+        },
+      ],
+    };
+
+    expect(migrateInitialValues(input)).toEqual(output);
+  });
+
+  it("RADIO_GROUP_WIDGET", () => {
+    const input = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "RadioGroup1",
+          rightColumn: 5,
+          widgetId: "4ixyqnw2no",
+          topRow: 3,
+          bottomRow: 5,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "",
+          type: WidgetTypes.RADIO_GROUP_WIDGET,
+          renderMode: RenderModes.CANVAS,
+          version: 1,
+          parentId: "0",
+          isLoading: false,
+          defaultOptionValue: "Y",
+          parentColumnSpace: 67.375,
+          leftColumn: 2,
+          options: [
+            {
+              label: "Yes",
+              value: "Y",
+            },
+            {
+              label: "No",
+              value: "N",
+            },
+          ],
+        },
+      ],
+    };
+    const output = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "RadioGroup1",
+          rightColumn: 5,
+          widgetId: "4ixyqnw2no",
+          topRow: 3,
+          bottomRow: 5,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "",
+          type: WidgetTypes.RADIO_GROUP_WIDGET,
+          renderMode: RenderModes.CANVAS,
+          version: 1,
+          parentId: "0",
+          isLoading: false,
+          defaultOptionValue: "Y",
+          parentColumnSpace: 67.375,
+          leftColumn: 2,
+          options: [
+            {
+              label: "Yes",
+              value: "Y",
+            },
+            {
+              label: "No",
+              value: "N",
+            },
+          ],
+          // following properties get added
+          isDisabled: false,
+          isRequired: false,
+        },
+      ],
+    };
+
+    expect(migrateInitialValues(input)).toEqual(output);
+  });
+
+  it("FILE_PICKER_WIDGET", () => {
+    const input = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "FilePicker1",
+          rightColumn: 5,
+          isDefaultClickDisabled: true,
+          widgetId: "fzajyy8qft",
+          topRow: 4,
+          bottomRow: 5,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "Select Files",
+          maxFileSize: 5,
+          type: WidgetTypes.FILE_PICKER_WIDGET,
+          renderMode: RenderModes.CANVAS,
+          version: 1,
+          fileDataType: "Base64",
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 1,
+          files: [],
+          maxNumFiles: 1,
+        },
+      ],
+    };
+
+    const output = {
+      ...containerWidget,
+      children: [
+        {
+          widgetName: "FilePicker1",
+          rightColumn: 5,
+          isDefaultClickDisabled: true,
+          widgetId: "fzajyy8qft",
+          topRow: 4,
+          bottomRow: 5,
+          parentRowSpace: 40,
+          isVisible: true,
+          label: "Select Files",
+          maxFileSize: 5,
+          type: WidgetTypes.FILE_PICKER_WIDGET,
+          renderMode: RenderModes.CANVAS,
+          version: 1,
+          fileDataType: "Base64",
+          parentId: "0",
+          isLoading: false,
+          parentColumnSpace: 67.375,
+          leftColumn: 1,
+          files: [],
+          maxNumFiles: 1,
+          // following properties get added
+          isDisabled: false,
+          isRequired: false,
+          allowedFileTypes: [],
+        },
+      ],
+    };
+
+    expect(migrateInitialValues(input)).toEqual(output);
+  });
+  it("", () => {
+    const tabsWidgetDSL: any = (version = 1) => {
+      const children: any = buildChildren([
+        {
+          version,
+          type: "TABS_WIDGET",
+          children: [
+            {
+              type: "CANVAS_WIDGET",
+              tabId: "tab1212332",
+              tabName: "Newly Added Tab",
+              widgetId: "o9ody00ep7",
+              parentId: "jd83uvbkmp",
+              detachFromLayout: true,
+              children: [],
+              parentRowSpace: 1,
+              parentColumnSpace: 1,
+              // leftColumn: 0,
+              // rightColumn: 592, // Commenting these coz they are not provided for a newly added tab in the Tabs widget version 2
+              // bottomRow: 280,
+              topRow: 0,
+              isLoading: false,
+              widgetName: "Canvas1",
+              renderMode: "CANVAS",
+            },
+          ],
+        },
+      ]);
+      const dsl: any = widgetCanvasFactory.build({
+        children,
+      });
+      return {
+        data: {
+          layouts: [{ dsl }],
+        },
+      };
+    };
+    const migratedDslV2: any = extractCurrentDSL(tabsWidgetDSL());
+    expect(migratedDslV2.children[0].children[0].leftColumn).toBeNaN();
+    const migratedDslV3: any = extractCurrentDSL(tabsWidgetDSL(2));
+    expect(migratedDslV3.children[0].version).toBe(3);
+    expect(migratedDslV3.children[0].children[0].leftColumn).not.toBeNaN();
+    expect(migratedDslV3.children[0].children[0].leftColumn).toBe(0);
+  });
 });
diff --git a/app/client/src/utils/WidgetPropsUtils.tsx b/app/client/src/utils/WidgetPropsUtils.tsx
index ef6498b393..b5a683a215 100644
--- a/app/client/src/utils/WidgetPropsUtils.tsx
+++ b/app/client/src/utils/WidgetPropsUtils.tsx
@@ -10,28 +10,36 @@ import {
 } from "widgets/BaseWidget";
 import {
   GridDefaults,
+  LATEST_PAGE_VERSION,
   MAIN_CONTAINER_WIDGET_ID,
   RenderMode,
   WidgetType,
   WidgetTypes,
 } from "constants/WidgetConstants";
-import { snapToGrid } from "./helpers";
+import { renameKeyInObject, snapToGrid } from "./helpers";
 import { OccupiedSpace } from "constants/editorConstants";
 import defaultTemplate from "templates/default";
 import { generateReactKey } from "./generators";
 import { ChartDataPoint } from "widgets/ChartWidget";
 import { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
-import { isString, set } from "lodash";
+import { get, has, isString, omit, set } from "lodash";
 import log from "loglevel";
 import {
   migrateTablePrimaryColumnsBindings,
   tableWidgetPropertyPaneMigrations,
+  migrateTableWidgetParentRowSpaceProperty,
+  migrateTableWidgetHeaderVisibilityProperties,
 } from "utils/migrations/TableWidget";
 import { migrateIncorrectDynamicBindingPathLists } from "utils/migrations/IncorrectDynamicBindingPathLists";
 import * as Sentry from "@sentry/react";
 import { migrateTextStyleFromTextWidget } from "./migrations/TextWidgetReplaceTextStyle";
 import { nextAvailableRowInContainer } from "entities/Widget/utils";
 import { DATA_BIND_REGEX_GLOBAL } from "constants/BindingsConstants";
+import WidgetConfigResponse, {
+  GRID_DENSITY_MIGRATION_V1,
+} from "mockResponses/WidgetConfigResponse";
+import CanvasWidgetsNormalizer from "normalizers/CanvasWidgetsNormalizer";
+import { theme } from "../../src/constants/DefaultTheme";
 
 export type WidgetOperationParams = {
   operation: WidgetOperation;
@@ -516,13 +524,20 @@ export function migrateChartDataFromArrayToObject(
   return currentDSL;
 }
 
+const pixelToNumber = (pixel: string) => {
+  if (pixel.includes("px")) {
+    return parseInt(pixel.split("px").join(""));
+  }
+  return 0;
+};
+
 export const calculateDynamicHeight = (
   canvasWidgets: {
     [widgetId: string]: FlattenedWidgetProps;
   } = {},
   presentMinimumHeight = CANVAS_DEFAULT_HEIGHT_PX,
 ) => {
-  let minmumHeight = presentMinimumHeight;
+  let minimumHeight = presentMinimumHeight;
   const nextAvailableRow = nextAvailableRowInContainer(
     MAIN_CONTAINER_WIDGET_ID,
     canvasWidgets,
@@ -531,19 +546,86 @@ export const calculateDynamicHeight = (
   const gridRowHeight = GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
   const calculatedCanvasHeight = nextAvailableRow * gridRowHeight;
   // DGRH - DEFAULT_GRID_ROW_HEIGHT
-  // View Mode: Header height + Page Selection Tab = 2 * DGRH (approx)
-  // Edit Mode: Header height + Canvas control = 2 * DGRH (approx)
-  // buffer = DGRH, it's not 2 * DGRH coz we already add a buffer on the canvas which is also equal to DGRH.
-  const buffer = gridRowHeight;
+  // View Mode: Header height + Page Selection Tab = 8 * DGRH (approx)
+  // Edit Mode: Header height + Canvas control = 8 * DGRH (approx)
+  // buffer: ~8 grid row height
+  const buffer = gridRowHeight + 2 * pixelToNumber(theme.smallHeaderHeight);
   const calculatedMinHeight =
     Math.floor((screenHeight - buffer) / gridRowHeight) * gridRowHeight;
   if (
     calculatedCanvasHeight < screenHeight &&
     calculatedMinHeight !== presentMinimumHeight
   ) {
-    minmumHeight = calculatedMinHeight;
+    minimumHeight = calculatedMinHeight;
   }
-  return minmumHeight;
+  return minimumHeight;
+};
+
+export const migrateInitialValues = (
+  currentDSL: ContainerWidgetProps<WidgetProps>,
+) => {
+  currentDSL.children = currentDSL.children?.map((child: WidgetProps) => {
+    if (child.type === WidgetTypes.INPUT_WIDGET) {
+      child = {
+        isRequired: false,
+        isDisabled: false,
+        resetOnSubmit: false,
+        ...child,
+      };
+    } else if (child.type === WidgetTypes.DROP_DOWN_WIDGET) {
+      child = {
+        isRequired: false,
+        isDisabled: false,
+        ...child,
+      };
+    } else if (child.type === WidgetTypes.DATE_PICKER_WIDGET2) {
+      child = {
+        minDate: "2001-01-01 00:00",
+        maxDate: "2041-12-31 23:59",
+        isRequired: false,
+        ...child,
+      };
+    } else if (child.type === WidgetTypes.SWITCH_WIDGET) {
+      child = {
+        isDisabled: false,
+        ...child,
+      };
+    } else if (child.type === WidgetTypes.ICON_WIDGET) {
+      child = {
+        isRequired: false,
+        ...child,
+      };
+    } else if (child.type === WidgetTypes.VIDEO_WIDGET) {
+      child = {
+        isRequired: false,
+        isDisabled: false,
+        ...child,
+      };
+    } else if (child.type === WidgetTypes.CHECKBOX_WIDGET) {
+      child = {
+        isDisabled: false,
+        isRequired: false,
+        ...child,
+      };
+    } else if (child.type === WidgetTypes.RADIO_GROUP_WIDGET) {
+      child = {
+        isDisabled: false,
+        isRequired: false,
+        ...child,
+      };
+    } else if (child.type === WidgetTypes.FILE_PICKER_WIDGET) {
+      child = {
+        isDisabled: false,
+        isRequired: false,
+        allowedFileTypes: [],
+        ...child,
+      };
+    } else if (child.children && child.children.length > 0) {
+      child = migrateInitialValues(child);
+    }
+    return child;
+  });
+  return currentDSL;
 };
 
 // A rudimentary transform function which updates the DSL based on its version.
@@ -654,9 +736,243 @@ const transformDSL = (currentDSL: ContainerWidgetProps<WidgetProps>) => {
     currentDSL.version = 18;
   }
 
+  if (currentDSL.version === 18) {
+    currentDSL = migrateInitialValues(currentDSL);
+    currentDSL.version = 19;
+  }
+
+  if (currentDSL.version === 19) {
+    currentDSL.snapColumns = GridDefaults.DEFAULT_GRID_COLUMNS;
+    currentDSL.snapRows = getCanvasSnapRows(
+      currentDSL.bottomRow,
+      currentDSL.detachFromLayout || false,
+    );
+    currentDSL = migrateToNewLayout(currentDSL);
+    currentDSL.version = 20;
+  }
+
+  if (currentDSL.version === 20) {
+    currentDSL = migrateNewlyAddedTabsWidgetsMissingData(currentDSL);
+    currentDSL.version = 21;
+  }
+
+  if (currentDSL.version === 21) {
+    const {
+      entities: { canvasWidgets },
+    } = CanvasWidgetsNormalizer.normalize(currentDSL);
+    currentDSL = migrateWidgetsWithoutLeftRightColumns(
+      currentDSL,
+      canvasWidgets,
+    );
+    currentDSL = migrateOverFlowingTabsWidgets(currentDSL, canvasWidgets);
+    currentDSL.version = 22;
+  }
+
+  if (currentDSL.version === 22) {
+    currentDSL = migrateTableWidgetParentRowSpaceProperty(currentDSL);
+    currentDSL.version = 23;
+  }
+
+  if (currentDSL.version === 23) {
+    currentDSL = addLogBlackListToAllListWidgetChildren(currentDSL);
+    currentDSL.version = 24;
+  }
+
+  if (currentDSL.version === 24) {
+    currentDSL = migrateTableWidgetHeaderVisibilityProperties(currentDSL);
+    currentDSL.version = 25;
+  }
+
+  if (currentDSL.version === 25) {
+    currentDSL = migrateItemsToListDataInListWidget(currentDSL);
+    currentDSL.version = 26;
+  }
+  if (currentDSL.version === 26) {
+    currentDSL = migrateFilterValueForDropDownWidget(currentDSL);
+    currentDSL.version = LATEST_PAGE_VERSION;
+  }
+
   return currentDSL;
 };
 
+const addFilterDefaultValue = (
+  currentDSL: ContainerWidgetProps<WidgetProps>,
+) => {
+  if (currentDSL.type === WidgetTypes.DROP_DOWN_WIDGET) {
+    if (!currentDSL.hasOwnProperty("isFilterable")) {
+      currentDSL.isFilterable = true;
+    }
+  }
+  return currentDSL;
+};
+export const migrateFilterValueForDropDownWidget = (
+  currentDSL: ContainerWidgetProps<WidgetProps>,
+) => {
+  const newDSL = addFilterDefaultValue(currentDSL);
+
+  newDSL.children = newDSL.children?.map((children: WidgetProps) => {
+    return migrateFilterValueForDropDownWidget(children);
+  });
+
+  return newDSL;
+};
+export const migrateObjectFitToImageWidget = (
+  dsl: ContainerWidgetProps<WidgetProps>,
+) => {
+  const addObjectFitProperty = (widgetProps: WidgetProps) => {
+    widgetProps.objectFit = "cover";
+    if (widgetProps.children && widgetProps.children.length) {
+      widgetProps.children.forEach((eachWidgetProp: WidgetProps) => {
+        if (widgetProps.type === "IMAGE_WIDGET") {
+          addObjectFitProperty(eachWidgetProp);
+        }
+      });
+    }
+  };
+  addObjectFitProperty(dsl);
+  return dsl;
+};
+
+const migrateOverFlowingTabsWidgets = (
+  currentDSL: ContainerWidgetProps<WidgetProps>,
+  canvasWidgets: any,
+) => {
+  if (
+    currentDSL.type === "TABS_WIDGET" &&
+    currentDSL.version === 3 &&
+    currentDSL.children &&
+    currentDSL.children.length
+  ) {
+    const tabsWidgetHeight =
+      (currentDSL.bottomRow - currentDSL.topRow) * currentDSL.parentRowSpace;
+    const widgetHasOverflowingChildren = currentDSL.children.some((eachTab) => {
+      if (eachTab.children && eachTab.children.length) {
+        return eachTab.children.some((child: WidgetProps) => {
+          if (canvasWidgets[child.widgetId].repositioned) {
+            const tabHeight = child.bottomRow * child.parentRowSpace;
+            return tabsWidgetHeight < tabHeight;
+          }
+          return false;
+        });
+      }
+      return false;
+    });
+    if (widgetHasOverflowingChildren) {
+      currentDSL.shouldScrollContents = true;
+    }
+  }
+  if (currentDSL.children && currentDSL.children.length) {
+    currentDSL.children = currentDSL.children.map((eachChild) =>
+      migrateOverFlowingTabsWidgets(eachChild, canvasWidgets),
+    );
+  }
+  return currentDSL;
+};
+
+const migrateWidgetsWithoutLeftRightColumns = (
+  currentDSL: ContainerWidgetProps<WidgetProps>,
+  canvasWidgets: any,
+) => {
+  if (
+    currentDSL.widgetId !== MAIN_CONTAINER_WIDGET_ID &&
+    !(
+      currentDSL.hasOwnProperty("leftColumn") &&
+      currentDSL.hasOwnProperty("rightColumn")
+    )
+  ) {
+    try {
+      const nextRow = nextAvailableRowInContainer(
+        currentDSL.parentId || MAIN_CONTAINER_WIDGET_ID,
+        omit(canvasWidgets, [currentDSL.widgetId]),
+      );
+      canvasWidgets[currentDSL.widgetId].repositioned = true;
+      const leftColumn = 0;
+      const rightColumn = WidgetConfigResponse.config[currentDSL.type].rows;
+      const bottomRow = nextRow + (currentDSL.bottomRow - currentDSL.topRow);
+      const topRow = nextRow;
+      currentDSL = {
+        ...currentDSL,
+        topRow,
+        bottomRow,
+        rightColumn,
+        leftColumn,
+      };
+    } catch (error) {
+      Sentry.captureException({
+        message: "Migrating position of widget on data loss failed",
+        oldData: currentDSL,
+      });
+    }
+  }
+  if (currentDSL.children && currentDSL.children.length) {
+    currentDSL.children = currentDSL.children.map((dsl) =>
+      migrateWidgetsWithoutLeftRightColumns(dsl, canvasWidgets),
+    );
+  }
+  return currentDSL;
+};
+
+const migrateNewlyAddedTabsWidgetsMissingData = (
+  currentDSL: ContainerWidgetProps<WidgetProps>,
+) => {
+  if (currentDSL.type === WidgetTypes.TABS_WIDGET && currentDSL.version === 2) {
+    try {
+      if (currentDSL.children && currentDSL.children.length) {
+        currentDSL.children = currentDSL.children.map((each) => {
+          if (has(currentDSL, ["leftColumn", "rightColumn", "bottomRow"])) {
+            return each;
+          }
+          return {
+            ...each,
+            leftColumn: 0,
+            rightColumn:
+              (currentDSL.rightColumn - currentDSL.leftColumn) *
+              currentDSL.parentColumnSpace,
+            bottomRow:
+              (currentDSL.bottomRow - currentDSL.topRow) *
+              currentDSL.parentRowSpace,
+          };
+        });
+      }
+      currentDSL.version = 3;
+    } catch (error) {
+      Sentry.captureException({
+        message: "Tabs Migration to add missing fields Failed",
+        oldData: currentDSL.children,
+      });
+    }
+  }
+  if (currentDSL.children && currentDSL.children.length) {
+    currentDSL.children = currentDSL.children.map(
+      migrateNewlyAddedTabsWidgetsMissingData,
+    );
+  }
+  return currentDSL;
+};
+
+export const migrateToNewLayout = (dsl: ContainerWidgetProps<WidgetProps>) => {
+  const scaleWidget = (widgetProps: WidgetProps) => {
+    widgetProps.bottomRow *= GRID_DENSITY_MIGRATION_V1;
+    widgetProps.topRow *= GRID_DENSITY_MIGRATION_V1;
+    widgetProps.leftColumn *= GRID_DENSITY_MIGRATION_V1;
+    widgetProps.rightColumn *= GRID_DENSITY_MIGRATION_V1;
+    if (widgetProps.children && widgetProps.children.length) {
+      widgetProps.children.forEach((eachWidgetProp: WidgetProps) => {
+        scaleWidget(eachWidgetProp);
+      });
+    }
+  };
+  scaleWidget(dsl);
+  return dsl;
+};
+
+export const checkIfMigrationIsNeeded = (
+  fetchPageResponse?: FetchPageResponse,
+) => {
+  const currentDSL = fetchPageResponse?.data.layouts[0].dsl || defaultDSL;
+  return currentDSL.version !== LATEST_PAGE_VERSION;
+};
+
 export const extractCurrentDSL = (
   fetchPageResponse?: FetchPageResponse,
 ): ContainerWidgetProps<WidgetProps> => {
@@ -679,7 +995,7 @@ export const getDropZoneOffsets = (
   );
 };
 
-const areIntersecting = (r1: Rect, r2: Rect) => {
+export const areIntersecting = (r1: Rect, r2: Rect) => {
   return !(
     r2.left >= r1.right ||
     r2.right <= r1.left ||
@@ -914,3 +1230,99 @@ export const generateWidgetProps = (
     } else throw Error("Failed to create widget: Parent was not provided ");
   }
 };
+
+/**
+ * adds logBlackList key for all list widget children
+ *
+ * @param currentDSL
+ * @returns
+ */
+const addLogBlackListToAllListWidgetChildren = (
+  currentDSL: ContainerWidgetProps<WidgetProps>,
+) => {
+  currentDSL.children = currentDSL.children?.map((children: WidgetProps) => {
+    if (children.type === WidgetTypes.LIST_WIDGET) {
+      const widgets = get(
+        children,
+        "children.0.children.0.children.0.children",
+      );
+
+      widgets.map((widget: any, index: number) => {
+        const logBlackList: { [key: string]: boolean } = {};
+
+        Object.keys(widget).map((key) => {
+          logBlackList[key] = true;
+        });
+        if (!widget.logBlackList) {
+          set(
+            children,
+            `children.0.children.0.children.0.children.${index}.logBlackList`,
+            logBlackList,
+          );
+        }
+      });
+    }
+
+    return children;
+  });
+
+  return currentDSL;
+};
+
+/**
+ * changes items -> listData
+ *
+ * @param currentDSL
+ * @returns
+ */
+const migrateItemsToListDataInListWidget = (
+  currentDSL: ContainerWidgetProps<WidgetProps>,
+) => {
+  if (currentDSL.type === WidgetTypes.LIST_WIDGET) {
+    currentDSL = renameKeyInObject(currentDSL, "items", "listData");
+
+    currentDSL.dynamicBindingPathList = currentDSL.dynamicBindingPathList?.map(
+      (path: { key: string }) => {
+        if (path.key === "items") {
+          return { key: "listData" };
+        }
+
+        return path;
+      },
+    );
+
+    currentDSL.dynamicBindingPathList?.map((path: { key: string }) => {
+      if (
+        get(currentDSL, path.key) &&
+        path.key !== "items" &&
+        path.key !== "listData" &&
+        isString(get(currentDSL, path.key))
+      ) {
+        set(
+          currentDSL,
+          path.key,
+          get(currentDSL, path.key, "").replace("items", "listData"),
+        );
+      }
+    });
+
+    Object.keys(currentDSL.template).map((widgetName) => {
+      const currentWidget = currentDSL.template[widgetName];
+
+      currentWidget.dynamicBindingPathList?.map((path: { key: string }) => {
+        set(
+          currentWidget,
+          path.key,
+          get(currentWidget, path.key).replace("items", "listData"),
+        );
+      });
+    });
+  }
+
+  if (currentDSL.children && currentDSL.children.length > 0) {
+    currentDSL.children = currentDSL.children.map(
+      migrateItemsToListDataInListWidget,
+    );
+  }
+  return currentDSL;
+};
diff --git a/app/client/src/utils/WidgetRegistry.tsx b/app/client/src/utils/WidgetRegistry.tsx
index 7f735ff666..c1d55c5b55 100644
--- a/app/client/src/utils/WidgetRegistry.tsx
+++ b/app/client/src/utils/WidgetRegistry.tsx
@@ -100,9 +100,22 @@ import SwitchWidget, {
   ProfiledSwitchWidget,
   SwitchWidgetProps,
 } from "widgets/SwitchWidget";
+import DividerWidget, {
+  ProfiledDividerWidget,
+  DividerWidgetProps,
+} from "widgets/DividerWidget";
 import TabsMigratorWidget, {
   ProfiledTabsMigratorWidget,
 } from "widgets/Tabs/TabsMigrator";
+import RateWidget, {
+  RateWidgetProps,
+  ProfiledRateWidget,
+} from "widgets/RateWidget";
+import IframeWidget, {
+  IframeWidgetProps,
+  ProfiledIframeWidget,
+} from "widgets/IframeWidget";
+
 export default class WidgetBuilderRegistry {
   static registerWidgetBuilders() {
     WidgetFactory.registerWidgetBuilder(
@@ -454,5 +467,44 @@ export default class WidgetBuilderRegistry {
       ModalWidget.getMetaPropertiesMap(),
       ModalWidget.getPropertyPaneConfig(),
     );
+
+    WidgetFactory.registerWidgetBuilder(
+      "RATE_WIDGET",
+      {
+        buildWidget(widgetData: RateWidgetProps): JSX.Element {
+          return <ProfiledRateWidget {...widgetData} />;
+        },
+      },
+      RateWidget.getDerivedPropertiesMap(),
+      RateWidget.getDefaultPropertiesMap(),
+      RateWidget.getMetaPropertiesMap(),
+      RateWidget.getPropertyPaneConfig(),
+    );
+
+    WidgetFactory.registerWidgetBuilder(
+      WidgetTypes.IFRAME_WIDGET,
+      {
+        buildWidget(widgetData: IframeWidgetProps): JSX.Element {
+          return <ProfiledIframeWidget {...widgetData} />;
+        },
+      },
+      IframeWidget.getDerivedPropertiesMap(),
+      IframeWidget.getDefaultPropertiesMap(),
+      IframeWidget.getMetaPropertiesMap(),
+      IframeWidget.getPropertyPaneConfig(),
+    );
+
+    WidgetFactory.registerWidgetBuilder(
+      WidgetTypes.DIVIDER_WIDGET,
+      {
+        buildWidget(widgetProps: DividerWidgetProps): JSX.Element {
+          return <ProfiledDividerWidget {...widgetProps} />;
+        },
+      },
+      DividerWidget.getDerivedPropertiesMap(),
+      DividerWidget.getDefaultPropertiesMap(),
+      DividerWidget.getMetaPropertiesMap(),
+      DividerWidget.getPropertyPaneConfig(),
+    );
   }
 }
diff --git a/app/client/src/utils/autocomplete/EntityDefinitions.test.ts b/app/client/src/utils/autocomplete/EntityDefinitions.test.ts
index 03084f0ed2..a80d995e41 100644
--- a/app/client/src/utils/autocomplete/EntityDefinitions.test.ts
+++ b/app/client/src/utils/autocomplete/EntityDefinitions.test.ts
@@ -23,6 +23,7 @@ describe("EntityDefinitions", () => {
         name: "Some random name",
       },
     };
+
     const listWidgetEntityDefinitions = entityDefinitions.LIST_WIDGET(
       listWidgetProps,
     );
@@ -41,6 +42,8 @@ describe("EntityDefinitions", () => {
       },
       selectedItem: { id: "number", name: "string" },
       gridGap: "number",
+      items: "?",
+      listData: "?",
     };
 
     expect(listWidgetEntityDefinitions).toStrictEqual(output);
diff --git a/app/client/src/utils/autocomplete/EntityDefinitions.ts b/app/client/src/utils/autocomplete/EntityDefinitions.ts
index 0f0467d9ed..b439bf714e 100644
--- a/app/client/src/utils/autocomplete/EntityDefinitions.ts
+++ b/app/client/src/utils/autocomplete/EntityDefinitions.ts
@@ -14,6 +14,7 @@ const isVisible = {
 export const entityDefinitions = {
   ACTION: (entity: DataTreeAction) => {
     const dataDef = generateTypeDef(entity.data);
+    const responseMetaDef = generateTypeDef(entity.responseMeta);
     let data: Record<string, any> = {
       "!doc": "The response of the action",
     };
@@ -22,12 +23,21 @@ export const entityDefinitions = {
     } else {
       data = { ...data, ...dataDef };
     }
+    let responseMeta: Record<string, any> = {
+      "!doc": "The response meta of the action",
+    };
+    if (_.isString(responseMetaDef)) {
+      responseMeta["!type"] = responseMetaDef;
+    } else {
+      responseMeta = { ...responseMeta, ...responseMetaDef };
+    }
     return {
       "!doc":
         "Actions allow you to connect your widgets to your backend data in a secure manner.",
       "!url": "https://docs.appsmith.com/v/v1.2.1/framework-reference/run",
       isLoading: "bool",
       data,
+      responseMeta,
       run: "fn(onSuccess: fn() -> void, onError: fn() -> void) -> void",
     };
   },
@@ -76,7 +86,7 @@ export const entityDefinitions = {
   },
   DROP_DOWN_WIDGET: {
     "!doc":
-      "Dropdown is used to capture user input/s from a specified list of permitted inputs. A Dropdown can capture a single choice as well as multiple choices",
+      "Select is used to capture user input/s from a specified list of permitted inputs. A Select can capture a single choice as well as multiple choices",
     "!url": "https://docs.appsmith.com/widget-reference/dropdown",
     isVisible: isVisible,
     selectedOptionValue: {
@@ -221,7 +231,6 @@ export const entityDefinitions = {
     isVisible: isVisible,
     files: "[file]",
     isDisabled: "bool",
-    uploadedFileUrls: "string",
   },
   LIST_WIDGET: (widget: any) => ({
     "!doc":
@@ -234,7 +243,34 @@ export const entityDefinitions = {
     isVisible: isVisible,
     gridGap: "number",
     selectedItem: generateTypeDef(widget.selectedItem),
+    items: generateTypeDef(widget.items),
+    listData: generateTypeDef(widget.listData),
   }),
+  RATE_WIDGET: {
+    "!doc": "Rating widget is used to display ratings in your app.",
+    "!url": "https://docs.appsmith.com/widget-reference/rate",
+    isVisible: isVisible,
+    value: "number",
+    maxCount: "number",
+  },
+  IFRAME_WIDGET: {
+    "!doc": "Iframe widget is used to display iframes in your app.",
+    "!url": "https://docs.appsmith.com/widget-reference/iframe",
+    isVisible: isVisible,
+    source: "string",
+    title: "string",
+  },
+  DIVIDER_WIDGET: {
+    "!doc": "Divider is a simple UI widget used as a separator",
+    "!url": "https://docs.appsmith.com/widget-reference/divider",
+    isVisible: isVisible,
+    orientation: "string",
+    capType: "string",
+    capSide: "number",
+    strokeStyle: "string",
+    dividerColor: "string",
+    thickness: "number",
+  },
 };
 
 export const GLOBAL_DEFS = {
diff --git a/app/client/src/utils/autocomplete/TernServer.test.ts b/app/client/src/utils/autocomplete/TernServer.test.ts
index b6c0ca68c2..9aef7f91a9 100644
--- a/app/client/src/utils/autocomplete/TernServer.test.ts
+++ b/app/client/src/utils/autocomplete/TernServer.test.ts
@@ -3,8 +3,6 @@ import { MockCodemirrorEditor } from "../../../test/__mocks__/CodeMirrorEditorMo
 
 describe("Tern server", () => {
   it("Check whether the correct value is being sent to tern", () => {
-    const ternServer = new TernServer({});
-
     const testCases = [
       {
         input: {
@@ -42,13 +40,12 @@ describe("Tern server", () => {
     ];
 
     testCases.forEach((testCase) => {
-      const value = ternServer.getFocusedDynamicValue(testCase.input);
+      const value = TernServer.getFocusedDynamicValue(testCase.input);
       expect(value).toBe(testCase.expectedOutput);
     });
   });
 
   it("Check whether the correct position is sent for querying autocomplete", () => {
-    const ternServer = new TernServer({});
     const testCases = [
       {
         input: {
@@ -89,7 +86,7 @@ describe("Tern server", () => {
     ];
 
     testCases.forEach((testCase) => {
-      const request = ternServer.buildRequest(testCase.input, {});
+      const request = TernServer.buildRequest(testCase.input, {});
 
       expect(request.query.end).toEqual(testCase.expectedOutput);
     });
@@ -97,8 +94,6 @@ describe("Tern server", () => {
 
   it(`Check whether the position is evaluated correctly for placing the selected
       autocomplete value`, () => {
-    const ternServer = new TernServer({});
-
     const testCases = [
       {
         input: {
@@ -151,7 +146,7 @@ describe("Tern server", () => {
         testCase.input.codeEditor.doc,
       );
 
-      const value: any = ternServer.requestCallback(
+      const value: any = TernServer.requestCallback(
         null,
         testCase.input.requestCallbackData,
         (MockCodemirrorEditor as unknown) as CodeMirror.Editor,
diff --git a/app/client/src/utils/autocomplete/TernServer.ts b/app/client/src/utils/autocomplete/TernServer.ts
index 5a1863c349..1cbb7d5075 100644
--- a/app/client/src/utils/autocomplete/TernServer.ts
+++ b/app/client/src/utils/autocomplete/TernServer.ts
@@ -1,31 +1,51 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 // Heavily inspired from https://github.com/codemirror/CodeMirror/blob/master/addon/tern/tern.js
-import { DataTree } from "entities/DataTree/dataTreeFactory";
 import tern, { Server, Def } from "tern";
 import ecma from "tern/defs/ecmascript.json";
 import lodash from "constants/defs/lodash.json";
 import base64 from "constants/defs/base64-js.json";
 import moment from "constants/defs/moment.json";
 import xmlJs from "constants/defs/xmlParser.json";
-import { dataTreeTypeDefCreator } from "utils/autocomplete/dataTreeTypeDefCreator";
-import { customTreeTypeDefCreator } from "utils/autocomplete/customTreeTypeDefCreator";
+import forge from "constants/defs/forge.json";
 import CodeMirror, { Hint, Pos, cmpPos } from "codemirror";
 import {
   getDynamicStringSegments,
   isDynamicValue,
 } from "utils/DynamicBindingUtils";
+import {
+  GLOBAL_DEFS,
+  GLOBAL_FUNCTIONS,
+} from "utils/autocomplete/EntityDefinitions";
+
+const DEFS: Def[] = [
+  GLOBAL_FUNCTIONS,
+  GLOBAL_DEFS,
+  // @ts-ignore
+  ecma,
+  lodash,
+  base64,
+  moment,
+  xmlJs,
+  forge,
+];
 
-const DEFS = [ecma, lodash, base64, moment, xmlJs];
 const bigDoc = 250;
 const cls = "CodeMirror-Tern-";
 const hintDelay = 1700;
 
-type Completion = Hint & {
+export type Completion = Hint & {
   origin: string;
   type: DataType;
   data: {
     doc: string;
   };
+  render?: any;
+  isHeader?: boolean;
+};
+
+export type CommandsCompletion = Completion & {
+  action?: () => void;
+  shortcut: string;
 };
 
 type TernDocs = Record<string, TernDoc>;
@@ -57,26 +77,38 @@ class TernServer {
   server: Server;
   docs: TernDocs = Object.create(null);
   cachedArgHints: ArgHints | null = null;
+  active: any;
+  expected?: string;
+  entityName?: string;
 
-  constructor(
-    dataTree: DataTree,
-    additionalDataTree?: Record<string, Record<string, unknown>>,
-  ) {
-    const dataTreeDef = dataTreeTypeDefCreator(dataTree);
-    let customDataTreeDef = undefined;
-    if (additionalDataTree) {
-      customDataTreeDef = customTreeTypeDefCreator(additionalDataTree);
-    }
+  constructor() {
     this.server = new tern.Server({
       async: true,
-      defs: customDataTreeDef
-        ? [...DEFS, dataTreeDef, customDataTreeDef]
-        : [...DEFS, dataTreeDef],
+      defs: DEFS,
     });
   }
 
-  complete(cm: CodeMirror.Editor) {
-    cm.showHint({ hint: this.getHint.bind(this), completeSingle: false });
+  complete(cm: CodeMirror.Editor, expected: string, entityName: string) {
+    this.expected = expected;
+    this.entityName = entityName;
+    cm.showHint({
+      hint: this.getHint.bind(this),
+      completeSingle: false,
+      extraKeys: {
+        Up: (cm: CodeMirror.Editor, handle: any) => {
+          handle.moveFocus(-1);
+          if (this.active.isHeader === true) {
+            handle.moveFocus(-1);
+          }
+        },
+        Down: (cm: CodeMirror.Editor, handle: any) => {
+          handle.moveFocus(1);
+          if (this.active.isHeader === true) {
+            handle.moveFocus(1);
+          }
+        },
+      },
+    });
   }
 
   showType(cm: CodeMirror.Editor) {
@@ -97,6 +129,10 @@ class TernServer {
     this.server.addDefs(def, true);
   }
 
+  removeDef(name: string) {
+    this.server.deleteDefs(name);
+  }
+
   requestCallback(error: any, data: any, cm: CodeMirror.Editor, resolve: any) {
     if (error) return this.showError(cm, error);
     if (data.completions.length === 0) {
@@ -109,7 +145,7 @@ class TernServer {
     const index = lineValue.indexOf(focusedValue);
     let completions: Completion[] = [];
     let after = "";
-    const { start, end } = data;
+    const { end, start } = data;
     const from = {
       ...start,
       ch: start.ch + index,
@@ -129,19 +165,28 @@ class TernServer {
     for (let i = 0; i < data.completions.length; ++i) {
       const completion = data.completions[i];
       let className = this.typeToIcon(completion.type);
+      const dataType = this.getDataType(completion.type);
+      const entityName = this.entityName;
       if (data.guess) className += " " + cls + "guess";
-      completions.push({
-        text: completion.name + after,
-        displayText: completion.displayName || completion.name,
-        className: className,
-        data: completion,
-        origin: completion.origin,
-        type: this.getDataType(completion.type),
-      });
+      if (!entityName || !completion.name.includes(entityName)) {
+        completions.push({
+          text: completion.name + after,
+          displayText: completion.displayName || completion.name,
+          className: className,
+          data: completion,
+          origin: completion.origin,
+          type: dataType,
+        });
+      }
     }
     completions = this.sortCompletions(completions);
-
-    const obj = { from: from, to: to, list: completions };
+    const indexToBeSelected = completions.length > 1 ? 1 : 0;
+    const obj = {
+      from: from,
+      to: to,
+      list: completions,
+      selectedHint: indexToBeSelected,
+    };
     let tooltip: HTMLElement | undefined = undefined;
     CodeMirror.on(obj, "close", () => this.remove(tooltip));
     CodeMirror.on(obj, "update", () => this.remove(tooltip));
@@ -149,6 +194,7 @@ class TernServer {
       obj,
       "select",
       (cur: { data: { doc: string } }, node: any) => {
+        this.active = cur;
         this.remove(tooltip);
         const content = cur.data.doc;
         if (content) {
@@ -199,8 +245,9 @@ class TernServer {
 
   sortCompletions(completions: Completion[]) {
     // Add data tree completions before others
+    const expectedDataType = this.getExpectedDataType();
     const dataTreeCompletions = completions
-      .filter((c) => c.origin === "dataTree")
+      .filter((c) => c.origin && c.origin.startsWith("DATA_TREE_"))
       .sort((a: Completion, b: Completion) => {
         if (a.type === "FUNCTION" && b.type !== "FUNCTION") {
           return 1;
@@ -209,11 +256,44 @@ class TernServer {
         }
         return a.text.toLowerCase().localeCompare(b.text.toLowerCase());
       });
+    const sameDataType = dataTreeCompletions.filter(
+      (c) => c.type === expectedDataType,
+    );
+    const otherDataType = dataTreeCompletions.filter(
+      (c) => c.type !== expectedDataType,
+    );
+    if (otherDataType.length && sameDataType.length) {
+      const otherDataTitle: Completion = {
+        text: "Search results",
+        displayText: "Search results",
+        className: "CodeMirror-hint-header",
+        data: { doc: "" },
+        origin: "",
+        type: "UNKNOWN",
+        isHeader: true,
+      };
+      const sameDataTitle: Completion = {
+        text: "Best Match",
+        displayText: "Best Match",
+        className: "CodeMirror-hint-header",
+        data: { doc: "" },
+        origin: "",
+        type: "UNKNOWN",
+        isHeader: true,
+      };
+      sameDataType.unshift(sameDataTitle);
+      otherDataType.unshift(otherDataTitle);
+    }
     const docCompletetions = completions.filter((c) => c.origin === "[doc]");
     const otherCompletions = completions.filter(
       (c) => c.origin !== "dataTree" && c.origin !== "[doc]",
     );
-    return [...docCompletetions, ...dataTreeCompletions, ...otherCompletions];
+    return [
+      ...docCompletetions,
+      ...sameDataType,
+      ...otherDataType,
+      ...otherCompletions,
+    ];
   }
 
   getDataType(type: string): DataType {
@@ -221,11 +301,29 @@ class TernServer {
     else if (type === "number") return "NUMBER";
     else if (type === "string") return "STRING";
     else if (type === "bool") return "BOOLEAN";
+    else if (type === "array") return "ARRAY";
     else if (/^fn\(/.test(type)) return "FUNCTION";
     else if (/^\[/.test(type)) return "ARRAY";
     else return "OBJECT";
   }
 
+  getExpectedDataType() {
+    const type = this.expected;
+    if (
+      type === "Array<Object>" ||
+      type === "Array" ||
+      type === "Array<{ label: string, value: string }>" ||
+      type === "Array<x:string, y:number>"
+    )
+      return "ARRAY";
+    if (type === "boolean") return "BOOLEAN";
+    if (type === "string") return "STRING";
+    if (type === "number") return "NUMBER";
+    if (type === "object" || type === "JSON") return "OBJECT";
+    if (type === undefined) return "UNKNOWN";
+    return undefined;
+  }
+
   typeToIcon(type: string) {
     let suffix;
     if (type === "?") suffix = "unknown";
@@ -617,4 +715,4 @@ class TernServer {
   }
 }
 
-export default TernServer;
+export default new TernServer();
diff --git a/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.test.ts b/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.test.ts
index 54fd467836..ffcb930046 100644
--- a/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.test.ts
+++ b/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.test.ts
@@ -1,9 +1,10 @@
 import {
   generateTypeDef,
   dataTreeTypeDefCreator,
+  flattenObjKeys,
 } from "utils/autocomplete/dataTreeTypeDefCreator";
 import {
-  DataTree,
+  DataTreeWidget,
   ENTITY_TYPE,
   EvaluationSubstitutionType,
 } from "entities/DataTree/dataTreeFactory";
@@ -12,37 +13,37 @@ import { WidgetTypes } from "../../constants/WidgetConstants";
 
 describe("dataTreeTypeDefCreator", () => {
   it("creates the right def for a widget", () => {
-    const dataTree: DataTree = {
-      Input1: {
-        widgetId: "yolo",
-        widgetName: "Input1",
-        parentId: "123",
-        renderMode: "CANVAS",
-        text: "yo",
-        type: WidgetTypes.INPUT_WIDGET,
-        ENTITY_TYPE: ENTITY_TYPE.WIDGET,
-        parentColumnSpace: 1,
-        parentRowSpace: 2,
-        leftColumn: 2,
-        rightColumn: 3,
-        topRow: 1,
-        bottomRow: 2,
-        isLoading: false,
-        version: 1,
-        bindingPaths: {
-          defaultText: EvaluationSubstitutionType.TEMPLATE,
-        },
-        triggerPaths: {
-          onTextChange: true,
-        },
-        validationPaths: {},
+    const dataTreeEntity: DataTreeWidget = {
+      widgetId: "yolo",
+      widgetName: "Input1",
+      parentId: "123",
+      renderMode: "CANVAS",
+      text: "yo",
+      type: WidgetTypes.INPUT_WIDGET,
+      ENTITY_TYPE: ENTITY_TYPE.WIDGET,
+      parentColumnSpace: 1,
+      parentRowSpace: 2,
+      leftColumn: 2,
+      rightColumn: 3,
+      topRow: 1,
+      bottomRow: 2,
+      isLoading: false,
+      version: 1,
+      bindingPaths: {
+        defaultText: EvaluationSubstitutionType.TEMPLATE,
       },
+      triggerPaths: {
+        onTextChange: true,
+      },
+      validationPaths: {},
+      logBlackList: {},
     };
-    const def = dataTreeTypeDefCreator(dataTree);
+    const { def } = dataTreeTypeDefCreator(dataTreeEntity, "Input1");
     // TODO hetu: needs better general testing
     // instead of testing each widget maybe we can test to ensure
     // that defs are in a correct format
     expect(def.Input1).toBe(entityDefinitions.INPUT_WIDGET);
+    expect(def).toHaveProperty("Input1.isDisabled");
   });
 
   it("creates a correct def for an object", () => {
@@ -70,4 +71,27 @@ describe("dataTreeTypeDefCreator", () => {
     const objType = generateTypeDef(obj);
     expect(objType).toStrictEqual(expected);
   });
+
+  it("flatten object", () => {
+    const options = {
+      someNumber: "number",
+      someString: "string",
+      someBool: "bool",
+      nested: {
+        someExtraNested: "string",
+      },
+    };
+
+    const expected = {
+      "entity1.someNumber": "number",
+      "entity1.someString": "string",
+      "entity1.someBool": "bool",
+      "entity1.nested": {
+        someExtraNested: "string",
+      },
+    };
+
+    const value = flattenObjKeys(options, "entity1");
+    expect(value).toStrictEqual(expected);
+  });
 });
diff --git a/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts b/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts
index d25261fc33..ddb586b78e 100644
--- a/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts
+++ b/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts
@@ -1,44 +1,58 @@
-import { DataTree, ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { DataTreeEntity, ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
 import _ from "lodash";
 import { generateReactKey } from "utils/generators";
-import {
-  entityDefinitions,
-  GLOBAL_DEFS,
-  GLOBAL_FUNCTIONS,
-} from "utils/autocomplete/EntityDefinitions";
+import { entityDefinitions } from "utils/autocomplete/EntityDefinitions";
 import { getType, Types } from "utils/TypeHelpers";
+import { Def } from "tern";
 
 let extraDefs: any = {};
+const skipProperties = ["!doc", "!url", "!type"];
 
-export const dataTreeTypeDefCreator = (dataTree: DataTree) => {
+export const dataTreeTypeDefCreator = (
+  entity: DataTreeEntity,
+  entityName: string,
+): { def: Def; name: string } => {
+  const defName = `DATA_TREE_${entityName}`;
   const def: any = {
-    "!name": "dataTree",
+    "!name": defName,
   };
-  Object.keys(dataTree).forEach((entityName) => {
-    const entity = dataTree[entityName];
-    if (entity && "ENTITY_TYPE" in entity) {
-      if (entity.ENTITY_TYPE === ENTITY_TYPE.WIDGET) {
-        const widgetType = entity.type;
-        if (widgetType in entityDefinitions) {
-          const definition = _.get(entityDefinitions, widgetType);
-          if (_.isFunction(definition)) {
-            def[entityName] = definition(entity);
-          } else {
-            def[entityName] = definition;
+  if (entity && "ENTITY_TYPE" in entity) {
+    if (entity.ENTITY_TYPE === ENTITY_TYPE.WIDGET) {
+      const widgetType = entity.type;
+      if (widgetType in entityDefinitions) {
+        const definition = _.get(entityDefinitions, widgetType);
+        if (_.isFunction(definition)) {
+          const data = definition(entity);
+          const allData = flattenObjKeys(data, entityName);
+          for (const [key, value] of Object.entries(allData)) {
+            def[key] = value;
+          }
+          def[entityName] = definition(entity);
+        } else {
+          def[entityName] = definition;
+          const allFlattenData = flattenObjKeys(definition, entityName);
+          for (const [key, value] of Object.entries(allFlattenData)) {
+            def[key] = value;
           }
         }
       }
-      if (entity.ENTITY_TYPE === ENTITY_TYPE.ACTION) {
-        def[entityName] = entityDefinitions.ACTION(entity);
-      }
-      if (entity.ENTITY_TYPE === ENTITY_TYPE.APPSMITH) {
-        def.appsmith = generateTypeDef(_.omit(entity, "ENTITY_TYPE"));
+    }
+    if (entity.ENTITY_TYPE === ENTITY_TYPE.ACTION) {
+      const actionDefs = entityDefinitions.ACTION(entity);
+      def[entityName] = actionDefs;
+      const finalData = flattenObjKeys(actionDefs, entityName);
+      for (const [key, value] of Object.entries(finalData)) {
+        def[key] = value;
       }
     }
-  });
-  def["!define"] = { ...GLOBAL_DEFS, ...extraDefs };
+    if (entity.ENTITY_TYPE === ENTITY_TYPE.APPSMITH) {
+      const options: any = generateTypeDef(_.omit(entity, "ENTITY_TYPE"));
+      def.appsmith = options;
+    }
+  }
+  def["!define"] = { ...extraDefs };
   extraDefs = {};
-  return { ...def, ...GLOBAL_FUNCTIONS };
+  return { def, name: defName };
 };
 
 export function generateTypeDef(
@@ -72,3 +86,17 @@ export function generateTypeDef(
       return "?";
   }
 }
+
+export const flattenObjKeys = (
+  options: any,
+  parentKey: string,
+  results: any = {},
+): any => {
+  const r: any = results;
+  for (const [key, value] of Object.entries(options)) {
+    if (!skipProperties.includes(key)) {
+      r[parentKey + "." + key] = value;
+    }
+  }
+  return r;
+};
diff --git a/app/client/src/utils/helpers.test.ts b/app/client/src/utils/helpers.test.ts
new file mode 100644
index 0000000000..b9a613979c
--- /dev/null
+++ b/app/client/src/utils/helpers.test.ts
@@ -0,0 +1,86 @@
+import { flattenObject } from "./helpers";
+
+describe("flattenObject test", () => {
+  it("Check if non nested object is returned correctly", () => {
+    const testObject = {
+      isVisible: true,
+      isDisabled: false,
+      tableData: false,
+    };
+
+    expect(flattenObject(testObject)).toStrictEqual(testObject);
+  });
+
+  it("Check if nested objects are returned correctly", () => {
+    const tests = [
+      {
+        input: {
+          isVisible: true,
+          isDisabled: false,
+          tableData: false,
+          settings: {
+            color: [
+              {
+                headers: {
+                  left: true,
+                },
+              },
+            ],
+          },
+        },
+        output: {
+          isVisible: true,
+          isDisabled: false,
+          tableData: false,
+          "settings.color[0].headers.left": true,
+        },
+      },
+      {
+        input: {
+          isVisible: true,
+          isDisabled: false,
+          tableData: false,
+          settings: {
+            color: true,
+          },
+        },
+        output: {
+          isVisible: true,
+          isDisabled: false,
+          tableData: false,
+          "settings.color": true,
+        },
+      },
+      {
+        input: {
+          numbers: [1, 2, 3],
+          color: { header: "red" },
+        },
+        output: {
+          "numbers[0]": 1,
+          "numbers[1]": 2,
+          "numbers[2]": 3,
+          "color.header": "red",
+        },
+      },
+      {
+        input: {
+          name: null,
+          color: { header: {} },
+          users: {
+            id: undefined,
+          },
+        },
+        output: {
+          "color.header": {},
+          name: null,
+          "users.id": undefined,
+        },
+      },
+    ];
+
+    tests.map((test) =>
+      expect(flattenObject(test.input)).toStrictEqual(test.output),
+    );
+  });
+});
diff --git a/app/client/src/utils/helpers.tsx b/app/client/src/utils/helpers.tsx
index 6a9f52bf05..0fcb865c34 100644
--- a/app/client/src/utils/helpers.tsx
+++ b/app/client/src/utils/helpers.tsx
@@ -7,6 +7,8 @@ import {
   JAVASCRIPT_KEYWORDS,
 } from "constants/WidgetValidation";
 import { GLOBAL_FUNCTIONS } from "./autocomplete/EntityDefinitions";
+import { set } from "lodash";
+
 export const snapToGrid = (
   columnWidth: number,
   rowHeight: number,
@@ -110,11 +112,13 @@ export const flashElementById = (id: string) => {
 };
 
 export const resolveAsSpaceChar = (value: string, limit?: number) => {
-  const separatorRegex = /[^\w\s]/;
+  // ensures that all special characters are disallowed
+  // while allowing all utf-8 characters
+  const removeSpecialCharsRegex = /`|\~|\!|\@|\#|\$|\%|\^|\&|\*|\(|\)|\+|\=|\[|\{|\]|\}|\||\\|\'|\<|\,|\.|\>|\?|\/|\""|\;|\:|\s/;
   const duplicateSpaceRegex = /\s+/;
   return value
-    .split(separatorRegex)
-    .join("")
+    .split(removeSpecialCharsRegex)
+    .join(" ")
     .split(duplicateSpaceRegex)
     .join(" ")
     .slice(0, limit || 30);
@@ -287,3 +291,44 @@ export const scrollbarWidth = () => {
   document.body.removeChild(scrollDiv);
   return scrollbarWidth;
 };
+
+// Flatten object
+// From { isValid: false, settings: { color: false}}
+// To { isValid: false, settings.color: false}
+export const flattenObject = (data: Record<string, any>) => {
+  const result: Record<string, any> = {};
+  function recurse(cur: any, prop: any) {
+    if (Object(cur) !== cur) {
+      result[prop] = cur;
+    } else if (Array.isArray(cur)) {
+      for (let i = 0, l = cur.length; i < l; i++)
+        recurse(cur[i], prop + "[" + i + "]");
+      if (cur.length == 0) result[prop] = [];
+    } else {
+      let isEmpty = true;
+      for (const p in cur) {
+        isEmpty = false;
+        recurse(cur[p], prop ? prop + "." + p : p);
+      }
+      if (isEmpty && prop) result[prop] = {};
+    }
+  }
+  recurse(data, "");
+  return result;
+};
+
+/**
+ * renames key in object
+ *
+ * @param object
+ * @param key
+ * @param newKey
+ * @returns
+ */
+export const renameKeyInObject = (object: any, key: string, newKey: string) => {
+  if (object[key]) {
+    set(object, newKey, object[key]);
+  }
+
+  return object;
+};
diff --git a/app/client/src/utils/hooks/dragResizeHooks.tsx b/app/client/src/utils/hooks/dragResizeHooks.tsx
index f31ff28353..65039ba628 100644
--- a/app/client/src/utils/hooks/dragResizeHooks.tsx
+++ b/app/client/src/utils/hooks/dragResizeHooks.tsx
@@ -1,12 +1,17 @@
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { ReduxActionTypes } from "constants/ReduxActionConstants";
-import { focusWidget, selectWidget } from "actions/widgetActions";
 import { useCallback, useEffect, useState } from "react";
+import { commentModeSelector } from "selectors/commentsSelectors";
 
 export const useShowPropertyPane = () => {
   const dispatch = useDispatch();
+  const isCommentMode = useSelector(commentModeSelector);
+
   return useCallback(
     (widgetId?: string, callForDragOrResize?: boolean, force = false) => {
+      // Don't show property pane in comment mode
+      if (isCommentMode) return;
+
       dispatch(
         // If widgetId is not provided, we don't show the property pane.
         // However, if callForDragOrResize is provided, it will be a start or end of a drag or resize action
@@ -22,7 +27,7 @@ export const useShowPropertyPane = () => {
         },
       );
     },
-    [dispatch],
+    [dispatch, isCommentMode],
   );
 };
 
@@ -59,22 +64,6 @@ export const useCanvasSnapRowsUpdateHook = () => {
   return updateCanvasSnapRows;
 };
 
-export const useWidgetSelection = () => {
-  const dispatch = useDispatch();
-  return {
-    selectWidget: useCallback(
-      (widgetId?: string) => {
-        dispatch(selectWidget(widgetId));
-      },
-      [dispatch],
-    ),
-    focusWidget: useCallback(
-      (widgetId?: string) => dispatch(focusWidget(widgetId)),
-      [dispatch],
-    ),
-  };
-};
-
 export const useWidgetDragResize = () => {
   const dispatch = useDispatch();
   return {
diff --git a/app/client/src/utils/hooks/useCanvasMinHeightUpdateHook.ts b/app/client/src/utils/hooks/useCanvasMinHeightUpdateHook.ts
new file mode 100644
index 0000000000..c478ff9b25
--- /dev/null
+++ b/app/client/src/utils/hooks/useCanvasMinHeightUpdateHook.ts
@@ -0,0 +1,37 @@
+import { updateWidget } from "actions/pageActions";
+import {
+  MAIN_CONTAINER_WIDGET_ID,
+  WidgetTypes,
+} from "constants/WidgetConstants";
+import { useEffect } from "react";
+import { useDispatch } from "react-redux";
+import { AppState } from "reducers";
+import { APP_MODE } from "reducers/entityReducers/appReducer";
+import { getWidget } from "sagas/selectors";
+import { getAppMode } from "selectors/applicationSelectors";
+import { useSelector } from "store";
+import { WidgetOperations } from "widgets/BaseWidget";
+
+export const useCanvasMinHeightUpdateHook = (
+  widgetId: string,
+  minHeight = 0,
+) => {
+  const widget = useSelector((state: AppState) => getWidget(state, widgetId));
+  const dispatch = useDispatch();
+  const appMode = useSelector(getAppMode);
+  const canUpdateWidgetMinHeight =
+    appMode === APP_MODE.EDIT &&
+    widgetId !== MAIN_CONTAINER_WIDGET_ID &&
+    widget &&
+    widget.type === WidgetTypes.CANVAS_WIDGET;
+  useEffect(() => {
+    if (canUpdateWidgetMinHeight && widget.minHeight !== minHeight) {
+      dispatch(
+        updateWidget(WidgetOperations.UPDATE_PROPERTY, widgetId, {
+          propertyPath: "minHeight",
+          propertyValue: minHeight,
+        }),
+      );
+    }
+  }, [minHeight]);
+};
diff --git a/app/client/src/utils/hooks/useClickOpenPropPane.tsx b/app/client/src/utils/hooks/useClickOpenPropPane.tsx
index 2697d0c145..0b05f4b747 100644
--- a/app/client/src/utils/hooks/useClickOpenPropPane.tsx
+++ b/app/client/src/utils/hooks/useClickOpenPropPane.tsx
@@ -1,19 +1,61 @@
+import { get } from "lodash";
 import { useShowPropertyPane } from "utils/hooks/dragResizeHooks";
-import { selectWidget } from "actions/widgetActions";
 import {
   getCurrentWidgetId,
   getIsPropertyPaneVisible,
 } from "selectors/propertyPaneSelectors";
+import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
 import { useSelector } from "store";
 import { AppState } from "reducers";
+import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import { APP_MODE } from "reducers/entityReducers/appReducer";
 import { getAppMode } from "selectors/applicationSelectors";
+import { getWidgets } from "sagas/selectors";
+import { useWidgetSelection } from "./useWidgetSelection";
+
+/**
+ *
+ * @param widgetId
+ * @param widgets
+ * @returns
+ */
+export function getParentToOpenIfAny(
+  widgetId: string | undefined,
+  widgets: CanvasWidgetsReduxState,
+) {
+  if (widgetId) {
+    let widget = get(widgets, widgetId, undefined);
+
+    // While this widget has a openParentPropertyPane equql to true
+    while (widget?.openParentPropertyPane) {
+      // Get parent widget props
+      const parent = get(widgets, `${widget.parentId}`, undefined);
+
+      // If parent has openParentPropertyPane = false, return the currnet parent
+      if (!parent?.openParentPropertyPane) {
+        return parent;
+      }
+
+      if (parent?.parentId && parent.parentId !== MAIN_CONTAINER_WIDGET_ID) {
+        widget = get(widgets, `${widget.parentId}`, undefined);
+
+        continue;
+      }
+    }
+
+    return widget;
+  }
+
+  return;
+}
 
 export const useClickOpenPropPane = () => {
   const showPropertyPane = useShowPropertyPane();
+  const { focusWidget, selectWidget } = useWidgetSelection();
   const isPropPaneVisible = useSelector(getIsPropertyPaneVisible);
+  const widgets: CanvasWidgetsReduxState = useSelector(getWidgets);
   const selectedWidgetId = useSelector(getCurrentWidgetId);
-  const focusedWidget = useSelector(
+  const focusedWidgetId = useSelector(
     (state: AppState) => state.ui.widgetDragResize.focusedWidget,
   );
   // This state tells us whether a `ResizableComponent` is resizing
@@ -26,15 +68,37 @@ export const useClickOpenPropPane = () => {
   const isDragging = useSelector(
     (state: AppState) => state.ui.widgetDragResize.isDragging,
   );
-  const openPropertyPane = () => {
+
+  const parentWidgetToOpen = getParentToOpenIfAny(focusedWidgetId, widgets);
+  const openPropertyPane = (e: any, targetWidgetId: string) => {
     // ignore click captures if the component was resizing or dragging coz it is handled internally in draggable component
-    if (isResizing || isDragging || appMode !== APP_MODE.EDIT) return;
     if (
-      (!isPropPaneVisible && selectedWidgetId === focusedWidget) ||
-      selectedWidgetId !== focusedWidget
+      isResizing ||
+      isDragging ||
+      appMode !== APP_MODE.EDIT ||
+      targetWidgetId !== focusedWidgetId
+    )
+      return;
+    if (
+      (!isPropPaneVisible && selectedWidgetId === focusedWidgetId) ||
+      selectedWidgetId !== focusedWidgetId
     ) {
-      selectWidget(focusedWidget);
-      showPropertyPane(focusedWidget, undefined, true);
+      const isMultiSelect = e.metaKey || e.ctrlKey || e.shiftKey;
+
+      if (parentWidgetToOpen) {
+        selectWidget(parentWidgetToOpen.widgetId, isMultiSelect);
+        focusWidget(parentWidgetToOpen.widgetId);
+        !isMultiSelect &&
+          showPropertyPane(parentWidgetToOpen.widgetId, undefined, true);
+      } else {
+        selectWidget(focusedWidgetId, isMultiSelect);
+        focusWidget(focusedWidgetId);
+        !isMultiSelect && showPropertyPane(focusedWidgetId, undefined, true);
+      }
+
+      if (isMultiSelect) {
+        e.stopPropagation();
+      }
     }
   };
   return openPropertyPane;
diff --git a/app/client/src/utils/hooks/useDynamicAppLayout.tsx b/app/client/src/utils/hooks/useDynamicAppLayout.tsx
index 490dfe2849..2330f7453c 100644
--- a/app/client/src/utils/hooks/useDynamicAppLayout.tsx
+++ b/app/client/src/utils/hooks/useDynamicAppLayout.tsx
@@ -20,7 +20,7 @@ import { calculateDynamicHeight } from "utils/WidgetPropsUtils";
 import { useWindowSizeHooks } from "./dragResizeHooks";
 
 export const useDynamicAppLayout = () => {
-  const { width: screenWidth, height: screenHeight } = useWindowSizeHooks();
+  const { height: screenHeight, width: screenWidth } = useWindowSizeHooks();
   const mainContainer = useSelector((state: AppState) =>
     getWidget(state, MAIN_CONTAINER_WIDGET_ID),
   );
diff --git a/app/client/src/utils/hooks/useIsScrolledToBottom.tsx b/app/client/src/utils/hooks/useIsScrolledToBottom.tsx
index 61e5f6a3cd..7c102538e3 100644
--- a/app/client/src/utils/hooks/useIsScrolledToBottom.tsx
+++ b/app/client/src/utils/hooks/useIsScrolledToBottom.tsx
@@ -10,7 +10,8 @@ const useIsScrolledToBottom = (
   const [isScrolledToBottom, setIsScrolledToBottom] = useState(false);
   useEffect(() => {
     const calculateIsScrolledToBottom = (e: any) => {
-      const { scrollHeight, offsetHeight, scrollTop } = e.target;
+      if (!e.target) return;
+      const { offsetHeight, scrollHeight, scrollTop } = e.target;
       setIsScrolledToBottom(scrollHeight - (offsetHeight + scrollTop) < 10);
     };
 
diff --git a/app/client/src/utils/hooks/useProceedToNextTourStep.tsx b/app/client/src/utils/hooks/useProceedToNextTourStep.tsx
new file mode 100644
index 0000000000..4d024c9bed
--- /dev/null
+++ b/app/client/src/utils/hooks/useProceedToNextTourStep.tsx
@@ -0,0 +1,22 @@
+import { TourType } from "entities/Tour";
+import { useDispatch, useSelector } from "react-redux";
+import { AppState } from "reducers";
+import { getActiveTourIndex, getActiveTourType } from "selectors/tourSelectors";
+import { proceedToNextTourStep } from "actions/tourActions";
+
+const useProceedToNextTourStep = (tourType: TourType, tourIndex: number) => {
+  const dispatch = useDispatch();
+
+  const isCurrentStepActive = useSelector(
+    (state: AppState) => getActiveTourIndex(state) === tourIndex,
+  );
+  const isCurrentTourActive = useSelector(
+    (state: AppState) => getActiveTourType(state) === tourType,
+  );
+
+  const isActive = isCurrentStepActive && isCurrentTourActive;
+
+  return () => isActive && dispatch(proceedToNextTourStep());
+};
+
+export default useProceedToNextTourStep;
diff --git a/app/client/src/utils/hooks/useResizeObserver.tsx b/app/client/src/utils/hooks/useResizeObserver.tsx
new file mode 100644
index 0000000000..e1572619cb
--- /dev/null
+++ b/app/client/src/utils/hooks/useResizeObserver.tsx
@@ -0,0 +1,19 @@
+import { useEffect } from "react";
+
+const useResizeObserver = (
+  ref: HTMLDivElement | null,
+  callback: (entries: any) => void,
+) => {
+  useEffect(() => {
+    if (ref) {
+      const resizeObserver = new ResizeObserver((entries: any) => {
+        callback(entries);
+      });
+      resizeObserver.observe(ref);
+
+      return () => resizeObserver.unobserve(ref);
+    }
+  }, [ref, callback]);
+};
+
+export default useResizeObserver;
diff --git a/app/client/src/utils/hooks/useWidgetSelection.ts b/app/client/src/utils/hooks/useWidgetSelection.ts
new file mode 100644
index 0000000000..2ac6c1d361
--- /dev/null
+++ b/app/client/src/utils/hooks/useWidgetSelection.ts
@@ -0,0 +1,36 @@
+import { useDispatch } from "react-redux";
+import { focusWidget } from "actions/widgetActions";
+import {
+  selectMultipleWidgetsAction,
+  selectWidgetInitAction,
+  shiftSelectWidgetsEntityExplorerInitAction,
+} from "actions/widgetSelectionActions";
+
+import { useCallback } from "react";
+
+export const useWidgetSelection = () => {
+  const dispatch = useDispatch();
+  return {
+    selectWidget: useCallback(
+      (widgetId?: string, isMultiSelect?: boolean) => {
+        dispatch(selectWidgetInitAction(widgetId, isMultiSelect));
+      },
+      [dispatch],
+    ),
+    shiftSelectWidgetEntityExplorer: useCallback(
+      (widgetId: string, siblingWidgets: string[]) => {
+        dispatch(
+          shiftSelectWidgetsEntityExplorerInitAction(widgetId, siblingWidgets),
+        );
+      },
+      [dispatch],
+    ),
+    focusWidget: useCallback(
+      (widgetId?: string) => dispatch(focusWidget(widgetId)),
+      [dispatch],
+    ),
+    deselectAll: useCallback(() => dispatch(selectMultipleWidgetsAction([])), [
+      dispatch,
+    ]),
+  };
+};
diff --git a/app/client/src/utils/migrations/TableWidget.test.ts b/app/client/src/utils/migrations/TableWidget.test.ts
index 5715074956..e4e4bde2f3 100644
--- a/app/client/src/utils/migrations/TableWidget.test.ts
+++ b/app/client/src/utils/migrations/TableWidget.test.ts
@@ -1,6 +1,10 @@
 import { WidgetProps } from "widgets/BaseWidget";
 import { ContainerWidgetProps } from "widgets/ContainerWidget";
-import { tableWidgetPropertyPaneMigrations } from "./TableWidget";
+import {
+  tableWidgetPropertyPaneMigrations,
+  migrateTableWidgetParentRowSpaceProperty,
+  migrateTableWidgetHeaderVisibilityProperties,
+} from "./TableWidget";
 
 const input1: ContainerWidgetProps<WidgetProps> = {
   widgetName: "MainContainer",
@@ -639,4 +643,563 @@ describe("Table Widget Property Pane Upgrade", () => {
     const newDsl = tableWidgetPropertyPaneMigrations(input3);
     expect(JSON.stringify(newDsl) === JSON.stringify(output3));
   });
+
+  it("To test table parentRowSpace is updated", () => {
+    const inputDsl: ContainerWidgetProps<WidgetProps> = {
+      widgetName: "MainContainer",
+      backgroundColor: "none",
+      rightColumn: 1224,
+      snapColumns: 16,
+      detachFromLayout: true,
+      widgetId: "0",
+      topRow: 0,
+      bottomRow: 1840,
+      containerStyle: "none",
+      snapRows: 33,
+      parentRowSpace: 1,
+      type: "CANVAS_WIDGET",
+      canExtend: true,
+      version: 7,
+      minHeight: 1292,
+      parentColumnSpace: 1,
+      dynamicBindingPathList: [],
+      leftColumn: 0,
+      isLoading: false,
+      parentId: "",
+      renderMode: "CANVAS",
+      children: [
+        {
+          isVisible: true,
+          label: "Data",
+          widgetName: "Table1",
+          searchKey: "",
+          tableData:
+            '[\n  {\n    "id": 2381224,\n    "email": "michael.lawson@reqres.in",\n    "userName": "Michael Lawson",\n    "productName": "Chicken Sandwich",\n    "orderAmount": 4.99\n  },\n  {\n    "id": 2736212,\n    "email": "lindsay.ferguson@reqres.in",\n    "userName": "Lindsay Ferguson",\n    "productName": "Tuna Salad",\n    "orderAmount": 9.99\n  },\n  {\n    "id": 6788734,\n    "email": "tobias.funke@reqres.in",\n    "userName": "Tobias Funke",\n    "productName": "Beef steak",\n    "orderAmount": 19.99\n  }\n]',
+          type: "TABLE_WIDGET",
+          isLoading: false,
+          parentColumnSpace: 74,
+          parentRowSpace: 40,
+          leftColumn: 0,
+          rightColumn: 8,
+          topRow: 19,
+          bottomRow: 26,
+          parentId: "0",
+          widgetId: "fs785w9gcy",
+          dynamicBindingPathList: [],
+          primaryColumns: {
+            id: {
+              index: 0,
+              width: 150,
+              id: "id",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "id",
+              computedValue: "",
+            },
+            email: {
+              index: 1,
+              width: 150,
+              id: "email",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "email",
+              computedValue: "",
+            },
+            userName: {
+              index: 2,
+              width: 150,
+              id: "userName",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "userName",
+              computedValue: "",
+            },
+            productName: {
+              index: 3,
+              width: 150,
+              id: "productName",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "productName",
+              computedValue: "",
+            },
+            orderAmount: {
+              index: 4,
+              width: 150,
+              id: "orderAmount",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "orderAmount",
+              computedValue: "",
+            },
+          },
+          textSize: "PARAGRAPH",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          renderMode: "CANVAS",
+          version: 1,
+        },
+      ],
+    };
+    const outputDsl: ContainerWidgetProps<WidgetProps> = {
+      widgetName: "MainContainer",
+      backgroundColor: "none",
+      rightColumn: 1224,
+      snapColumns: 16,
+      detachFromLayout: true,
+      widgetId: "0",
+      topRow: 0,
+      bottomRow: 1840,
+      containerStyle: "none",
+      snapRows: 33,
+      parentRowSpace: 1,
+      type: "CANVAS_WIDGET",
+      canExtend: true,
+      version: 7,
+      minHeight: 1292,
+      parentColumnSpace: 1,
+      dynamicBindingPathList: [],
+      leftColumn: 0,
+      isLoading: false,
+      parentId: "",
+      renderMode: "CANVAS",
+      children: [
+        {
+          isVisible: true,
+          label: "Data",
+          widgetName: "Table1",
+          searchKey: "",
+          tableData:
+            '[\n  {\n    "id": 2381224,\n    "email": "michael.lawson@reqres.in",\n    "userName": "Michael Lawson",\n    "productName": "Chicken Sandwich",\n    "orderAmount": 4.99\n  },\n  {\n    "id": 2736212,\n    "email": "lindsay.ferguson@reqres.in",\n    "userName": "Lindsay Ferguson",\n    "productName": "Tuna Salad",\n    "orderAmount": 9.99\n  },\n  {\n    "id": 6788734,\n    "email": "tobias.funke@reqres.in",\n    "userName": "Tobias Funke",\n    "productName": "Beef steak",\n    "orderAmount": 19.99\n  }\n]',
+          type: "TABLE_WIDGET",
+          isLoading: false,
+          parentColumnSpace: 74,
+          parentRowSpace: 10,
+          leftColumn: 0,
+          rightColumn: 8,
+          topRow: 19,
+          bottomRow: 26,
+          parentId: "0",
+          widgetId: "fs785w9gcy",
+          dynamicBindingPathList: [],
+          primaryColumns: {
+            id: {
+              index: 0,
+              width: 150,
+              id: "id",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "id",
+              computedValue: "",
+            },
+            email: {
+              index: 1,
+              width: 150,
+              id: "email",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "email",
+              computedValue: "",
+            },
+            userName: {
+              index: 2,
+              width: 150,
+              id: "userName",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "userName",
+              computedValue: "",
+            },
+            productName: {
+              index: 3,
+              width: 150,
+              id: "productName",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "productName",
+              computedValue: "",
+            },
+            orderAmount: {
+              index: 4,
+              width: 150,
+              id: "orderAmount",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "orderAmount",
+              computedValue: "",
+            },
+          },
+          textSize: "PARAGRAPH",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          renderMode: "CANVAS",
+          version: 1,
+        },
+      ],
+    };
+    const newDsl = migrateTableWidgetParentRowSpaceProperty(inputDsl);
+    expect(JSON.stringify(newDsl) === JSON.stringify(outputDsl));
+  });
+
+  it("TableWidget : should update header options visibilities", () => {
+    const inputDsl: ContainerWidgetProps<WidgetProps> = {
+      widgetName: "MainContainer",
+      backgroundColor: "none",
+      rightColumn: 1224,
+      snapColumns: 16,
+      detachFromLayout: true,
+      widgetId: "0",
+      topRow: 0,
+      bottomRow: 1840,
+      containerStyle: "none",
+      snapRows: 33,
+      parentRowSpace: 1,
+      type: "CANVAS_WIDGET",
+      canExtend: true,
+      version: 7,
+      minHeight: 1292,
+      parentColumnSpace: 1,
+      dynamicBindingPathList: [],
+      leftColumn: 0,
+      isLoading: false,
+      parentId: "",
+      renderMode: "CANVAS",
+      children: [
+        {
+          isVisible: true,
+          label: "Data",
+          widgetName: "Table1",
+          searchKey: "",
+          tableData:
+            '[\n  {\n    "id": 2381224,\n    "email": "michael.lawson@reqres.in",\n    "userName": "Michael Lawson",\n    "productName": "Chicken Sandwich",\n    "orderAmount": 4.99\n  },\n  {\n    "id": 2736212,\n    "email": "lindsay.ferguson@reqres.in",\n    "userName": "Lindsay Ferguson",\n    "productName": "Tuna Salad",\n    "orderAmount": 9.99\n  },\n  {\n    "id": 6788734,\n    "email": "tobias.funke@reqres.in",\n    "userName": "Tobias Funke",\n    "productName": "Beef steak",\n    "orderAmount": 19.99\n  }\n]',
+          type: "TABLE_WIDGET",
+          isLoading: false,
+          parentColumnSpace: 74,
+          parentRowSpace: 40,
+          leftColumn: 0,
+          rightColumn: 8,
+          topRow: 19,
+          bottomRow: 26,
+          parentId: "0",
+          widgetId: "fs785w9gcy",
+          dynamicBindingPathList: [],
+          primaryColumns: {
+            id: {
+              index: 0,
+              width: 150,
+              id: "id",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "id",
+              computedValue: "",
+            },
+            email: {
+              index: 1,
+              width: 150,
+              id: "email",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "email",
+              computedValue: "",
+            },
+            userName: {
+              index: 2,
+              width: 150,
+              id: "userName",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "userName",
+              computedValue: "",
+            },
+            productName: {
+              index: 3,
+              width: 150,
+              id: "productName",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "productName",
+              computedValue: "",
+            },
+            orderAmount: {
+              index: 4,
+              width: 150,
+              id: "orderAmount",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "orderAmount",
+              computedValue: "",
+            },
+          },
+          textSize: "PARAGRAPH",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          renderMode: "CANVAS",
+          version: 1,
+        },
+      ],
+    };
+    const outputDsl: ContainerWidgetProps<WidgetProps> = {
+      widgetName: "MainContainer",
+      backgroundColor: "none",
+      rightColumn: 1224,
+      snapColumns: 16,
+      detachFromLayout: true,
+      widgetId: "0",
+      topRow: 0,
+      bottomRow: 1840,
+      containerStyle: "none",
+      snapRows: 33,
+      parentRowSpace: 1,
+      type: "CANVAS_WIDGET",
+      canExtend: true,
+      version: 7,
+      minHeight: 1292,
+      parentColumnSpace: 1,
+      dynamicBindingPathList: [],
+      leftColumn: 0,
+      isLoading: false,
+      parentId: "",
+      renderMode: "CANVAS",
+      children: [
+        {
+          isVisible: true,
+          label: "Data",
+          widgetName: "Table1",
+          searchKey: "",
+          tableData:
+            '[\n  {\n    "id": 2381224,\n    "email": "michael.lawson@reqres.in",\n    "userName": "Michael Lawson",\n    "productName": "Chicken Sandwich",\n    "orderAmount": 4.99\n  },\n  {\n    "id": 2736212,\n    "email": "lindsay.ferguson@reqres.in",\n    "userName": "Lindsay Ferguson",\n    "productName": "Tuna Salad",\n    "orderAmount": 9.99\n  },\n  {\n    "id": 6788734,\n    "email": "tobias.funke@reqres.in",\n    "userName": "Tobias Funke",\n    "productName": "Beef steak",\n    "orderAmount": 19.99\n  }\n]',
+          type: "TABLE_WIDGET",
+          isLoading: false,
+          parentColumnSpace: 74,
+          parentRowSpace: 10,
+          leftColumn: 0,
+          rightColumn: 8,
+          topRow: 19,
+          bottomRow: 26,
+          parentId: "0",
+          widgetId: "fs785w9gcy",
+          dynamicBindingPathList: [],
+          primaryColumns: {
+            id: {
+              index: 0,
+              width: 150,
+              id: "id",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "id",
+              computedValue: "",
+            },
+            email: {
+              index: 1,
+              width: 150,
+              id: "email",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "email",
+              computedValue: "",
+            },
+            userName: {
+              index: 2,
+              width: 150,
+              id: "userName",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "userName",
+              computedValue: "",
+            },
+            productName: {
+              index: 3,
+              width: 150,
+              id: "productName",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "productName",
+              computedValue: "",
+            },
+            orderAmount: {
+              index: 4,
+              width: 150,
+              id: "orderAmount",
+              horizontalAlignment: "LEFT",
+              verticalAlignment: "CENTER",
+              columnType: "text",
+              textColor: "#231F20",
+              textSize: "PARAGRAPH",
+              fontStyle: "REGULAR",
+              enableFilter: true,
+              enableSort: true,
+              isVisible: true,
+              isDerived: false,
+              label: "orderAmount",
+              computedValue: "",
+            },
+          },
+          textSize: "PARAGRAPH",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          renderMode: "CANVAS",
+          isVisibleSearch: true,
+          isVisibleFilters: true,
+          isVisibleDownload: true,
+          isVisibleCompactMode: true,
+          isVisiblePagination: true,
+          version: 1,
+        },
+      ],
+    };
+    const newDsl = migrateTableWidgetHeaderVisibilityProperties(inputDsl);
+    expect(JSON.stringify(newDsl) === JSON.stringify(outputDsl));
+  });
 });
diff --git a/app/client/src/utils/migrations/TableWidget.ts b/app/client/src/utils/migrations/TableWidget.ts
index 7daddef4de..52b84364b7 100644
--- a/app/client/src/utils/migrations/TableWidget.ts
+++ b/app/client/src/utils/migrations/TableWidget.ts
@@ -4,6 +4,7 @@ import {
   WidgetTypes,
   FontStyleTypes,
   TextSizes,
+  GridDefaults,
 } from "constants/WidgetConstants";
 import { getAllTableColumnKeys } from "components/designSystems/appsmith/TableComponent/TableHelpers";
 import {
@@ -214,3 +215,39 @@ export const migrateTablePrimaryColumnsBindings = (
   });
   return currentDSL;
 };
+
+export const migrateTableWidgetParentRowSpaceProperty = (
+  currentDSL: ContainerWidgetProps<WidgetProps>,
+) => {
+  currentDSL.children = currentDSL.children?.map((child: WidgetProps) => {
+    if (child.type === WidgetTypes.TABLE_WIDGET) {
+      if (child.parentRowSpace === 40) {
+        child.parentRowSpace = GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
+      }
+    } else if (child.children && child.children.length > 0) {
+      child = migrateTableWidgetParentRowSpaceProperty(child);
+    }
+    return child;
+  });
+  return currentDSL;
+};
+
+export const migrateTableWidgetHeaderVisibilityProperties = (
+  currentDSL: ContainerWidgetProps<WidgetProps>,
+) => {
+  currentDSL.children = currentDSL.children?.map((child: WidgetProps) => {
+    if (child.type === WidgetTypes.TABLE_WIDGET) {
+      if (!("isVisibleSearch" in child)) {
+        child.isVisibleSearch = true;
+        child.isVisibleFilters = true;
+        child.isVisibleDownload = true;
+        child.isVisibleCompactMode = true;
+        child.isVisiblePagination = true;
+      }
+    } else if (child.children && child.children.length > 0) {
+      child = migrateTableWidgetHeaderVisibilityProperties(child);
+    }
+    return child;
+  });
+  return currentDSL;
+};
diff --git a/app/client/src/utils/storage.ts b/app/client/src/utils/storage.ts
index 3482ef0e7f..facdb67671 100644
--- a/app/client/src/utils/storage.ts
+++ b/app/client/src/utils/storage.ts
@@ -10,6 +10,8 @@ const STORAGE_KEYS: { [id: string]: string } = {
   ONBOARDING_STATE: "OnboardingState",
   ONBOARDING_WELCOME_STATE: "OnboardingWelcomeState",
   RECENT_ENTITIES: "RecentEntities",
+  COMMENTS_INTRO_SEEN: "CommentsIntroSeen",
+  ONBOARDING_FORM_IN_PROGRESS: "ONBOARDING_FORM_IN_PROGRESS",
 };
 
 const store = localforage.createInstance({
@@ -120,10 +122,8 @@ export const setOnboardingWelcomeState = async (onboardingState: boolean) => {
     await store.setItem(STORAGE_KEYS.ONBOARDING_WELCOME_STATE, onboardingState);
     return true;
   } catch (error) {
-    console.log(
-      "An error occurred when setting onboarding welcome state: ",
-      error,
-    );
+    log.error("An error occurred when setting onboarding welcome state: ");
+    log.error(error);
     return false;
   }
 };
@@ -135,10 +135,8 @@ export const getOnboardingWelcomeState = async () => {
     );
     return onboardingState;
   } catch (error) {
-    console.log(
-      "An error occurred when getting onboarding welcome state: ",
-      error,
-    );
+    log.error("An error occurred when getting onboarding welcome state: ");
+    log.error(error);
   }
 };
 
@@ -152,7 +150,8 @@ export const setRecentAppEntities = async (entities: any, appId: string) => {
     recentEntities[appId] = entities;
     await store.setItem(STORAGE_KEYS.RECENT_ENTITIES, recentEntities);
   } catch (error) {
-    console.log("An error occurred while saving recent entities", error);
+    log.error("An error occurred while saving recent entities");
+    log.error(error);
   }
 };
 
@@ -163,7 +162,8 @@ export const fetchRecentAppEntities = async (appId: string) => {
     )) as Record<string, any>;
     return (recentEntities && recentEntities[appId]) || [];
   } catch (error) {
-    console.log("An error occurred while fetching recent entities", error);
+    log.error("An error occurred while fetching recent entities");
+    log.error(error);
   }
 };
 
@@ -179,6 +179,53 @@ export const deleteRecentAppEntities = async (appId: string) => {
     }
     await store.setItem(STORAGE_KEYS.RECENT_ENTITIES, recentEntities);
   } catch (error) {
-    console.log("An error occurred while saving recent entities", error);
+    log.error("An error occurred while saving recent entities");
+    log.error(error);
+  }
+};
+
+export const setCommentsIntroSeen = async (flag: boolean) => {
+  try {
+    await store.setItem(STORAGE_KEYS.COMMENTS_INTRO_SEEN, flag);
+    return true;
+  } catch (error) {
+    log.error("An error occurred when setting COMMENTS_INTRO_SEEN");
+    log.error(error);
+    return false;
+  }
+};
+
+export const getCommentsIntroSeen = async () => {
+  try {
+    const commentsIntroSeen = (await store.getItem(
+      STORAGE_KEYS.COMMENTS_INTRO_SEEN,
+    )) as boolean;
+    return commentsIntroSeen;
+  } catch (error) {
+    log.error("An error occurred while fetching COMMENTS_INTRO_SEEN");
+    log.error(error);
+  }
+};
+
+export const setOnboardingFormInProgress = async (flag?: boolean) => {
+  try {
+    await store.setItem(STORAGE_KEYS.ONBOARDING_FORM_IN_PROGRESS, flag);
+    return true;
+  } catch (error) {
+    log.error("An error occurred when setting ONBOARDING_FORM_IN_PROGRESS");
+    log.error(error);
+    return false;
+  }
+};
+
+export const getOnboardingFormInProgress = async () => {
+  try {
+    const onboardingFormInProgress = await store.getItem(
+      STORAGE_KEYS.ONBOARDING_FORM_IN_PROGRESS,
+    );
+    return onboardingFormInProgress;
+  } catch (error) {
+    log.error("An error occurred while fetching ONBOARDING_FORM_IN_PROGRESS");
+    log.error(error);
   }
 };
diff --git a/app/client/src/wdyr.ts b/app/client/src/wdyr.ts
index bbf12c68e6..5323bf79f9 100644
--- a/app/client/src/wdyr.ts
+++ b/app/client/src/wdyr.ts
@@ -1,3 +1,5 @@
+/// <reference types="@welldone-software/why-did-you-render" />
+// ^ https://github.com/welldone-software/why-did-you-render/issues/161
 import React from "react";
 
 if (process.env.NODE_ENV === "development") {
diff --git a/app/client/src/widgets/BaseWidget.tsx b/app/client/src/widgets/BaseWidget.tsx
index baa8de6de3..5c3fe8375d 100644
--- a/app/client/src/widgets/BaseWidget.tsx
+++ b/app/client/src/widgets/BaseWidget.tsx
@@ -4,31 +4,33 @@
  * Widgets are also responsible for dispatching actions and updating the state tree
  */
 import {
-  WidgetType,
+  CONTAINER_GRID_PADDING,
+  CSSUnit,
+  CSSUnits,
+  PositionType,
+  PositionTypes,
   RenderMode,
   RenderModes,
-  CSSUnits,
+  WidgetType,
 } from "constants/WidgetConstants";
 import React, { Component, ReactNode } from "react";
-import {
-  PositionType,
-  CSSUnit,
-  CONTAINER_GRID_PADDING,
-} from "constants/WidgetConstants";
+import { get, memoize } from "lodash";
 import DraggableComponent from "components/editorComponents/DraggableComponent";
 import ResizableComponent from "components/editorComponents/ResizableComponent";
 import { WidgetExecuteActionPayload } from "constants/AppsmithActionConstants/ActionConstants";
 import PositionedContainer from "components/designSystems/appsmith/PositionedContainer";
 import WidgetNameComponent from "components/editorComponents/WidgetNameComponent";
 import shallowequal from "shallowequal";
-import { PositionTypes } from "constants/WidgetConstants";
 import { EditorContext } from "components/editorComponents/EditorContextProvider";
 import ErrorBoundary from "components/editorComponents/ErrorBoundry";
 import { DerivedPropertiesMap } from "utils/WidgetFactory";
 import {
+  DataTreeEvaluationProps,
+  EVAL_ERROR_PATH,
+  EvaluationError,
+  PropertyEvaluationErrorType,
   WidgetDynamicPathListProps,
-  WidgetEvaluatedProps,
-} from "../utils/DynamicBindingUtils";
+} from "utils/DynamicBindingUtils";
 import { PropertyPaneConfig } from "constants/PropertyControlConstants";
 import { BatchPropertyUpdatePayload } from "actions/controlActions";
 import OverlayCommentsWrapper from "comments/inlineComments/OverlayCommentsWrapper";
@@ -63,7 +65,7 @@ abstract class BaseWidget<
     return {};
   }
 
-  static getDefaultPropertiesMap(): Record<string, string> {
+  static getDefaultPropertiesMap(): Record<string, any> {
     return {};
   }
   // TODO Find a way to enforce this, (dont let it be set)
@@ -176,6 +178,16 @@ abstract class BaseWidget<
     };
   }
 
+  getErrorCount = memoize((evalErrors: Record<string, EvaluationError[]>) => {
+    return Object.values(evalErrors).reduce(
+      (prev, curr) =>
+        curr.filter(
+          (error) => error.errorType !== PropertyEvaluationErrorType.LINT,
+        ).length + prev,
+      0,
+    );
+  }, JSON.stringify);
+
   render() {
     return this.getWidgetView();
   }
@@ -209,8 +221,12 @@ abstract class BaseWidget<
       <>
         {!this.props.disablePropertyPane && (
           <WidgetNameComponent
+            errorCount={this.getErrorCount(
+              get(this.props, EVAL_ERROR_PATH, {}),
+            )}
             parentId={this.props.parentId}
             showControls={showControls}
+            topRow={this.props.detachFromLayout ? 4 : this.props.topRow}
             type={this.props.type}
             widgetId={this.props.widgetId}
             widgetName={this.props.widgetName}
@@ -235,6 +251,9 @@ abstract class BaseWidget<
     const style = this.getPositionStyle();
     return (
       <PositionedContainer
+        focused={this.props.focused}
+        resizeDisabled={this.props.resizeDisabled}
+        selected={this.props.selected}
         style={style}
         widgetId={this.props.widgetId}
         widgetType={this.props.type}
@@ -424,6 +443,13 @@ export const WIDGET_STATIC_PROPS = {
   noContainerOffset: false,
 };
 
+export const WIDGET_DISPLAY_PROPS = {
+  isVisible: true,
+  isLoading: true,
+  isDisabled: true,
+  backgroundColor: true,
+};
+
 export interface WidgetDisplayProps {
   //TODO(abhinav): Some of these props are mandatory
   isVisible?: boolean;
@@ -440,7 +466,7 @@ export interface WidgetDataProps
 export interface WidgetProps
   extends WidgetDataProps,
     WidgetDynamicPathListProps,
-    WidgetEvaluatedProps {
+    DataTreeEvaluationProps {
   key?: string;
   isDefaultClickDisabled?: boolean;
   [key: string]: any;
diff --git a/app/client/src/widgets/ButtonWidget.tsx b/app/client/src/widgets/ButtonWidget.tsx
index acabd0b96a..a8446ce7ae 100644
--- a/app/client/src/widgets/ButtonWidget.tsx
+++ b/app/client/src/widgets/ButtonWidget.tsx
@@ -88,6 +88,16 @@ class ButtonWidget extends BaseWidget<ButtonWidgetProps, ButtonWidgetState> {
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.TEXT,
           },
+          {
+            propertyName: "recaptchaV2",
+            label: "Google reCAPTCHA v2",
+            controlType: "SWITCH",
+            helpText: "Use reCAPTCHA v2",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.BOOLEAN,
+          },
         ],
       },
       {
@@ -163,6 +173,7 @@ class ButtonWidget extends BaseWidget<ButtonWidgetProps, ButtonWidgetState> {
         isLoading={this.props.isLoading || this.state.isLoading}
         key={this.props.widgetId}
         onClick={!this.props.isDisabled ? this.onButtonClickBound : undefined}
+        recaptchaV2={this.props.recaptchaV2}
         text={this.props.text}
         type={this.props.buttonType || ButtonType.BUTTON}
         widgetId={this.props.widgetId}
@@ -188,6 +199,7 @@ export interface ButtonWidgetProps extends WidgetProps, WithMeta {
   onClick?: string;
   isDisabled?: boolean;
   isVisible?: boolean;
+  recaptchaV2?: boolean;
   buttonType?: ButtonType;
   googleRecaptchaKey?: string;
 }
diff --git a/app/client/src/widgets/ChartWidget/index.tsx b/app/client/src/widgets/ChartWidget/index.tsx
index 84432435a9..35b981fcd5 100644
--- a/app/client/src/widgets/ChartWidget/index.tsx
+++ b/app/client/src/widgets/ChartWidget/index.tsx
@@ -18,7 +18,7 @@ const ChartComponent = lazy(() =>
 );
 
 class ChartWidget extends BaseWidget<ChartWidgetProps, WidgetState> {
-  static getMetaPropertiesMap(): Record<string, undefined> {
+  static getMetaPropertiesMap(): Record<string, any> {
     return {
       selectedDataPoint: undefined,
     };
@@ -92,7 +92,7 @@ export interface ChartData {
 export interface ChartWidgetProps extends WidgetProps, WithMeta {
   chartType: ChartType;
   chartData: AllChartData;
-  customFusionChartConfig: { config: CustomFusionChartConfig };
+  customFusionChartConfig: CustomFusionChartConfig;
   xAxisName: string;
   yAxisName: string;
   chartName: string;
diff --git a/app/client/src/widgets/ChartWidget/propertyConfig.ts b/app/client/src/widgets/ChartWidget/propertyConfig.ts
index 722788521b..0394059f2b 100644
--- a/app/client/src/widgets/ChartWidget/propertyConfig.ts
+++ b/app/client/src/widgets/ChartWidget/propertyConfig.ts
@@ -1,5 +1,6 @@
 import { ChartWidgetProps } from "widgets/ChartWidget";
 import { VALIDATION_TYPES } from "constants/WidgetValidation";
+import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 
 export default [
   {
@@ -67,8 +68,8 @@ export default [
     children: [
       {
         helpText:
-          "Manually configure a FusionChart, see https://www.fusioncharts.com",
-        placeholderText: `Enter {type: "bar2d","dataSource": {}}`,
+          "Manually configure a FusionChart, see https://docs.appsmith.com/widget-reference/chart#custom-chart",
+        placeholderText: `Enter {"type": "bar2d","dataSource": {}}`,
         propertyName: "customFusionChartConfig",
         label: "Custom Fusion Chart Configuration",
         controlType: "CUSTOM_FUSION_CHARTS_DATA",
@@ -77,6 +78,7 @@ export default [
         validation: VALIDATION_TYPES.CUSTOM_FUSION_CHARTS_DATA,
         hidden: (props: ChartWidgetProps) =>
           props.chartType !== "CUSTOM_FUSION_CHART",
+        evaluationSubstitutionType: EvaluationSubstitutionType.SMART_SUBSTITUTE,
       },
       {
         helpText: "Populates the chart with the data",
@@ -106,6 +108,8 @@ export default [
             isBindProperty: true,
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.CHART_SERIES_DATA,
+            evaluationSubstitutionType:
+              EvaluationSubstitutionType.SMART_SUBSTITUTE,
           },
         ],
       },
diff --git a/app/client/src/widgets/CheckboxWidget.tsx b/app/client/src/widgets/CheckboxWidget.tsx
index 9ed27f3730..8c8c774aed 100644
--- a/app/client/src/widgets/CheckboxWidget.tsx
+++ b/app/client/src/widgets/CheckboxWidget.tsx
@@ -106,7 +106,6 @@ class CheckboxWidget extends BaseWidget<CheckboxWidgetProps, WidgetState> {
   static getDefaultPropertiesMap(): Record<string, string> {
     return {
       isChecked: "defaultCheckedState",
-      alignWidget: "LEFT",
     };
   }
 
diff --git a/app/client/src/widgets/ContainerWidget.tsx b/app/client/src/widgets/ContainerWidget.tsx
index 9bca369c55..39cde40c01 100644
--- a/app/client/src/widgets/ContainerWidget.tsx
+++ b/app/client/src/widgets/ContainerWidget.tsx
@@ -6,6 +6,7 @@ import {
   GridDefaults,
   CONTAINER_GRID_PADDING,
   WIDGET_PADDING,
+  MAIN_CONTAINER_WIDGET_ID,
 } from "constants/WidgetConstants";
 import WidgetFactory from "utils/WidgetFactory";
 import ContainerComponent, {
@@ -14,7 +15,8 @@ import ContainerComponent, {
 import { WidgetType, WidgetTypes } from "constants/WidgetConstants";
 import BaseWidget, { WidgetProps, WidgetState } from "./BaseWidget";
 import { VALIDATION_TYPES } from "constants/WidgetValidation";
-
+import WidgetsMultiSelectBox from "pages/Editor/WidgetsMultiSelectBox";
+import { CanvasSelectionArena } from "pages/common/CanvasSelectionArena";
 class ContainerWidget extends BaseWidget<
   ContainerWidgetProps<WidgetProps>,
   WidgetState
@@ -63,11 +65,21 @@ class ContainerWidget extends BaseWidget<
 
   getSnapSpaces = () => {
     const { componentWidth } = this.getComponentDimensions();
-    const padding = (CONTAINER_GRID_PADDING + WIDGET_PADDING) * 2;
+    // For all widgets inside a container, we remove both container padding as well as widget padding from component width
+    let padding = (CONTAINER_GRID_PADDING + WIDGET_PADDING) * 2;
+    if (
+      this.props.widgetId === MAIN_CONTAINER_WIDGET_ID ||
+      this.props.type === "CONTAINER_WIDGET"
+    ) {
+      //For MainContainer and any Container Widget padding doesn't exist coz there is already container padding.
+      padding = CONTAINER_GRID_PADDING * 2;
+    }
+    if (this.props.noPad) {
+      // Widgets like ListWidget choose to have no container padding so will only have widget padding
+      padding = WIDGET_PADDING * 2;
+    }
     let width = componentWidth;
-    if (!this.props.noPad) width -= padding;
-    else width -= WIDGET_PADDING * 2;
-
+    width -= padding;
     return {
       snapRowSpace: GridDefaults.DEFAULT_GRID_ROW_HEIGHT,
       snapColumnSpace: componentWidth
@@ -82,7 +94,7 @@ class ContainerWidget extends BaseWidget<
       return null;
     }
 
-    const { componentWidth, componentHeight } = this.getComponentDimensions();
+    const { componentHeight, componentWidth } = this.getComponentDimensions();
 
     childWidgetData.rightColumn = componentWidth;
     childWidgetData.bottomRow = this.props.shouldScrollContents
@@ -111,6 +123,13 @@ class ContainerWidget extends BaseWidget<
   renderAsContainerComponent(props: ContainerWidgetProps<WidgetProps>) {
     return (
       <ContainerComponent {...props}>
+        {this.props.widgetId === MAIN_CONTAINER_WIDGET_ID && (
+          <CanvasSelectionArena widgetId={MAIN_CONTAINER_WIDGET_ID} />
+        )}
+        <WidgetsMultiSelectBox
+          widgetId={this.props.widgetId}
+          widgetType={this.props.type}
+        />
         {/* without the wrapping div onClick events are triggered twice */}
         <>{this.renderChildren()}</>
       </ContainerComponent>
diff --git a/app/client/src/widgets/DatePickerWidget2.tsx b/app/client/src/widgets/DatePickerWidget2.tsx
index dabd725dd9..fa5cf0a163 100644
--- a/app/client/src/widgets/DatePickerWidget2.tsx
+++ b/app/client/src/widgets/DatePickerWidget2.tsx
@@ -34,7 +34,7 @@ class DatePickerWidget extends BaseWidget<DatePickerWidget2Props, WidgetState> {
             label: "Date Format",
             controlType: "DROP_DOWN",
             isJSConvertible: true,
-            optionWidth: "320px",
+            optionWidth: "340px",
             options: [
               {
                 label: moment().format("YYYY-MM-DDTHH:mm:ss.sssZ"),
@@ -62,9 +62,9 @@ class DatePickerWidget extends BaseWidget<DatePickerWidget2Props, WidgetState> {
                 value: "YYYY-MM-DDTHH:mm:ss",
               },
               {
-                label: moment().format("YYYY-MM-DD hh:mm:ss"),
-                subText: "YYYY-MM-DD hh:mm:ss",
-                value: "YYYY-MM-DD hh:mm:ss",
+                label: moment().format("YYYY-MM-DD hh:mm:ss A"),
+                subText: "YYYY-MM-DD hh:mm:ss A",
+                value: "YYYY-MM-DD hh:mm:ss A",
               },
               {
                 label: moment().format("DD/MM/YYYY HH:mm"),
diff --git a/app/client/src/widgets/DividerWidget.test.tsx b/app/client/src/widgets/DividerWidget.test.tsx
new file mode 100644
index 0000000000..c139b2b7f7
--- /dev/null
+++ b/app/client/src/widgets/DividerWidget.test.tsx
@@ -0,0 +1,75 @@
+import React from "react";
+import DividerWidget, { DividerWidgetProps } from "./DividerWidget";
+import configureStore from "redux-mock-store";
+import { render } from "@testing-library/react";
+import { Provider } from "react-redux";
+import { ThemeProvider, theme, dark } from "constants/DefaultTheme";
+
+jest.mock("react-dnd", () => ({
+  useDrag: jest.fn().mockReturnValue([{ isDragging: false }, jest.fn()]),
+}));
+
+describe("<DividerWidget />", () => {
+  const initialState = {
+    ui: {
+      widgetDragResize: {
+        lastSelectedWidget: "Widget1",
+        selectedWidgets: ["Widget1"],
+      },
+      propertyPane: {
+        isVisible: true,
+        widgetId: "Widget1",
+      },
+    },
+    entities: { canvasWidgets: {}, app: { mode: "canvas" } },
+  };
+
+  function renderDividerWidget(props: Partial<DividerWidgetProps> = {}) {
+    const defaultProps: DividerWidgetProps = {
+      orientation: "horizontal",
+      capType: "nc",
+      capSide: -1,
+      strokeStyle: "solid",
+      dividerColor: "black",
+      thickness: 2,
+      widgetId: "Widget1",
+      type: "DIVIDER_WIDGET",
+      widgetName: "Divider 1",
+      parentId: "Container1",
+      renderMode: "CANVAS",
+      parentColumnSpace: 2,
+      parentRowSpace: 3,
+      leftColumn: 2,
+      rightColumn: 4,
+      topRow: 1,
+      bottomRow: 2,
+      isLoading: false,
+      version: 1,
+      disablePropertyPane: false,
+      ...props,
+    };
+    // Mock store to bypass the error of react-redux
+    const store = configureStore()(initialState);
+    return render(
+      <Provider store={store}>
+        <ThemeProvider
+          theme={{ ...theme, colors: { ...theme.colors, ...dark } }}
+        >
+          <DividerWidget {...defaultProps} />
+        </ThemeProvider>
+      </Provider>,
+    );
+  }
+
+  test("should render Divider widget horizontal by default", async () => {
+    const { queryByTestId } = renderDividerWidget();
+
+    expect(queryByTestId("dividerHorizontal")).toBeTruthy();
+  });
+
+  test("should render Divider vertical", async () => {
+    const { queryByTestId } = renderDividerWidget({ orientation: "vertical" });
+
+    expect(queryByTestId("dividerVertical")).toBeTruthy();
+  });
+});
diff --git a/app/client/src/widgets/DividerWidget.tsx b/app/client/src/widgets/DividerWidget.tsx
new file mode 100644
index 0000000000..031d39276a
--- /dev/null
+++ b/app/client/src/widgets/DividerWidget.tsx
@@ -0,0 +1,184 @@
+import React from "react";
+import BaseWidget, { WidgetProps, WidgetState } from "./BaseWidget";
+import { WidgetType } from "constants/WidgetConstants";
+import DividerComponent from "components/designSystems/blueprint/DividerComponent";
+import { VALIDATION_TYPES } from "constants/WidgetValidation";
+import * as Sentry from "@sentry/react";
+
+class DividerWidget extends BaseWidget<DividerWidgetProps, WidgetState> {
+  static getPropertyPaneConfig() {
+    return [
+      {
+        sectionName: "General",
+        children: [
+          {
+            helpText: "Controls widget orientation",
+            propertyName: "orientation",
+            label: "Orientation",
+            controlType: "DROP_DOWN",
+            options: [
+              {
+                label: "Horizontal",
+                value: "horizontal",
+              },
+              {
+                label: "Vertical",
+                value: "vertical",
+              },
+            ],
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.TEXT,
+          },
+          {
+            helpText: "Controls the visibility of the widget",
+            propertyName: "isVisible",
+            label: "Visible",
+            controlType: "SWITCH",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.BOOLEAN,
+          },
+        ],
+      },
+      {
+        sectionName: "Styles",
+        children: [
+          {
+            helpText: "Controls the style of the divider",
+            propertyName: "strokeStyle",
+            label: "Dash Style",
+            controlType: "DROP_DOWN",
+            options: [
+              {
+                label: "Solid",
+                value: "solid",
+                icon: "cap-solid",
+                iconSize: "large",
+              },
+              {
+                label: "Dashed",
+                value: "dashed",
+                icon: "line-dashed",
+                iconSize: "large",
+              },
+              {
+                label: "Dotted",
+                value: "dotted",
+                icon: "line-dotted",
+                iconSize: "large",
+              },
+            ],
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.TEXT,
+          },
+          {
+            helpText: "Controls the thickness of divider",
+            propertyName: "thickness",
+            label: "Thickness (px)",
+            controlType: "INPUT_TEXT",
+            placeholderText: "Enter thickness in pixels",
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.NUMBER,
+          },
+          {
+            helpText: "Controls the stroke color of divider",
+            propertyName: "dividerColor",
+            label: "Divider Color",
+            controlType: "COLOR_PICKER",
+            isBindProperty: false,
+            isTriggerProperty: false,
+          },
+          {
+            helpText: "Controls the type of divider cap",
+            propertyName: "capType",
+            label: "Cap",
+            controlType: "DROP_DOWN",
+            options: [
+              {
+                label: "No Cap",
+                value: "nc",
+                icon: "cap-solid",
+                iconSize: "large",
+              },
+              {
+                label: "Arrow",
+                value: "arrow",
+                icon: "arrow-forward",
+                iconSize: "large",
+              },
+              {
+                label: "Dot",
+                value: "dot",
+                icon: "cap-dot",
+                iconSize: "large",
+              },
+            ],
+            isBindProperty: false,
+            isTriggerProperty: false,
+          },
+          {
+            helpText:
+              "Controls hide/show divider cap on start or end of divider",
+            propertyName: "capSide",
+            label: "",
+            controlType: "ICON_TABS",
+            options: [
+              {
+                icon: "DIVIDER_CAP_LEFT",
+                value: -1,
+              },
+              {
+                icon: "DIVIDER_CAP_ALL",
+                value: 0,
+                width: 48,
+              },
+              {
+                icon: "DIVIDER_CAP_RIGHT",
+                value: 1,
+              },
+            ],
+            defaultValue: "0",
+            isBindProperty: false,
+            isTriggerProperty: false,
+            hidden: (props: DividerWidgetProps) => props.capType === "nc",
+          },
+        ],
+      },
+    ];
+  }
+
+  getPageView() {
+    return (
+      <DividerComponent
+        capSide={this.props.capSide}
+        capType={this.props.capType}
+        dividerColor={this.props.dividerColor}
+        orientation={this.props.orientation}
+        strokeStyle={this.props.strokeStyle}
+        thickness={this.props.thickness}
+        widgetId={this.props.widgetId}
+      />
+    );
+  }
+
+  getWidgetType(): WidgetType {
+    return "DIVIDER_WIDGET";
+  }
+}
+
+export interface DividerWidgetProps extends WidgetProps {
+  orientation: string;
+  capType: string;
+  capSide?: number;
+  strokeStyle?: "solid" | "dashed" | "dotted";
+  dividerColor?: string;
+  thickness?: number;
+}
+
+export default DividerWidget;
+export const ProfiledDividerWidget = Sentry.withProfiler(DividerWidget);
diff --git a/app/client/src/widgets/DropdownWidget.tsx b/app/client/src/widgets/DropdownWidget.tsx
index 829f52c7f0..bac0eb52b1 100644
--- a/app/client/src/widgets/DropdownWidget.tsx
+++ b/app/client/src/widgets/DropdownWidget.tsx
@@ -9,6 +9,7 @@ import { Intent as BlueprintIntent } from "@blueprintjs/core";
 import * as Sentry from "@sentry/react";
 import withMeta, { WithMeta } from "./MetaHOC";
 import { IconName } from "@blueprintjs/icons";
+import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 
 class DropdownWidget extends BaseWidget<DropdownWidgetProps, WidgetState> {
   static getPropertyPaneConfig() {
@@ -41,10 +42,12 @@ class DropdownWidget extends BaseWidget<DropdownWidgetProps, WidgetState> {
             propertyName: "options",
             label: "Options",
             controlType: "INPUT_TEXT",
-            placeholderText: 'Enter [{label: "label1", value: "value2"}]',
+            placeholderText: 'Enter [{"label": "label1", "value": "value2"}]',
             isBindProperty: true,
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.OPTIONS_DATA,
+            evaluationSubstitutionType:
+              EvaluationSubstitutionType.SMART_SUBSTITUTE,
           },
           {
             helpText: "Selects the option with value by default",
@@ -56,6 +59,15 @@ class DropdownWidget extends BaseWidget<DropdownWidgetProps, WidgetState> {
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.DEFAULT_OPTION_VALUE,
           },
+          {
+            propertyName: "isFilterable",
+            label: "Filterable",
+            helpText: "Makes the dropdown list filterable",
+            controlType: "SWITCH",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+          },
           {
             propertyName: "isRequired",
             label: "Required",
@@ -138,18 +150,26 @@ class DropdownWidget extends BaseWidget<DropdownWidgetProps, WidgetState> {
       ? this.props.selectedOptionValueArr
       : [];
   }
+  getDropdownPosition = (node: HTMLDivElement | null) => {
+    if (Boolean(node?.closest(".bp3-modal-widget"))) {
+      return document.querySelector(".bp3-modal-widget") as HTMLElement;
+    }
+    return document.querySelector(".appsmith_widget_0") as HTMLElement;
+  };
 
   getPageView() {
-    const options = this.props.options || [];
+    const options = _.isArray(this.props.options) ? this.props.options : [];
     const selectedIndex = _.findIndex(this.props.options, {
       value: this.props.selectedOptionValue,
     });
     const computedSelectedIndexArr = this.props.selectedIndexArr || [];
-    const { componentWidth, componentHeight } = this.getComponentDimensions();
+    const { componentHeight, componentWidth } = this.getComponentDimensions();
     return (
       <DropDownComponent
         disabled={this.props.isDisabled}
+        getDropdownPosition={this.getDropdownPosition}
         height={componentHeight}
+        isFilterable={this.props.isFilterable}
         isLoading={this.props.isLoading}
         label={`${this.props.label}`}
         onOptionRemoved={this.onOptionRemoved}
@@ -260,6 +280,7 @@ export interface DropdownWidgetProps extends WidgetProps, WithMeta {
   onOptionChange?: string;
   defaultOptionValue?: string | string[];
   isRequired: boolean;
+  isFilterable: boolean;
   selectedOptionValue: string;
   selectedOptionValueArr: string[];
   selectedOptionLabels: string[];
diff --git a/app/client/src/widgets/FilepickerWidget.tsx b/app/client/src/widgets/FilepickerWidget.tsx
index 73310e59f1..ff7a15f43e 100644
--- a/app/client/src/widgets/FilepickerWidget.tsx
+++ b/app/client/src/widgets/FilepickerWidget.tsx
@@ -8,10 +8,7 @@ import Webcam from "@uppy/webcam";
 import Url from "@uppy/url";
 import OneDrive from "@uppy/onedrive";
 import { VALIDATION_TYPES } from "constants/WidgetValidation";
-import {
-  EventType,
-  ExecutionResult,
-} from "constants/AppsmithActionConstants/ActionConstants";
+import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { DerivedPropertiesMap } from "utils/WidgetFactory";
 import Dashboard from "@uppy/dashboard";
 import shallowequal from "shallowequal";
@@ -19,6 +16,7 @@ import _ from "lodash";
 import * as Sentry from "@sentry/react";
 import withMeta, { WithMeta } from "./MetaHOC";
 import FileDataTypes from "./FileDataTypes";
+import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 
 class FilePickerWidget extends BaseWidget<
   FilePickerWidgetProps,
@@ -114,6 +112,8 @@ class FilePickerWidget extends BaseWidget<
             isBindProperty: true,
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.ARRAY,
+            evaluationSubstitutionType:
+              EvaluationSubstitutionType.SMART_SUBSTITUTE,
           },
           {
             helpText: "Set the format of the data read from the files",
@@ -157,17 +157,6 @@ class FilePickerWidget extends BaseWidget<
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.BOOLEAN,
           },
-          {
-            propertyName: "uploadedFileUrlPaths",
-            helpText:
-              "Stores the url of the uploaded file so that it can be referenced in an action later",
-            label: "Uploaded File URLs",
-            controlType: "INPUT_TEXT",
-            placeholderText: 'Enter [ "url1", "url2" ]',
-            inputType: "TEXT",
-            isBindProperty: true,
-            isTriggerProperty: false,
-          },
           {
             propertyName: "isDisabled",
             label: "Disable",
@@ -185,7 +174,7 @@ class FilePickerWidget extends BaseWidget<
         children: [
           {
             helpText:
-              "Triggers an action when the user selects a file. Upload files to a CDN here and store their urls in uploadedFileUrls",
+              "Triggers an action when the user selects a file. Upload files to a CDN and stores their URLs in filepicker.files",
             propertyName: "onFilesSelected",
             label: "onFilesSelected",
             controlType: "ACTION_SELECTOR",
@@ -198,6 +187,12 @@ class FilePickerWidget extends BaseWidget<
     ];
   }
 
+  static getDefaultPropertiesMap(): Record<string, string> {
+    return {
+      selectedFiles: "defaultSelectedFiles",
+    };
+  }
+
   static getDerivedPropertiesMap(): DerivedPropertiesMap {
     return {
       isValid: `{{ this.isRequired ? this.files.length > 0 : true }}`,
@@ -296,7 +291,11 @@ class FilePickerWidget extends BaseWidget<
             plugin.closeModal();
           }
         },
-        locale: {},
+        locale: {
+          strings: {
+            closeModal: "Close",
+          },
+        },
       })
       .use(GoogleDrive, { companionUrl: "https://companion.uppy.io" })
       .use(Url, { companionUrl: "https://companion.uppy.io" })
@@ -385,7 +384,7 @@ class FilePickerWidget extends BaseWidget<
         dynamicString: this.props.onFilesSelected,
         event: {
           type: EventType.ON_FILES_SELECTED,
-          callback: this.handleFileUploaded,
+          callback: this.handleActionComplete,
         },
       });
 
@@ -393,20 +392,8 @@ class FilePickerWidget extends BaseWidget<
     }
   };
 
-  /**
-   * sets uploadFilesUrl in meta propety and sets isLoading to false
-   *
-   * @param result
-   */
-  handleFileUploaded = (result: ExecutionResult) => {
-    if (result.success) {
-      this.props.updateWidgetMetaProperty(
-        "uploadedFileUrls",
-        this.props.uploadedFileUrlPaths,
-      );
-
-      this.setState({ isLoading: false });
-    }
+  handleActionComplete = () => {
+    this.setState({ isLoading: false });
   };
 
   componentDidUpdate(prevProps: FilePickerWidgetProps) {
@@ -469,7 +456,6 @@ export interface FilePickerWidgetProps extends WidgetProps, WithMeta {
   onFilesSelected?: string;
   fileDataType: FileDataTypes;
   isRequired?: boolean;
-  uploadedFileUrlPaths?: string;
 }
 
 export default FilePickerWidget;
diff --git a/app/client/src/widgets/FormButtonWidget.tsx b/app/client/src/widgets/FormButtonWidget.tsx
index 179db41297..6e49356778 100644
--- a/app/client/src/widgets/FormButtonWidget.tsx
+++ b/app/client/src/widgets/FormButtonWidget.tsx
@@ -105,6 +105,16 @@ class FormButtonWidget extends BaseWidget<
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.TEXT,
           },
+          {
+            propertyName: "recaptchaV2",
+            label: "Google reCAPTCHA v2",
+            controlType: "SWITCH",
+            helpText: "Use reCAPTCHA v2",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.BOOLEAN,
+          },
         ],
       },
       {
@@ -189,6 +199,7 @@ class FormButtonWidget extends BaseWidget<
         isLoading={this.props.isLoading || this.state.isLoading}
         key={this.props.widgetId}
         onClick={!disabled ? this.onButtonClickBound : undefined}
+        recaptchaV2={this.props.recaptchaV2}
         text={this.props.text}
         type={this.props.buttonType || ButtonType.BUTTON}
         widgetId={this.props.widgetId}
@@ -219,6 +230,7 @@ export interface FormButtonWidgetProps extends WidgetProps, WithMeta {
   onReset?: () => void;
   disabledWhenInvalid?: boolean;
   googleRecaptchaKey?: string;
+  recaptchaV2?: boolean;
 }
 
 export interface FormButtonWidgetState extends WidgetState {
diff --git a/app/client/src/widgets/FormWidget.tsx b/app/client/src/widgets/FormWidget.tsx
index dfc2450c0e..585320c45f 100644
--- a/app/client/src/widgets/FormWidget.tsx
+++ b/app/client/src/widgets/FormWidget.tsx
@@ -19,7 +19,7 @@ class FormWidget extends ContainerWidget {
             label: "Background Color",
             helpText: "Use a html color name, HEX, RGB or RGBA value",
             placeholderText: "#FFFFFF / Gray / rgb(255, 99, 71)",
-            controlType: "INPUT_TEXT",
+            controlType: "COLOR_PICKER",
             isBindProperty: true,
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.TEXT,
@@ -73,7 +73,7 @@ class FormWidget extends ContainerWidget {
 
   updateFormData() {
     if (this.props.children) {
-      const formData = this.getFormData(this.props.children[0]);
+      const formData = this.getFormData(this.props.children[0] as WidgetProps);
       if (!_.isEqual(formData, this.props.data)) {
         this.props.updateWidgetMetaProperty("data", formData);
       }
diff --git a/app/client/src/widgets/IframeWidget.tsx b/app/client/src/widgets/IframeWidget.tsx
new file mode 100644
index 0000000000..fa93364826
--- /dev/null
+++ b/app/client/src/widgets/IframeWidget.tsx
@@ -0,0 +1,161 @@
+import React from "react";
+
+import BaseWidget, { WidgetProps, WidgetState } from "./BaseWidget";
+import { WidgetType, WidgetTypes } from "constants/WidgetConstants";
+import IframeComponent from "components/designSystems/blueprint/IframeComponent";
+import { VALIDATION_TYPES } from "constants/WidgetValidation";
+import * as Sentry from "@sentry/react";
+import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
+
+class IframeWidget extends BaseWidget<IframeWidgetProps, WidgetState> {
+  static getPropertyPaneConfig() {
+    return [
+      {
+        sectionName: "General",
+        children: [
+          {
+            propertyName: "source",
+            helpText: "The URL of the page to embed",
+            label: "Source",
+            controlType: "INPUT_TEXT",
+            placeholderText: "Enter the URL of the page to embed",
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.TEXT,
+          },
+          {
+            propertyName: "title",
+            helpText: "Label the content of the page to embed",
+            label: "Title",
+            controlType: "INPUT_TEXT",
+            placeholderText: "Enter the title of the page to embed",
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.TEXT,
+          },
+        ],
+      },
+      {
+        sectionName: "Actions",
+        children: [
+          {
+            helpText: "Triggers an action when the source URL is changed",
+            propertyName: "onURLChanged",
+            label: "onURLChanged",
+            controlType: "ACTION_SELECTOR",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: true,
+          },
+          {
+            helpText: "Triggers an action when a message event is received",
+            propertyName: "onMessageReceived",
+            label: "onMessageReceived",
+            controlType: "ACTION_SELECTOR",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: true,
+          },
+        ],
+      },
+      {
+        sectionName: "Styles",
+        children: [
+          {
+            propertyName: "borderColor",
+            label: "Border Color",
+            controlType: "COLOR_PICKER",
+            isBindProperty: false,
+            isTriggerProperty: false,
+          },
+          {
+            propertyName: "borderOpacity",
+            label: "Border Opacity (%)",
+            controlType: "INPUT_TEXT",
+            isBindProperty: true,
+            isTriggerProperty: false,
+            inputType: "NUMBER",
+            validation: VALIDATION_TYPES.NUMBER,
+          },
+          {
+            propertyName: "borderWidth",
+            label: "Border Width (px)",
+            controlType: "INPUT_TEXT",
+            isBindProperty: true,
+            isTriggerProperty: false,
+            inputType: "NUMBER",
+            validation: VALIDATION_TYPES.NUMBER,
+          },
+        ],
+      },
+    ];
+  }
+
+  urlChangedHandler = (url: string) => {
+    if (url && this.props.onURLChanged) {
+      super.executeAction({
+        triggerPropertyName: "onURLChanged",
+        dynamicString: this.props.onURLChanged,
+        event: {
+          type: EventType.ON_IFRAME_URL_CHANGED,
+        },
+      });
+    }
+  };
+
+  messageReceivedHandler = (event: MessageEvent) => {
+    // Accept messages only from the current iframe
+    if (!this.props.source?.includes(event.origin)) {
+      return;
+    }
+    if (this.props.onMessageReceived) {
+      super.executeAction({
+        triggerPropertyName: "onMessageReceived",
+        dynamicString: this.props.onMessageReceived,
+        event: {
+          type: EventType.ON_IFRAME_MESSAGE_RECEIVED,
+        },
+      });
+    }
+  };
+
+  getPageView() {
+    const {
+      borderColor,
+      borderOpacity,
+      borderWidth,
+      source,
+      title,
+      widgetId,
+    } = this.props;
+    return (
+      <IframeComponent
+        borderColor={borderColor}
+        borderOpacity={borderOpacity}
+        borderWidth={borderWidth}
+        onMessageReceived={this.messageReceivedHandler}
+        onURLChanged={this.urlChangedHandler}
+        source={source}
+        title={title}
+        widgetId={widgetId}
+      />
+    );
+  }
+
+  getWidgetType(): WidgetType {
+    return WidgetTypes.IFRAME_WIDGET;
+  }
+}
+
+export interface IframeWidgetProps extends WidgetProps {
+  source: string;
+  title?: string;
+  onURLChanged?: string;
+  onMessageReceived?: string;
+  borderColor?: string;
+  borderOpacity?: number;
+  borderWidth?: number;
+}
+
+export default IframeWidget;
+export const ProfiledIframeWidget = Sentry.withProfiler(IframeWidget);
diff --git a/app/client/src/widgets/ImageWidget.tsx b/app/client/src/widgets/ImageWidget.tsx
index 02d97e6065..8f4e24a893 100644
--- a/app/client/src/widgets/ImageWidget.tsx
+++ b/app/client/src/widgets/ImageWidget.tsx
@@ -78,6 +78,52 @@ class ImageWidget extends BaseWidget<ImageWidgetProps, WidgetState> {
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.NUMBER,
           },
+          {
+            helpText:
+              "Sets how the Image should be resized to fit its container.",
+            propertyName: "objectFit",
+            label: "Object Fit",
+            controlType: "DROP_DOWN",
+            defaultValue: "cover",
+            options: [
+              {
+                label: "Contain",
+                value: "contain",
+              },
+              {
+                label: "Cover",
+                value: "cover",
+              },
+              {
+                label: "Auto",
+                value: "auto",
+              },
+            ],
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.TEXT,
+          },
+          {
+            helpText: "Controls if the image is allowed to rotate",
+            propertyName: "enableRotation",
+            label: "Enable Rotation",
+            controlType: "SWITCH",
+            isJSConvertible: false,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.BOOLEAN,
+          },
+          {
+            helpText: "Controls if the image is allowed to download",
+            propertyName: "enableDownload",
+            label: "Enable Download",
+            controlType: "SWITCH",
+            isJSConvertible: false,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.BOOLEAN,
+          },
         ],
       },
       {
@@ -99,16 +145,19 @@ class ImageWidget extends BaseWidget<ImageWidgetProps, WidgetState> {
   }
 
   getPageView() {
-    const { maxZoomLevel } = this.props;
+    const { maxZoomLevel, objectFit } = this.props;
     return (
       <ImageComponent
         defaultImageUrl={this.props.defaultImage}
         disableDrag={(disable: boolean) => {
           this.disableDrag(disable);
         }}
+        enableDownload={this.props.enableDownload}
+        enableRotation={this.props.enableRotation}
         imageUrl={this.props.image}
         isLoading={this.props.isLoading}
         maxZoomLevel={maxZoomLevel}
+        objectFit={objectFit}
         onClick={this.props.onClick ? this.onImageClick : undefined}
         showHoverPointer={this.props.renderMode === RenderModes.PAGE}
         widgetId={this.props.widgetId}
@@ -140,6 +189,10 @@ export interface ImageWidgetProps extends WidgetProps {
   imageShape: ImageShape;
   defaultImage: string;
   maxZoomLevel: number;
+  imageRotation?: number;
+  enableDownload?: boolean;
+  enableRotation?: boolean;
+  objectFit: string;
   onClick?: string;
 }
 
diff --git a/app/client/src/widgets/InputWidget.tsx b/app/client/src/widgets/InputWidget.tsx
index 0c065881a5..7517e7b5a6 100644
--- a/app/client/src/widgets/InputWidget.tsx
+++ b/app/client/src/widgets/InputWidget.tsx
@@ -13,6 +13,7 @@ import { createMessage, FIELD_REQUIRED_ERROR } from "constants/messages";
 import { DerivedPropertiesMap } from "utils/WidgetFactory";
 import * as Sentry from "@sentry/react";
 import withMeta, { WithMeta } from "./MetaHOC";
+import { GRID_DENSITY_MIGRATION_V1 } from "mockResponses/WidgetConfigResponse";
 
 class InputWidget extends BaseWidget<InputWidgetProps, WidgetState> {
   constructor(props: InputWidgetProps) {
@@ -201,8 +202,11 @@ class InputWidget extends BaseWidget<InputWidgetProps, WidgetState> {
             if (parsedRegex) {
               return parsedRegex.test(this.text);
             }
+            if (this.isRequired) {
+              return !(this.text === '' || isNaN(this.text));
+            }
 
-            return !isNaN(this.text);
+            return (this.text === '' || !isNaN(this.text || ''));
           }
           else if (this.isRequired) {
             if(this.text && this.text.length) {
@@ -311,8 +315,10 @@ class InputWidget extends BaseWidget<InputWidgetProps, WidgetState> {
         isLoading={this.props.isLoading}
         label={this.props.label}
         multiline={
-          this.props.bottomRow - this.props.topRow > 1 &&
-          this.props.inputType === "TEXT"
+          // GRID_DENSITY_MIGRATION_V1 used to adjust code as per new scaled canvas.
+          (this.props.bottomRow - this.props.topRow) /
+            GRID_DENSITY_MIGRATION_V1 >
+            1 && this.props.inputType === "TEXT"
         }
         onFocusChange={this.handleFocusChange}
         onKeyDown={this.handleKeyDown}
diff --git a/app/client/src/widgets/ListWidget/ListComponent.tsx b/app/client/src/widgets/ListWidget/ListComponent.tsx
index b192630b65..70939d8513 100644
--- a/app/client/src/widgets/ListWidget/ListComponent.tsx
+++ b/app/client/src/widgets/ListWidget/ListComponent.tsx
@@ -6,13 +6,12 @@ import { ListWidgetProps } from "./ListWidget";
 import { WidgetProps } from "widgets/BaseWidget";
 import { generateClassName, getCanvasClassName } from "utils/generators";
 import { ComponentProps } from "components/designSystems/appsmith/BaseComponent";
-import { getBorderCSSShorthand } from "constants/DefaultTheme";
 
 interface GridComponentProps extends ComponentProps {
   children?: ReactNode;
   shouldScrollContents?: boolean;
   backgroundColor?: Color;
-  items: Array<Record<string, unknown>>;
+  listData: Array<Record<string, unknown>>;
   hasPagination?: boolean;
 }
 
@@ -20,6 +19,7 @@ const GridContainer = styled.div<GridComponentProps>`
   height: 100%;
   width: 100%;
   position: relative;
+  overflow: hidden;
   background: ${(props) => props.backgroundColor};
 `;
 
@@ -49,11 +49,13 @@ function ListComponent(props: GridComponentProps) {
   );
 }
 
-export const ListComponentEmpty = styled.div`
+export const ListComponentEmpty = styled.div<{
+  backgroundColor?: string;
+}>`
   height: 100%;
   width: 100%;
   position: relative;
-  background: white;
+  background: ${(props) => props.backgroundColor ?? "white"};
   display: flex;
   align-items: center;
   justify-content: center;
@@ -61,7 +63,22 @@ export const ListComponentEmpty = styled.div`
   font-size: 10px;
   text-anchor: middle;
   color: rgb(102, 102, 102);
-  border: ${(props) => getBorderCSSShorthand(props.theme.borders[2])};
+  box-shadow: ${(props) => `0px 0px 0px 1px ${props.theme.borders[2].color}`};
+`;
+
+export const ListComponentLoading = styled.div<{
+  backgroundColor?: string;
+}>`
+  height: 100%;
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+  box-shadow: 0px 0px 0px 1px #e7e7e7;
+
+  & > div {
+    background: ${(props) => props.backgroundColor ?? "white"};
+    margin: 8px;
+  }
 `;
 
 export default ListComponent;
diff --git a/app/client/src/widgets/ListWidget/ListPagination.tsx b/app/client/src/widgets/ListWidget/ListPagination.tsx
index bdeaaabc33..053378cc62 100644
--- a/app/client/src/widgets/ListWidget/ListPagination.tsx
+++ b/app/client/src/widgets/ListWidget/ListPagination.tsx
@@ -29,6 +29,7 @@ const StyledPagination = styled(Pagination)<{
   bottom: 4px;
   left: 0;
   right: 0;
+  z-index: 3;
   pointer-events: ${(props) => (props.disabled ? "none" : "all")};
   opacity: ${(props) => (props.disabled ? "0.4" : "1")};
 
diff --git a/app/client/src/widgets/ListWidget/ListPropertyPaneConfig.ts b/app/client/src/widgets/ListWidget/ListPropertyPaneConfig.ts
index 9d972ee9b7..7c99912d7e 100644
--- a/app/client/src/widgets/ListWidget/ListPropertyPaneConfig.ts
+++ b/app/client/src/widgets/ListWidget/ListPropertyPaneConfig.ts
@@ -2,6 +2,8 @@ import { get } from "lodash";
 import { WidgetProps } from "widgets/BaseWidget";
 import { ListWidgetProps } from "./ListWidget";
 import { VALIDATION_TYPES } from "constants/WidgetValidation";
+import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EVAL_VALUE_PATH } from "utils/DynamicBindingUtils";
 
 const PropertyPaneConfig = [
   {
@@ -9,7 +11,7 @@ const PropertyPaneConfig = [
     children: [
       {
         helpText: "Takes in an array of objects to display items in the list.",
-        propertyName: "items",
+        propertyName: "listData",
         label: "Items",
         controlType: "INPUT_TEXT",
         placeholderText: 'Enter [{ "col1": "val1" }]',
@@ -17,6 +19,7 @@ const PropertyPaneConfig = [
         isBindProperty: true,
         isTriggerProperty: false,
         validation: VALIDATION_TYPES.LIST_DATA,
+        evaluationSubstitutionType: EvaluationSubstitutionType.SMART_SUBSTITUTE,
       },
       {
         propertyName: "backgroundColor",
@@ -33,6 +36,7 @@ const PropertyPaneConfig = [
         isJSConvertible: true,
         isBindProperty: true,
         isTriggerProperty: false,
+        defaultValue: "#FFFFFF",
       },
 
       {
@@ -69,14 +73,20 @@ const PropertyPaneConfig = [
         isBindProperty: true,
         isTriggerProperty: true,
         additionalAutoComplete: (props: ListWidgetProps<WidgetProps>) => {
+          let items = get(props, `${EVAL_VALUE_PATH}.listData`, []);
+
+          if (Array.isArray(items)) {
+            items = items.filter(Boolean);
+          } else {
+            items = [];
+          }
+
           return {
             currentItem: Object.assign(
               {},
-              ...Object.keys(get(props, "evaluatedValues.items.0", {})).map(
-                (key) => ({
-                  [key]: "",
-                }),
-              ),
+              ...Object.keys(get(items, "0", {})).map((key) => ({
+                [key]: "",
+              })),
             ),
           };
         },
diff --git a/app/client/src/widgets/ListWidget/ListWidget.test.tsx b/app/client/src/widgets/ListWidget/ListWidget.test.tsx
index b6e65184c5..7506e5b1f6 100644
--- a/app/client/src/widgets/ListWidget/ListWidget.test.tsx
+++ b/app/client/src/widgets/ListWidget/ListWidget.test.tsx
@@ -14,7 +14,8 @@ describe("<ListWidget />", () => {
   const initialState = {
     ui: {
       widgetDragResize: {
-        selectedWidget: "Widget1",
+        lastSelectedWidget: "Widget1",
+        selectedWidgets: ["Widget1"],
       },
       propertyPane: {
         isVisible: true,
@@ -40,7 +41,7 @@ describe("<ListWidget />", () => {
       topRow: 1,
       bottomRow: 3,
       isLoading: false,
-      items: [],
+      listData: [],
       version: 16,
       disablePropertyPane: false,
       ...props,
diff --git a/app/client/src/widgets/ListWidget/ListWidget.tsx b/app/client/src/widgets/ListWidget/ListWidget.tsx
index 5b12f32489..6fdeef7ccc 100644
--- a/app/client/src/widgets/ListWidget/ListWidget.tsx
+++ b/app/client/src/widgets/ListWidget/ListWidget.tsx
@@ -1,6 +1,16 @@
 import React from "react";
 import log from "loglevel";
-import { compact, get, set, xor, isPlainObject, isNumber, round } from "lodash";
+import {
+  compact,
+  get,
+  set,
+  xor,
+  isNumber,
+  round,
+  range,
+  toString,
+  isBoolean,
+} from "lodash";
 import * as Sentry from "@sentry/react";
 
 import WidgetFactory from "utils/WidgetFactory";
@@ -11,7 +21,10 @@ import {
   WidgetType,
   WidgetTypes,
 } from "constants/WidgetConstants";
-import ListComponent, { ListComponentEmpty } from "./ListComponent";
+import ListComponent, {
+  ListComponentEmpty,
+  ListComponentLoading,
+} from "./ListComponent";
 import { ContainerStyle } from "components/designSystems/appsmith/ContainerComponent";
 import { ContainerWidgetProps } from "../ContainerWidget";
 import propertyPaneConfig from "./ListPropertyPaneConfig";
@@ -19,7 +32,9 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { getDynamicBindings } from "utils/DynamicBindingUtils";
 import ListPagination from "./ListPagination";
 import withMeta from "./../MetaHOC";
+import { VALIDATION_TYPES } from "constants/WidgetValidation";
 import { GridDefaults, WIDGET_PADDING } from "constants/WidgetConstants";
+import derivedProperties from "./parseDerivedProperties";
 
 class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
   state = {
@@ -35,23 +50,8 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
 
   static getDerivedPropertiesMap() {
     return {
-      selectedItem: `{{(()=>{
-        const selectedItemIndex =
-          this.selectedItemIndex === undefined ||
-          Number.isNaN(parseInt(this.selectedItemIndex))
-            ? -1
-            : parseInt(this.selectedItemIndex);
-        const items = this.items || [];
-        if (selectedItemIndex === -1) {
-          const emptyRow = { ...items[0] };
-          Object.keys(emptyRow).forEach((key) => {
-            emptyRow[key] = "";
-          });
-          return emptyRow;
-        }
-        const selectedItem = { ...items[selectedItemIndex] };
-        return selectedItem;
-      })()}}`,
+      selectedItem: `{{(()=>{${derivedProperties.getSelectedItem}})()}}`,
+      items: `{{(() => {${derivedProperties.getItems}})()}}`,
     };
   }
 
@@ -60,11 +60,11 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
    *
    * @param items
    */
-  getCurrentItemStructure = (items: Array<Record<string, unknown>>) => {
-    return Array.isArray(items) && items.length > 0
+  getCurrentItemStructure = (listData: Array<Record<string, unknown>>) => {
+    return Array.isArray(listData) && listData.length > 0
       ? Object.assign(
           {},
-          ...Object.keys(items[0]).map((key) => ({
+          ...Object.keys(listData[0]).map((key) => ({
             [key]: "",
           })),
         )
@@ -75,19 +75,83 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
     if (
       !this.props.childAutoComplete ||
       (Object.keys(this.props.childAutoComplete).length === 0 &&
-        this.props.items &&
-        Array.isArray(this.props.items))
+        this.props.listData &&
+        Array.isArray(this.props.listData))
     ) {
-      const structure = this.getCurrentItemStructure(this.props.items);
+      const structure = this.getCurrentItemStructure(this.props.listData);
       super.updateWidgetProperty("childAutoComplete", {
         currentItem: structure,
       });
     }
+
+    // generate childMetaPropertyMap
+    this.generateChildrenDefaultPropertiesMap(this.props);
+    this.generateChildrenMetaPropertiesMap(this.props);
   }
 
+  generateChildrenDefaultPropertiesMap = (
+    props: ListWidgetProps<WidgetProps>,
+  ) => {
+    const template = props.template;
+    let childrenDefaultPropertiesMap = {};
+
+    if (template) {
+      Object.keys(template).map((key: string) => {
+        const currentTemplate = template[key];
+        const defaultProperties = WidgetFactory.getWidgetDefaultPropertiesMap(
+          currentTemplate.type,
+        );
+
+        Object.keys(defaultProperties).map((defaultPropertyKey: string) => {
+          childrenDefaultPropertiesMap = {
+            ...childrenDefaultPropertiesMap,
+            [`${key}.${defaultPropertyKey}`]: defaultProperties[
+              defaultPropertyKey
+            ],
+          };
+        });
+      });
+    }
+
+    if (this.props.updateWidgetMetaProperty) {
+      this.props.updateWidgetMetaProperty(
+        "childrenDefaultPropertiesMap",
+        childrenDefaultPropertiesMap,
+      );
+    }
+  };
+
+  generateChildrenMetaPropertiesMap = (props: ListWidgetProps<WidgetProps>) => {
+    const template = props.template;
+    let childrenMetaPropertiesMap = {};
+
+    if (template) {
+      Object.keys(template).map((key: string) => {
+        const currentTemplate = template[key];
+        const metaProperties = WidgetFactory.getWidgetMetaPropertiesMap(
+          currentTemplate.type,
+        );
+
+        Object.keys(metaProperties).map((metaPropertyKey: string) => {
+          childrenMetaPropertiesMap = {
+            ...childrenMetaPropertiesMap,
+            [`${key}.${metaPropertyKey}`]: currentTemplate[metaPropertyKey],
+          };
+        });
+      });
+    }
+
+    if (this.props.updateWidgetMetaProperty) {
+      this.props.updateWidgetMetaProperty(
+        "childrenMetaPropertiesMap",
+        Object.keys(childrenMetaPropertiesMap),
+      );
+    }
+  };
+
   componentDidUpdate(prevProps: ListWidgetProps<WidgetProps>) {
-    const oldRowStructure = this.getCurrentItemStructure(prevProps.items);
-    const newRowStructure = this.getCurrentItemStructure(this.props.items);
+    const oldRowStructure = this.getCurrentItemStructure(prevProps.listData);
+    const newRowStructure = this.getCurrentItemStructure(this.props.listData);
 
     if (
       xor(Object.keys(oldRowStructure), Object.keys(newRowStructure)).length > 0
@@ -96,12 +160,22 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
         currentItem: newRowStructure,
       });
     }
+
+    if (
+      xor(Object.keys(prevProps.template), Object.keys(this.props.template))
+        .length > 0
+    ) {
+      this.generateChildrenDefaultPropertiesMap(this.props);
+      this.generateChildrenMetaPropertiesMap(this.props);
+    }
   }
 
   static getDefaultPropertiesMap(): Record<string, string> {
-    return {
-      itemBackgroundColor: "#FFFFFF",
-    };
+    return {};
+  }
+
+  static getMetaPropertiesMap(): Record<string, string> {
+    return {};
   }
 
   /**
@@ -129,7 +203,7 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
     if (!action) return;
 
     try {
-      const rowData = [this.props.items[rowIndex]];
+      const rowData = [this.props.listData[rowIndex]];
       const { jsSnippets } = getDynamicBindings(action);
       const modifiedAction = jsSnippets.reduce((prev: string, next: string) => {
         return prev + `{{(currentItem) => { ${next} }}} `;
@@ -148,10 +222,10 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
   };
 
   renderChild = (childWidgetData: WidgetProps) => {
-    const { componentWidth, componentHeight } = this.getComponentDimensions();
+    const { componentHeight, componentWidth } = this.getComponentDimensions();
 
     childWidgetData.parentId = this.props.widgetId;
-    childWidgetData.shouldScrollContents = this.props.shouldScrollContents;
+    // childWidgetData.shouldScrollContents = this.props.shouldScrollContents;
     childWidgetData.canExtend =
       childWidgetData.virtualizedEnabled && false
         ? true
@@ -160,6 +234,9 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
     childWidgetData.minHeight = componentHeight;
     childWidgetData.rightColumn = componentWidth;
     childWidgetData.noPad = true;
+    childWidgetData.bottomRow =
+      this.props.bottomRow * this.props.parentRowSpace - 45;
+    childWidgetData.shouldScrollContents = false;
 
     return WidgetFactory.createWidget(childWidgetData, this.props.renderMode);
   };
@@ -195,9 +272,9 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
 
   updateTemplateWidgetProperties = (widget: WidgetProps, itemIndex: number) => {
     const {
-      template,
       dynamicBindingPathList,
       dynamicTriggerPathList,
+      template,
     } = this.props;
     const { widgetName = "" } = widget;
     // Update properties if they're dynamic
@@ -211,7 +288,7 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
       // Get all paths in the dynamicBindingPathList sans the List Widget name prefix
       const dynamicPaths: string[] = compact(
         dynamicBindingPathList.map((path: Record<"key", string>) =>
-          path.key.split(".").pop(),
+          path.key.replace(`template.${widgetName}.`, ""),
         ),
       );
 
@@ -219,18 +296,51 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
       // By picking the correct value from the evaluated values in the template
       dynamicPaths.forEach((path: string) => {
         const evaluatedProperty = get(template, `${widgetName}.${path}`);
+
         if (
           Array.isArray(evaluatedProperty) &&
           evaluatedProperty.length > itemIndex
         ) {
           const evaluatedValue = evaluatedProperty[itemIndex];
-          if (isPlainObject(evaluatedValue) || Array.isArray(evaluatedValue))
-            set(widget, path, JSON.stringify(evaluatedValue));
-          else set(widget, path, evaluatedValue);
+          const validationPath = get(widget, `validationPaths`)[path];
+
+          if (
+            (validationPath === VALIDATION_TYPES.BOOLEAN &&
+              isBoolean(evaluatedValue)) ||
+            validationPath === VALIDATION_TYPES.CHART_SERIES_DATA
+          ) {
+            set(widget, path, evaluatedValue);
+            set(widget, `validationMessages.${path}`, "");
+            set(widget, `invalidProps.${path}`, "");
+          } else {
+            set(widget, path, toString(evaluatedValue));
+          }
         }
       });
     }
 
+    // add default value
+    Object.keys(widget.defaultProps).map((key: string) => {
+      const defaultPropertyValue = get(widget, `${widget.defaultProps[key]}`);
+
+      set(widget, `${key}`, defaultPropertyValue);
+    });
+
+    widget.defaultMetaProps.map((key: string) => {
+      const metaPropertyValue = get(
+        this.props.childMetaProperties,
+        `${widget.widgetName}.${key}.${itemIndex}`,
+        undefined,
+      );
+
+      if (
+        typeof metaPropertyValue !== "undefined" &&
+        metaPropertyValue !== null
+      ) {
+        set(widget, key, metaPropertyValue);
+      }
+    });
+
     if (
       Array.isArray(dynamicTriggerPathList) &&
       dynamicTriggerPathList.length > 0
@@ -252,7 +362,7 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
           propertyValue.indexOf("{{((currentItem) => {") === -1
         ) {
           const { jsSnippets } = getDynamicBindings(propertyValue);
-          const listItem = this.props.items[itemIndex];
+          const listItem = this.props.listData[itemIndex];
 
           const newPropertyValue = jsSnippets.reduce(
             (prev: string, next: string) => {
@@ -282,34 +392,30 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
   ) => {
     const { page } = this.state;
     const { perPage } = this.shouldPaginate();
+    const originalIndex = ((page - 1) * perPage - itemIndex) * -1;
 
-    if (itemIndex > 0) {
-      const originalIndex = ((page - 1) * perPage - itemIndex) * -1;
+    if (originalIndex !== 0) {
+      set(
+        widget,
+        `widgetId`,
+        `list-widget-child-id-${itemIndex}-${widget.widgetName}`,
+      );
 
-      if (this.props.renderMode === RenderModes.PAGE) {
-        set(
-          widget,
-          `widgetId`,
-          `list-widget-child-id-${itemIndex}-${widget.widgetName}`,
-        );
-      }
-
-      if (originalIndex !== 0) {
-        set(
-          widget,
-          `widgetId`,
-          `list-widget-child-id-${itemIndex}-${widget.widgetName}`,
-        );
-
-        if (this.props.renderMode === RenderModes.CANVAS) {
-          set(widget, `resizeDisabled`, true);
-          set(widget, `disablePropertyPane`, true);
-          set(widget, `dragDisabled`, true);
-          set(widget, `dropDisabled`, true);
-        }
+      if (this.props.renderMode === RenderModes.CANVAS) {
+        set(widget, `resizeDisabled`, true);
+        set(widget, `disablePropertyPane`, true);
+        set(widget, `dragDisabled`, true);
+        set(widget, `dropDisabled`, true);
       }
     }
 
+    set(widget, `__metaOptions`, {
+      widgetName: this.props.widgetName,
+      widgetId: this.props.widgetId,
+      metaPropPrefix: `childMetaProperties`,
+      index: itemIndex,
+    });
+
     return widget;
   };
 
@@ -329,6 +435,7 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
           "children[0].children",
           [],
         );
+
         // If children exist
         if (listItemChildren.length > 0) {
           // Update the properties of all the children
@@ -369,6 +476,17 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
           listItemContainer,
           listItemIndex,
         );
+
+        set(updatedListItemContainer, `disabledResizeHandles`, [
+          "left",
+          "top",
+          "right",
+          "bottomRight",
+          "topLeft",
+          "topRight",
+          "bottomLeft",
+        ]);
+
         return updatedListItemContainer;
       },
     );
@@ -389,7 +507,10 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
     return children.map((child: ContainerWidgetProps<WidgetProps>, index) => {
       return {
         ...child,
-        onClick: () => this.onItemClick(index, this.props.onListItemClick),
+        onClickCapture: () =>
+          this.onItemClick(index, this.props.onListItemClick),
+        selected: this.props.selectedItemIndex === index,
+        focused: index === 0 && this.props.renderMode === RenderModes.CANVAS,
       };
     });
   };
@@ -401,7 +522,7 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
    */
   paginateItems = (children: ContainerWidgetProps<WidgetProps>[]) => {
     const { page } = this.state;
-    const { shouldPaginate, perPage } = this.shouldPaginate();
+    const { perPage, shouldPaginate } = this.shouldPaginate();
 
     if (shouldPaginate) {
       return children.slice((page - 1) * perPage, page * perPage);
@@ -449,7 +570,7 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
    * renders children
    */
   renderChildren = () => {
-    const numberOfItemsInGrid = this.props.items.length;
+    const numberOfItemsInGrid = this.props.listData.length;
     if (this.props.children && this.props.children.length > 0) {
       const children = removeFalsyEntries(this.props.children);
       const childCanvas = children[0];
@@ -472,7 +593,7 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
 
         childCanvas.children = canvasChildren;
       } catch (e) {
-        console.log({ error: e });
+        log.error(e);
       }
 
       return this.renderChild(childCanvas);
@@ -486,10 +607,11 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
    */
   shouldPaginate = () => {
     let { gridGap } = this.props;
-    const { items, children } = this.props;
+    const { children, listData } = this.props;
     const { componentHeight } = this.getComponentDimensions();
     const templateBottomRow = get(children, "0.children.0.bottomRow");
-    const templateHeight = templateBottomRow * 40;
+    const templateHeight =
+      templateBottomRow * GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
 
     try {
       gridGap = parseInt(gridGap);
@@ -502,16 +624,17 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
     }
 
     const shouldPaginate =
-      templateHeight * items.length + parseInt(gridGap) * (items.length - 1) >
+      templateHeight * listData.length +
+        parseInt(gridGap) * (listData.length - 1) >
       componentHeight;
 
-    const totalSpaceAvailable = componentHeight - (100 + WIDGET_PADDING * 2);
+    const totalSpaceAvailable = componentHeight - (110 + WIDGET_PADDING * 2);
     const spaceTakenByOneContainer =
-      templateHeight + (gridGap * (items.length - 1)) / items.length;
+      templateHeight + (gridGap * (listData.length - 1)) / listData.length;
 
     const perPage = totalSpaceAvailable / spaceTakenByOneContainer;
 
-    return { shouldPaginate, perPage: round(perPage) };
+    return { shouldPaginate, perPage: isNaN(perPage) ? 0 : round(perPage) };
   };
 
   /**
@@ -519,20 +642,65 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
    */
   getPageView() {
     const children = this.renderChildren();
-    const { shouldPaginate, perPage } = this.shouldPaginate();
+    const { componentHeight } = this.getComponentDimensions();
+    const { perPage, shouldPaginate } = this.shouldPaginate();
+    const templateBottomRow = get(
+      this.props.children,
+      "0.children.0.bottomRow",
+    );
+    const templateHeight =
+      templateBottomRow * GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
 
-    if (!isNumber(perPage) || perPage === 0) {
+    if (this.props.isLoading) {
       return (
-        <>Please make sure the list widget size is greater than the template</>
+        <ListComponentLoading className="">
+          {range(10).map((i) => (
+            <div className="bp3-card bp3-skeleton" key={`skeleton-${i}`}>
+              <h5 className="bp3-heading">
+                <a className=".modifier" href="#">
+                  Card heading
+                </a>
+              </h5>
+              <p className=".modifier">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque
+                eget tortor felis. Fusce dapibus metus in dapibus mollis.
+                Quisque eget ex diam.
+              </p>
+              <button
+                className="bp3-button bp3-icon-add .modifier"
+                type="button"
+              >
+                Submit
+              </button>
+            </div>
+          ))}
+        </ListComponentLoading>
       );
     }
 
-    if (Array.isArray(this.props.items) && this.props.items.length === 0) {
+    if (
+      Array.isArray(this.props.listData) &&
+      this.props.listData.length === 0 &&
+      this.props.renderMode === RenderModes.PAGE
+    ) {
       return <ListComponentEmpty>No data to display</ListComponentEmpty>;
     }
 
+    if (isNaN(templateHeight) || templateHeight > componentHeight - 45) {
+      return (
+        <ListComponentEmpty>
+          Please make sure the list widget height is greater than the template
+          container height.
+        </ListComponentEmpty>
+      );
+    }
+
     return (
-      <ListComponent {...this.props} hasPagination={shouldPaginate}>
+      <ListComponent
+        {...this.props}
+        hasPagination={shouldPaginate}
+        key={`list-widget-page-${this.state.page}`}
+      >
         {children}
 
         {shouldPaginate && (
@@ -541,7 +709,7 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
             disabled={false && this.props.renderMode === RenderModes.CANVAS}
             onChange={(page: number) => this.setState({ page })}
             perPage={perPage}
-            total={this.props.items.length}
+            total={this.props.listData.length}
           />
         )}
       </ListComponent>
@@ -561,7 +729,7 @@ export interface ListWidgetProps<T extends WidgetProps> extends WidgetProps {
   containerStyle?: ContainerStyle;
   shouldScrollContents?: boolean;
   onListItemClick?: string;
-  items: Array<Record<string, unknown>>;
+  listData: Array<Record<string, unknown>>;
   currentItemStructure?: Record<string, string>;
 }
 
diff --git a/app/client/src/widgets/ListWidget/derived.js b/app/client/src/widgets/ListWidget/derived.js
new file mode 100644
index 0000000000..b931869366
--- /dev/null
+++ b/app/client/src/widgets/ListWidget/derived.js
@@ -0,0 +1,109 @@
+/* eslint-disable @typescript-eslint/no-unused-vars*/
+export default {
+  getSelectedItem: (props, moment, _) => {
+    const selectedItemIndex =
+      props.selectedItemIndex === undefined ||
+      Number.isNaN(parseInt(props.selectedItemIndex))
+        ? -1
+        : parseInt(props.selectedItemIndex);
+    const items = props.listData || [];
+
+    if (selectedItemIndex === -1) {
+      const emptyRow = { ...items[0] };
+      Object.keys(emptyRow).forEach((key) => {
+        emptyRow[key] = "";
+      });
+      return emptyRow;
+    }
+
+    const selectedItem = { ...items[selectedItemIndex] };
+    return selectedItem;
+  },
+  //
+  getItems: (props, moment, _) => {
+    let item = {};
+
+    Object.keys(props.template).map((widgetName) => {
+      item[widgetName] = { ...props.template[widgetName] };
+    });
+
+    let updatedItems = [];
+
+    for (let i = 0; i < props.listData.length; i++) {
+      updatedItems[i] = JSON.parse(JSON.stringify(item));
+    }
+
+    updatedItems.map((currentItem, itemIndex) => {
+      const widgetKeys = Object.keys(currentItem);
+
+      widgetKeys.map((currentWidgetName) => {
+        const currentWidget = currentItem[currentWidgetName];
+
+        const dynamicPaths = _.compact(
+          currentWidget.dynamicBindingPathList?.map((path) => path.key),
+        );
+
+        dynamicPaths.forEach((path) => {
+          const evaluatedProperty = _.get(
+            props.template,
+            currentWidget.widgetName + "." + path,
+          );
+
+          if (Array.isArray(evaluatedProperty)) {
+            const evaluatedValue = evaluatedProperty[itemIndex];
+
+            _.set(currentWidget, path, evaluatedValue);
+          }
+        });
+
+        if (props.childrenDefaultPropertiesMap) {
+          Object.keys(props.childrenDefaultPropertiesMap).map((key) => {
+            const defaultKey = props.childrenDefaultPropertiesMap[key];
+            const widgetName = key.split(".").shift();
+
+            if (widgetName === currentWidget.widgetName) {
+              const defaultPropertyValue = _.get(
+                props.template,
+                currentWidget.widgetName + "." + defaultKey,
+                undefined,
+              );
+
+              if (Array.isArray(defaultPropertyValue)) {
+                const evaluatedValue = defaultPropertyValue[itemIndex];
+
+                _.set(currentWidget, key.split(".").pop(), evaluatedValue);
+              } else if (defaultPropertyValue) {
+                _.set(
+                  currentWidget,
+                  key.split(".").pop(),
+                  defaultPropertyValue,
+                );
+              }
+            }
+          });
+        }
+
+        const metaProperties = _.get(
+          props.childMetaProperties,
+          currentWidget.widgetName,
+          {},
+        );
+
+        Object.keys(metaProperties).map((key) => {
+          const metaPropertyValue = _.get(
+            metaProperties,
+            key + "." + itemIndex,
+            undefined,
+          );
+
+          if (typeof metaPropertyValue !== "undefined") {
+            _.set(currentWidget, key, metaPropertyValue);
+          }
+        });
+      });
+    });
+
+    return updatedItems;
+  },
+  //
+};
diff --git a/app/client/src/widgets/ListWidget/derived.test.js b/app/client/src/widgets/ListWidget/derived.test.js
new file mode 100644
index 0000000000..b7b5a2c74f
--- /dev/null
+++ b/app/client/src/widgets/ListWidget/derived.test.js
@@ -0,0 +1,55 @@
+import derivedProperty from "./derived";
+import moment from "moment";
+import _ from "lodash";
+
+describe("Validates Derived Properties", () => {
+  it("validates selectedItem property", () => {
+    const { getSelectedItem } = derivedProperty;
+    const input = {
+      listData: [{ id: 1 }, { id: 2 }],
+      selectedItemIndex: 1,
+    };
+
+    const expected = { id: 2 };
+
+    let result = getSelectedItem(input, moment, _);
+    expect(result).toStrictEqual(expected);
+  });
+
+  it("validates items property", () => {
+    const { getItems } = derivedProperty;
+    const input = {
+      listData: [1, 2],
+      template: {
+        Input1: {
+          widgetName: "Input1",
+          widgetId: "some-random-id",
+          text: [1, 2],
+          dynamicBindingPathList: [{ key: "text" }],
+        },
+      },
+    };
+
+    const expected = [
+      {
+        Input1: {
+          widgetName: "Input1",
+          widgetId: "some-random-id",
+          dynamicBindingPathList: [{ key: "text" }],
+          text: 1,
+        },
+      },
+      {
+        Input1: {
+          widgetName: "Input1",
+          widgetId: "some-random-id",
+          dynamicBindingPathList: [{ key: "text" }],
+          text: 2,
+        },
+      },
+    ];
+
+    let result = getItems(input, moment, _);
+    expect(result).toStrictEqual(expected);
+  });
+});
diff --git a/app/client/src/widgets/ListWidget/parseDerivedProperties.ts b/app/client/src/widgets/ListWidget/parseDerivedProperties.ts
new file mode 100644
index 0000000000..4ea7d1a9ca
--- /dev/null
+++ b/app/client/src/widgets/ListWidget/parseDerivedProperties.ts
@@ -0,0 +1,36 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+//@ts-ignore
+import widgetPropertyFns from "!!raw-loader!./derived.js";
+
+// TODO(abhinav):
+// Add unit test cases
+// Handle edge cases
+// Error out on wrong values
+const derivedProperties: any = {};
+// const regex = /(\w+):\s?\(props\)\s?=>\s?{([\w\W]*?)},/gim;
+const regex = /(\w+):\s?\(props, moment, _\)\s?=>\s?{([\w\W\n]*?)},\n?\s+?\/\//gim;
+
+let m;
+
+while ((m = regex.exec(widgetPropertyFns)) !== null) {
+  // This is necessary to avoid infinite loops with zero-width matches
+  if (m.index === regex.lastIndex) {
+    regex.lastIndex++;
+  }
+
+  let key = "";
+  // The result can be accessed through the `m`-variable.
+  m.forEach((match, groupIndex) => {
+    if (groupIndex === 1) {
+      key = match;
+    }
+    if (groupIndex === 2) {
+      derivedProperties[key] = match
+        .trim()
+        .replace(/\n/g, "")
+        .replace(/props\./g, "this.");
+    }
+  });
+}
+
+export default derivedProperties;
diff --git a/app/client/src/widgets/MapWidget.tsx b/app/client/src/widgets/MapWidget.tsx
index 4882fd8512..3f488db161 100644
--- a/app/client/src/widgets/MapWidget.tsx
+++ b/app/client/src/widgets/MapWidget.tsx
@@ -10,6 +10,7 @@ import * as Sentry from "@sentry/react";
 import withMeta, { WithMeta } from "./MetaHOC";
 import { DEFAULT_CENTER } from "constants/WidgetConstants";
 import { getBorderCSSShorthand } from "constants/DefaultTheme";
+import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 
 const { google } = getAppsmithConfigs();
 
@@ -63,6 +64,8 @@ class MapWidget extends BaseWidget<MapWidgetProps, WidgetState> {
             isBindProperty: true,
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.MARKERS,
+            evaluationSubstitutionType:
+              EvaluationSubstitutionType.SMART_SUBSTITUTE,
           },
           {
             propertyName: "enableSearch",
@@ -133,14 +136,14 @@ class MapWidget extends BaseWidget<MapWidgetProps, WidgetState> {
     ];
   }
 
-  static getDefaultPropertiesMap(): Record<string, string> {
+  static getDefaultPropertiesMap(): Record<string, any> {
     return {
       markers: "defaultMarkers",
       center: "mapCenter",
     };
   }
 
-  static getMetaPropertiesMap(): Record<string, undefined> {
+  static getMetaPropertiesMap(): Record<string, any> {
     return {
       center: undefined,
       markers: undefined,
diff --git a/app/client/src/widgets/MetaHOC.tsx b/app/client/src/widgets/MetaHOC.tsx
index 2ee43f1df9..9561019cb2 100644
--- a/app/client/src/widgets/MetaHOC.tsx
+++ b/app/client/src/widgets/MetaHOC.tsx
@@ -6,6 +6,7 @@ import { clearEvalPropertyCache } from "sagas/EvaluationsSaga";
 import { WidgetExecuteActionPayload } from "constants/AppsmithActionConstants/ActionConstants";
 import AppsmithConsole from "utils/AppsmithConsole";
 import { ENTITY_TYPE } from "entities/AppsmithConsole";
+import LOG_TYPE from "entities/AppsmithConsole/logtype";
 
 type DebouncedExecuteActionPayload = Omit<
   WidgetExecuteActionPayload,
@@ -86,11 +87,13 @@ const withMeta = (WrappedWidget: typeof BaseWidget) => {
       }
 
       AppsmithConsole.info({
+        logType: LOG_TYPE.WIDGET_UPDATE,
         text: "Widget property was updated",
         source: {
           type: ENTITY_TYPE.WIDGET,
           id: this.props.widgetId,
           name: this.props.widgetName,
+          propertyPath: propertyName,
         },
         state: {
           [propertyName]: propertyValue,
@@ -122,8 +125,9 @@ const withMeta = (WrappedWidget: typeof BaseWidget) => {
     };
 
     handleUpdateWidgetMetaProperty() {
-      const { updateWidgetMetaProperty, executeAction } = this.context;
+      const { executeAction, updateWidgetMetaProperty } = this.context;
       const { widgetId, widgetName } = this.props;
+      const metaOptions = this.props.__metaOptions;
       /*
        We have kept a map of all updated properties. After debouncing we will
        go through these properties and update with the final value. This way
@@ -131,11 +135,24 @@ const withMeta = (WrappedWidget: typeof BaseWidget) => {
        Then we will execute any action associated with the trigger of
        that value changing
       */
+
       [...this.updatedProperties.keys()].forEach((propertyName) => {
         if (updateWidgetMetaProperty) {
           const propertyValue = this.state[propertyName];
+
           clearEvalPropertyCache(`${widgetName}.${propertyName}`);
+          // step 6 - look at this.props.options, check for metaPropPath value
+          // if they exist, then update the propertyName
           updateWidgetMetaProperty(widgetId, propertyName, propertyValue);
+
+          if (metaOptions) {
+            updateWidgetMetaProperty(
+              metaOptions.widgetId,
+              `${metaOptions.metaPropPrefix}.${this.props.widgetName}.${propertyName}[${metaOptions.index}]`,
+              propertyValue,
+            );
+          }
+
           this.updatedProperties.delete(propertyName);
         }
         const debouncedPayload = this.propertyTriggers.get(propertyName);
diff --git a/app/client/src/widgets/ModalWidget.tsx b/app/client/src/widgets/ModalWidget.tsx
index 07cada407e..6fae51bd08 100644
--- a/app/client/src/widgets/ModalWidget.tsx
+++ b/app/client/src/widgets/ModalWidget.tsx
@@ -3,6 +3,7 @@ import React, { ReactNode } from "react";
 import { connect } from "react-redux";
 import { ReduxActionTypes } from "constants/ReduxActionConstants";
 import BaseWidget, { WidgetProps, WidgetState } from "./BaseWidget";
+import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import WidgetFactory from "utils/WidgetFactory";
 import ModalComponent from "components/designSystems/blueprint/ModalComponent";
 import {
@@ -20,11 +21,13 @@ import { getWidget } from "sagas/selectors";
 const MODAL_SIZE: { [id: string]: { width: number; height: number } } = {
   MODAL_SMALL: {
     width: 456,
-    height: GridDefaults.DEFAULT_GRID_ROW_HEIGHT * 6,
+    // adjust if DEFAULT_GRID_ROW_HEIGHT changes
+    height: GridDefaults.DEFAULT_GRID_ROW_HEIGHT * 24,
   },
   MODAL_LARGE: {
     width: 532,
-    height: GridDefaults.DEFAULT_GRID_ROW_HEIGHT * 15,
+    // adjust if DEFAULT_GRID_ROW_HEIGHT changes
+    height: GridDefaults.DEFAULT_GRID_ROW_HEIGHT * 60,
   },
 };
 
@@ -68,6 +71,20 @@ export class ModalWidget extends BaseWidget<ModalWidgetProps, WidgetState> {
           },
         ],
       },
+      {
+        sectionName: "Actions",
+        children: [
+          {
+            helpText: "Triggers an action when the modal is closed",
+            propertyName: "onClose",
+            label: "onClose",
+            controlType: "ACTION_SELECTOR",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: true,
+          },
+        ],
+      },
     ];
   }
   static defaultProps = {
@@ -97,6 +114,18 @@ export class ModalWidget extends BaseWidget<ModalWidgetProps, WidgetState> {
     return WidgetFactory.createWidget(childWidgetData, this.props.renderMode);
   };
 
+  onModalClose = () => {
+    if (this.props.onClose) {
+      super.executeAction({
+        triggerPropertyName: "onClose",
+        dynamicString: this.props.onClose,
+        event: {
+          type: EventType.ON_MODAL_CLOSE,
+        },
+      });
+    }
+  };
+
   closeModal = (e: any) => {
     this.props.showPropertyPane(undefined);
     // TODO(abhinav): Create a static property with is a map of widget properties
@@ -122,6 +151,7 @@ export class ModalWidget extends BaseWidget<ModalWidgetProps, WidgetState> {
         height={MODAL_SIZE[this.props.size].height}
         isOpen={!!this.props.isVisible}
         onClose={this.closeModal}
+        onModalClose={this.onModalClose}
         scrollContents={!!this.props.shouldScrollContents}
         width={this.getModalWidth()}
       >
@@ -157,6 +187,7 @@ export interface ModalWidgetProps extends WidgetProps, WithMeta {
   canEscapeKeyClose?: boolean;
   shouldScrollContents?: boolean;
   size: string;
+  onClose: string;
   mainContainer: WidgetProps;
 }
 
diff --git a/app/client/src/widgets/RadioGroupWidget.tsx b/app/client/src/widgets/RadioGroupWidget.tsx
index b3a7c9f4ec..f3e81cd269 100644
--- a/app/client/src/widgets/RadioGroupWidget.tsx
+++ b/app/client/src/widgets/RadioGroupWidget.tsx
@@ -6,6 +6,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { VALIDATION_TYPES } from "constants/WidgetValidation";
 import * as Sentry from "@sentry/react";
 import withMeta, { WithMeta } from "./MetaHOC";
+import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 
 class RadioGroupWidget extends BaseWidget<RadioGroupWidgetProps, WidgetState> {
   static getPropertyPaneConfig() {
@@ -23,6 +24,8 @@ class RadioGroupWidget extends BaseWidget<RadioGroupWidgetProps, WidgetState> {
             isBindProperty: true,
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.OPTIONS_DATA,
+            evaluationSubstitutionType:
+              EvaluationSubstitutionType.SMART_SUBSTITUTE,
           },
           {
             helpText: "Selects a value of the options entered by default",
diff --git a/app/client/src/widgets/RateWidget/index.tsx b/app/client/src/widgets/RateWidget/index.tsx
new file mode 100644
index 0000000000..ffd7aab1a5
--- /dev/null
+++ b/app/client/src/widgets/RateWidget/index.tsx
@@ -0,0 +1,191 @@
+import React from "react";
+import BaseWidget, { WidgetProps, WidgetState } from "../BaseWidget";
+import { WidgetType, RateSize } from "constants/WidgetConstants";
+import RateComponent from "components/designSystems/blueprint/RateComponent";
+import { VALIDATION_TYPES } from "constants/WidgetValidation";
+import { DerivedPropertiesMap } from "utils/WidgetFactory";
+import * as Sentry from "@sentry/react";
+import withMeta, { WithMeta } from "widgets/MetaHOC";
+import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
+
+class RateWidget extends BaseWidget<RateWidgetProps, WidgetState> {
+  static getPropertyPaneConfig() {
+    return [
+      {
+        sectionName: "General",
+        children: [
+          {
+            propertyName: "maxCount",
+            helpText: "Sets the maximum limit of the number of stars",
+            label: "Max count",
+            controlType: "INPUT_TEXT",
+            placeholderText: "Enter max count",
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.RATE_MAX_COUNT,
+          },
+          {
+            propertyName: "defaultRate",
+            helpText: "Sets the default number of stars",
+            label: "Default rate",
+            controlType: "INPUT_TEXT",
+            placeholderText: "Enter default value",
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.RATE_DEFAULT_RATE,
+          },
+          {
+            propertyName: "activeColor",
+            label: "Active color",
+            controlType: "COLOR_PICKER",
+            isBindProperty: false,
+            isTriggerProperty: false,
+          },
+          {
+            propertyName: "inactiveColor",
+            label: "Inactive color",
+            controlType: "COLOR_PICKER",
+            isBindProperty: false,
+            isTriggerProperty: false,
+          },
+          {
+            propertyName: "tooltips",
+            helpText: "Sets the tooltip contents of stars",
+            label: "Tooltips",
+            controlType: "INPUT_TEXT",
+            placeholderText: "Enter tooltips array",
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.ARRAY_OPTIONAL,
+          },
+          {
+            propertyName: "size",
+            label: "Size",
+            controlType: "DROP_DOWN",
+            options: [
+              {
+                label: "Small",
+                value: "SMALL",
+              },
+              {
+                label: "Medium",
+                value: "MEDIUM",
+              },
+              {
+                label: "Large",
+                value: "LARGE",
+              },
+            ],
+            isBindProperty: false,
+            isTriggerProperty: false,
+          },
+          {
+            propertyName: "isAllowHalf",
+            helpText: "Controls if user can submit half stars",
+            label: "Allow half stars",
+            controlType: "SWITCH",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.BOOLEAN,
+          },
+          {
+            propertyName: "isVisible",
+            helpText: "Controls the visibility of the widget",
+            label: "Visible",
+            controlType: "SWITCH",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.BOOLEAN,
+          },
+          {
+            propertyName: "isDisabled",
+            helpText: "Disables input to the widget",
+            label: "Disabled",
+            controlType: "SWITCH",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.BOOLEAN,
+          },
+        ],
+      },
+      {
+        sectionName: "Actions",
+        children: [
+          {
+            helpText: "Triggers an action when the rate is changed",
+            propertyName: "onRateChanged",
+            label: "onChange",
+            controlType: "ACTION_SELECTOR",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: true,
+          },
+        ],
+      },
+    ];
+  }
+
+  static getDefaultPropertiesMap(): Record<string, string> {
+    return {
+      rate: "defaultRate",
+    };
+  }
+
+  static getDerivedPropertiesMap(): DerivedPropertiesMap {
+    return {
+      value: `{{ this.rate }}`,
+    };
+  }
+
+  static getMetaPropertiesMap(): Record<string, any> {
+    return {
+      rate: undefined,
+    };
+  }
+
+  valueChangedHandler = (value: number) => {
+    this.props.updateWidgetMetaProperty("rate", value, {
+      triggerPropertyName: "onRateChanged",
+      dynamicString: this.props.onRateChanged,
+      event: {
+        type: EventType.ON_RATE_CHANGED,
+      },
+    });
+  };
+
+  getPageView() {
+    return (
+      (this.props.rate || this.props.rate === 0) && (
+        <RateComponent
+          key={this.props.widgetId}
+          onValueChanged={this.valueChangedHandler}
+          readonly={this.props.isDisabled}
+          value={this.props.rate}
+          {...this.props}
+        />
+      )
+    );
+  }
+
+  getWidgetType(): WidgetType {
+    return "RATE_WIDGET";
+  }
+}
+
+export interface RateWidgetProps extends WidgetProps, WithMeta {
+  maxCount: number;
+  size: RateSize;
+  defaultRate?: number;
+  rate?: number;
+  activeColor?: string;
+  inactiveColor?: string;
+  isAllowHalf?: boolean;
+  onRateChanged?: string;
+  tooltips?: Array<string>;
+}
+
+export default RateWidget;
+export const ProfiledRateWidget = Sentry.withProfiler(withMeta(RateWidget));
diff --git a/app/client/src/widgets/RichTextEditorWidget.tsx b/app/client/src/widgets/RichTextEditorWidget.tsx
index bbce76d93b..7c1adc09e5 100644
--- a/app/client/src/widgets/RichTextEditorWidget.tsx
+++ b/app/client/src/widgets/RichTextEditorWidget.tsx
@@ -61,6 +61,16 @@ class RichTextEditorWidget extends BaseWidget<
             isTriggerProperty: false,
             validation: VALIDATION_TYPES.TEXT,
           },
+          {
+            propertyName: "isRequired",
+            label: "Required",
+            helpText: "Makes input to the widget mandatory",
+            controlType: "SWITCH",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+            validation: VALIDATION_TYPES.BOOLEAN,
+          },
           {
             propertyName: "isVisible",
             label: "Visible",
@@ -115,6 +125,7 @@ class RichTextEditorWidget extends BaseWidget<
   static getDerivedPropertiesMap(): DerivedPropertiesMap {
     return {
       value: `{{this.text}}`,
+      isValid: `{{ this.isRequired ? this.text && this.text.length : true }}`,
     };
   }
 
@@ -162,6 +173,7 @@ export interface RichTextEditorWidgetProps extends WidgetProps, WithMeta {
   onTextChange?: string;
   isDisabled?: boolean;
   isVisible?: boolean;
+  isRequired?: boolean;
 }
 
 export default RichTextEditorWidget;
diff --git a/app/client/src/widgets/TableWidget/TablePropertyPaneConfig.ts b/app/client/src/widgets/TableWidget/TablePropertyPaneConfig.ts
index 2273b8ed17..3d7ff354cf 100644
--- a/app/client/src/widgets/TableWidget/TablePropertyPaneConfig.ts
+++ b/app/client/src/widgets/TableWidget/TablePropertyPaneConfig.ts
@@ -3,6 +3,7 @@ import { Colors } from "constants/Colors";
 import { ColumnProperties } from "components/designSystems/appsmith/TableComponent/Constants";
 import { TableWidgetProps } from "./TableWidgetConstants";
 import { VALIDATION_TYPES } from "constants/WidgetValidation";
+import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 
 // A hook to update all column styles when global table styles are updated
 const updateColumnStyles = (
@@ -144,6 +145,7 @@ export default [
         isBindProperty: true,
         isTriggerProperty: false,
         validation: VALIDATION_TYPES.TABLE_DATA,
+        evaluationSubstitutionType: EvaluationSubstitutionType.SMART_SUBSTITUTE,
       },
       {
         helpText: "Columns",
@@ -201,6 +203,24 @@ export default [
                   isBindProperty: false,
                   isTriggerProperty: false,
                 },
+                {
+                  propertyName: "displayText",
+                  label: "Display Text",
+                  controlType: "COMPUTE_VALUE",
+                  customJSControl: "COMPUTE_VALUE",
+                  updateHook: updateDerivedColumnsHook,
+                  hidden: (props: TableWidgetProps, propertyPath: string) => {
+                    const baseProperty = getBasePropertyPath(propertyPath);
+                    const columnType = get(
+                      props,
+                      `${baseProperty}.columnType`,
+                      "",
+                    );
+                    return columnType !== "url";
+                  },
+                  isBindProperty: false,
+                  isTriggerProperty: false,
+                },
                 {
                   propertyName: "computedValue",
                   label: "Computed Value",
@@ -304,6 +324,7 @@ export default [
                       value: "MM/DD/YY",
                     },
                   ],
+                  defaultValue: "YYYY-MM-DD HH:mm",
                   customJSControl: "COMPUTE_VALUE",
                   isJSConvertible: true,
                   updateHook: updateDerivedColumnsHook,
@@ -407,6 +428,7 @@ export default [
                       value: "MM/DD/YY",
                     },
                   ],
+                  defaultValue: "YYYY-MM-DD HH:mm",
                   updateHook: updateDerivedColumnsHook,
                   hidden: (props: TableWidgetProps, propertyPath: string) => {
                     const baseProperty = getBasePropertyPath(propertyPath);
@@ -425,8 +447,6 @@ export default [
             {
               sectionName: "Styles",
               hidden: (props: TableWidgetProps, propertyPath: string) => {
-                // const baseProperty = getBasePropertyPath(propertyPath);
-                // console.log("Table log:", { baseProperty }, { propertyPath });
                 const columnType = get(props, `${propertyPath}.columnType`, "");
 
                 return (
@@ -719,6 +739,51 @@ export default [
       },
     ],
   },
+  {
+    sectionName: "Header options",
+    children: [
+      {
+        helpText: "Toggle visibility of the search box",
+        propertyName: "isVisibleSearch",
+        label: "Search",
+        controlType: "SWITCH",
+        isBindProperty: false,
+        isTriggerProperty: false,
+      },
+      {
+        helpText: "Toggle visibility of the filters",
+        propertyName: "isVisibleFilters",
+        label: "Filters",
+        controlType: "SWITCH",
+        isBindProperty: false,
+        isTriggerProperty: false,
+      },
+      {
+        helpText: "Toggle visibility of the data download",
+        propertyName: "isVisibleDownload",
+        label: "Download",
+        controlType: "SWITCH",
+        isBindProperty: false,
+        isTriggerProperty: false,
+      },
+      {
+        helpText: "Toggle visibility of the row height",
+        propertyName: "isVisibleCompactMode",
+        label: "Row Height",
+        controlType: "SWITCH",
+        isBindProperty: false,
+        isTriggerProperty: false,
+      },
+      {
+        helpText: "Toggle visibility of the pagination",
+        propertyName: "isVisiblePagination",
+        label: "Pagination",
+        controlType: "SWITCH",
+        isBindProperty: false,
+        isTriggerProperty: false,
+      },
+    ],
+  },
   {
     sectionName: "Styles",
     children: [
diff --git a/app/client/src/widgets/TableWidget/derived.js b/app/client/src/widgets/TableWidget/derived.js
index 1d5a39e4fe..fb552096f7 100644
--- a/app/client/src/widgets/TableWidget/derived.js
+++ b/app/client/src/widgets/TableWidget/derived.js
@@ -20,7 +20,9 @@ export default {
   },
   //
   getSelectedRows: (props, moment, _) => {
-    const selectedRowIndices = props.selectedRowIndices || [];
+    const selectedRowIndices = Array.isArray(props.selectedRowIndices)
+      ? props.selectedRowIndices
+      : [props.selectedRowIndices];
     const filteredTableData =
       props.filteredTableData || props.sanitizedTableData || [];
 
@@ -95,7 +97,7 @@ export default {
   //
   getTableColumns: (props, moment, _) => {
     let columns = [];
-    let allColumns = props.primaryColumns || {};
+    let allColumns = Object.assign({}, props.primaryColumns || {});
     const data = props.sanitizedTableData || [];
     if (data.length > 0) {
       const columnIdsFromData = [];
@@ -169,7 +171,7 @@ export default {
     }
     const allColumnProperties = Object.values(allColumns);
     for (let index = 0; index < allColumnProperties.length; index++) {
-      const columnProperties = allColumnProperties[index];
+      const columnProperties = { ...allColumnProperties[index] };
       columnProperties.isAscOrder =
         columnProperties.id === sortColumn ? sortOrder : undefined;
       const columnData = columnProperties;
@@ -195,7 +197,11 @@ export default {
             try {
               computedValues = JSON.parse(column.computedValue);
             } catch (e) {
-              console.log("Error parsing column value: ", column.computedValue);
+              console.error(
+                e,
+                "Error parsing column value: ",
+                column.computedValue,
+              );
             }
           } else if (Array.isArray(column.computedValue)) {
             computedValues = column.computedValue;
@@ -285,7 +291,10 @@ export default {
       isExactly: (a, b) => {
         return a.toString() === b.toString();
       },
-      empty: _.isEmpty,
+      empty: (a) => {
+        if (a === null || a === undefined || a === "") return true;
+        return _.isEmpty(a.toString());
+      },
       notEmpty: (a) => {
         return a !== "" && a !== undefined && a !== null;
       },
@@ -317,7 +326,10 @@ export default {
       },
       contains: (a, b) => {
         try {
-          return a.toString().includes(b.toString());
+          return a
+            .toString()
+            .toLowerCase()
+            .includes(b.toString().toLowerCase());
         } catch (e) {
           return false;
         }
@@ -331,15 +343,20 @@ export default {
       },
       startsWith: (a, b) => {
         try {
-          return a.toString().indexOf(b.toString()) === 0;
+          return (
+            a
+              .toString()
+              .toLowerCase()
+              .indexOf(b.toString().toLowerCase()) === 0
+          );
         } catch (e) {
           return false;
         }
       },
       endsWith: (a, b) => {
         try {
-          const _a = a.toString();
-          const _b = b.toString();
+          const _a = a.toString().toLowerCase();
+          const _b = b.toString().toLowerCase();
 
           return _a.length === _a.indexOf(_b) + _b.length;
         } catch (e) {
@@ -360,7 +377,10 @@ export default {
       },
     };
 
-    const searchKey = props.searchText ? props.searchText.toLowerCase() : "";
+    const searchKey =
+      props.searchText && !props.onSearchTextChanged
+        ? props.searchText.toLowerCase()
+        : "";
 
     const finalTableData = sortedTableData.filter((item) => {
       const searchFound = searchKey
@@ -385,7 +405,7 @@ export default {
             );
           }
         } catch (e) {
-          console.log(e);
+          console.error(e);
         }
         const filterValue = result;
         if (filterOperator === "AND") {
diff --git a/app/client/src/widgets/TableWidget/derived.test.js b/app/client/src/widgets/TableWidget/derived.test.js
index 0534e52af1..9427b2baba 100644
--- a/app/client/src/widgets/TableWidget/derived.test.js
+++ b/app/client/src/widgets/TableWidget/derived.test.js
@@ -674,4 +674,141 @@ describe("Validates Derived Properties", () => {
     let result = getFilteredTableData(input, moment, _);
     expect(result).toStrictEqual(expected);
   });
+
+  it("validates generated filtered table data to be filtered correctly in empty comparison", () => {
+    const { getFilteredTableData } = derivedProperty;
+    const input = {
+      sanitizedTableData: [
+        { id: 1234, name: "Jim Doe" },
+        { id: 123, name: "John Doe" },
+        { id: 234, name: "Jane Doe" },
+      ],
+      filters: [
+        {
+          condition: "empty",
+          column: "id",
+          value: "",
+          operator: "OR",
+        },
+      ],
+      sortedColumn: { column: "id", asc: false },
+      columnOrder: ["name", "id"],
+      primaryColumns: {
+        id: {
+          index: 1,
+          width: 150,
+          id: "id",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "number",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "id",
+          isAscOrder: false,
+          computedValue: [1234, 123, 234],
+        },
+        name: {
+          index: 0,
+          width: 150,
+          id: "name",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "text",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "awesome",
+          isAscOrder: undefined,
+          computedValue: ["Jim Doe", "John Doe", "Jane Doe"],
+        },
+        extra: {
+          index: 2,
+          width: 150,
+          id: "extra",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "text",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          label: "extra",
+          isAscOrder: undefined,
+          computedValue: ["", "Extra1", "Extra2"],
+          isDerived: true,
+        },
+      },
+      tableColumns: [
+        {
+          index: 0,
+          width: 150,
+          id: "name",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "text",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "awesome",
+          isAscOrder: undefined,
+          computedValue: ["Jim Doe", "John Doe", "Jane Doe"],
+        },
+        {
+          index: 1,
+          width: 150,
+          id: "id",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "number",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "id",
+          isAscOrder: false,
+          computedValue: [1234, 123, 234],
+        },
+        {
+          index: 2,
+          width: 150,
+          id: "extra",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "text",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          label: "extra",
+          isAscOrder: undefined,
+          computedValue: ["", "Extra1", "Extra2"],
+          isDerived: true,
+        },
+      ],
+    };
+    const expected = [];
+
+    let result = getFilteredTableData(input, moment, _);
+    expect(result).toStrictEqual(expected);
+  });
 });
diff --git a/app/client/src/widgets/TableWidget/index.tsx b/app/client/src/widgets/TableWidget/index.tsx
index ba4f1acb18..7975420a88 100644
--- a/app/client/src/widgets/TableWidget/index.tsx
+++ b/app/client/src/widgets/TableWidget/index.tsx
@@ -120,6 +120,11 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
       textSize: this.getPropertyValue(columnProperties.textSize, rowIndex),
       textColor: this.getPropertyValue(columnProperties.textColor, rowIndex),
       fontStyle: this.getPropertyValue(columnProperties.fontStyle, rowIndex), //Fix this
+      displayText: this.getPropertyValue(
+        columnProperties.displayText,
+        rowIndex,
+        true,
+      ),
     };
     return cellProperties;
   };
@@ -132,11 +137,8 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
 
     let totalColumnSizes = 0;
     const defaultColumnWidth = 150;
-    for (const i in columnSizeMap) {
-      totalColumnSizes += columnSizeMap[i];
-    }
-
     const allColumnProperties = this.props.tableColumns || [];
+
     for (let index = 0; index < allColumnProperties.length; index++) {
       const columnProperties = allColumnProperties[index];
       const isHidden = !columnProperties.isVisible;
@@ -213,6 +215,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
         columnData.isHidden = true;
         hiddenColumns.push(columnData);
       } else {
+        totalColumnSizes += columnData.width;
         columns.push(columnData);
       }
     }
@@ -603,40 +606,66 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
     return selectedRowIndices;
   };
 
+  applyFilters = (filters: ReactTableFilter[]) => {
+    this.resetSelectedRowIndex();
+    this.props.updateWidgetMetaProperty("filters", filters);
+  };
+
+  toggleDrag = (disable: boolean) => {
+    this.disableDrag(disable);
+  };
+
   getPageView() {
-    const { pageSize, filteredTableData = [] } = this.props;
+    const {
+      pageSize,
+      filteredTableData = [],
+      isVisibleCompactMode,
+      isVisibleDownload,
+      isVisibleFilters,
+      isVisiblePagination,
+      isVisibleSearch,
+    } = this.props;
     const tableColumns = this.getTableColumns() || [];
     const transformedData = this.transformData(filteredTableData, tableColumns);
-    const { componentWidth, componentHeight } = this.getComponentDimensions();
+    const { componentHeight, componentWidth } = this.getComponentDimensions();
+    const isVisibleHeaderOptions =
+      isVisibleCompactMode ||
+      isVisibleDownload ||
+      isVisibleFilters ||
+      isVisiblePagination ||
+      isVisibleSearch;
 
     return (
       <Suspense fallback={<Skeleton />}>
         <ReactTableComponent
-          applyFilter={(filters: ReactTableFilter[]) => {
-            this.resetSelectedRowIndex();
-            this.props.updateWidgetMetaProperty("filters", filters);
-          }}
+          applyFilter={this.applyFilters}
           columnSizeMap={this.props.columnSizeMap}
           columns={tableColumns}
           compactMode={this.props.compactMode || CompactModeTypes.DEFAULT}
-          disableDrag={(disable: boolean) => {
-            this.disableDrag(disable);
-          }}
+          disableDrag={this.toggleDrag}
           editMode={this.props.renderMode === RenderModes.CANVAS}
           filters={this.props.filters}
           handleReorderColumn={this.handleReorderColumn}
           handleResizeColumn={this.handleResizeColumn}
           height={componentHeight}
           isLoading={this.props.isLoading}
+          isVisibleCompactMode={isVisibleCompactMode}
+          isVisibleDownload={isVisibleDownload}
+          isVisibleFilters={isVisibleFilters}
+          isVisiblePagination={isVisiblePagination}
+          isVisibleSearch={isVisibleSearch}
           multiRowSelection={this.props.multiRowSelection}
           nextPageClick={this.handleNextPageClick}
           onCommandClick={this.onCommandClick}
           onRowClick={this.handleRowClick}
           pageNo={this.props.pageNo}
-          pageSize={Math.max(1, pageSize)}
+          pageSize={
+            isVisibleHeaderOptions ? Math.max(1, pageSize) : pageSize + 1
+          }
           prevPageClick={this.handlePrevPageClick}
           searchKey={this.props.searchText}
           searchTableData={this.handleSearchTable}
+          selectAllRow={this.handleAllRowSelect}
           selectedRowIndex={
             this.props.selectedRowIndex === undefined
               ? -1
@@ -647,6 +676,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
           sortTableColumn={this.handleColumnSorting}
           tableData={transformedData}
           triggerRowSelection={this.props.triggerRowSelection}
+          unSelectAllRow={this.resetSelectedRowIndex}
           updateCompactMode={this.handleCompactModeChange}
           updatePageNo={this.updatePageNumber}
           widgetId={this.props.widgetId}
@@ -739,6 +769,18 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
     });
   };
 
+  handleAllRowSelect = (pageData: Record<string, unknown>[]) => {
+    if (this.props.multiRowSelection) {
+      const selectedRowIndices = pageData.map(
+        (row: Record<string, unknown>) => row.index,
+      );
+      this.props.updateWidgetMetaProperty(
+        "selectedRowIndices",
+        selectedRowIndices,
+      );
+    }
+  };
+
   handleRowClick = (rowData: Record<string, unknown>, index: number) => {
     if (this.props.multiRowSelection) {
       const selectedRowIndices = this.props.selectedRowIndices
diff --git a/app/client/src/widgets/Tabs/TabsMigrator.tsx b/app/client/src/widgets/Tabs/TabsMigrator.tsx
index ddfa41c674..9ba75b9ff1 100644
--- a/app/client/src/widgets/Tabs/TabsMigrator.tsx
+++ b/app/client/src/widgets/Tabs/TabsMigrator.tsx
@@ -4,8 +4,9 @@ import { WidgetType, WidgetTypes } from "constants/WidgetConstants";
 import withMeta from "widgets/MetaHOC";
 import * as Sentry from "@sentry/react";
 import { migrateTabsData } from "utils/WidgetPropsUtils";
-import { cloneDeep } from "lodash";
+import { cloneDeep, get } from "lodash";
 import { VALIDATION_TYPES } from "constants/WidgetValidation";
+import { EVAL_VALUE_PATH } from "utils/DynamicBindingUtils";
 
 class TabsMigratorWidget extends BaseWidget<
   TabsWidgetProps<TabContainerWidgetProps>,
@@ -84,7 +85,7 @@ class TabsMigratorWidget extends BaseWidget<
     ];
   }
   componentDidMount() {
-    if (this.props.evaluatedValues) {
+    if (get(this.props, EVAL_VALUE_PATH, false)) {
       const tabsDsl = cloneDeep(this.props);
       const migratedTabsDsl = migrateTabsData(tabsDsl);
       this.batchUpdateWidgetProperty({
diff --git a/app/client/src/widgets/Tabs/TabsWidget.test.tsx b/app/client/src/widgets/Tabs/TabsWidget.test.tsx
index 72635ff1d5..fff9f140c4 100644
--- a/app/client/src/widgets/Tabs/TabsWidget.test.tsx
+++ b/app/client/src/widgets/Tabs/TabsWidget.test.tsx
@@ -3,48 +3,20 @@ import {
   widgetCanvasFactory,
 } from "test/factories/WidgetFactoryUtils";
 import { render, fireEvent } from "test/testUtils";
-
 import Canvas from "pages/Editor/Canvas";
 import React from "react";
-import { useDispatch } from "react-redux";
-import { editorInitializer } from "utils/EditorUtils";
-import { initCanvasLayout } from "actions/pageActions";
-import { getCanvasWidgetsPayload } from "sagas/PageSagas";
-import { noop } from "utils/AppsmithUtils";
+import { MockPageDSL } from "test/testCommon";
 
-Element.prototype.scrollTo = noop;
-function SetCanvas({ dsl, children }: any) {
-  const dispatch = useDispatch();
-  const mockResp: any = {
-    data: {
-      id: "asa",
-      name: "App",
-      applicationId: "asa",
-      layouts: [
-        {
-          id: "w323",
-          dsl,
-          layoutOnLoadActions: [],
-          layoutActions: [],
-        },
-      ],
-    },
-  };
-  const canvasWidgetsPayload = getCanvasWidgetsPayload(mockResp);
-  dispatch(initCanvasLayout(canvasWidgetsPayload));
-  return children;
-}
 describe("Tabs widget functional cases", () => {
   it("Should render 2 tabs by default", () => {
-    editorInitializer();
     const children: any = buildChildren([{ type: "TABS_WIDGET" }]);
     const dsl: any = widgetCanvasFactory.build({
       children,
     });
     const component = render(
-      <SetCanvas dsl={dsl}>
+      <MockPageDSL dsl={dsl}>
         <Canvas dsl={dsl} />
-      </SetCanvas>,
+      </MockPageDSL>,
     );
     const tab1 = component.queryByText("Tab 1");
     const tab2 = component.queryByText("Tab 2");
@@ -53,7 +25,6 @@ describe("Tabs widget functional cases", () => {
   });
 
   it("Should render components inside tabs by default", () => {
-    editorInitializer();
     const tab1Children = buildChildren([
       { type: "SWITCH_WIDGET", label: "Tab1 Switch" },
       { type: "CHECKBOX_WIDGET", label: "Tab1 Checkbox" },
@@ -69,9 +40,9 @@ describe("Tabs widget functional cases", () => {
       children,
     });
     const component = render(
-      <SetCanvas dsl={dsl}>
+      <MockPageDSL dsl={dsl}>
         <Canvas dsl={dsl} />
-      </SetCanvas>,
+      </MockPageDSL>,
     );
     const tab1 = component.queryByText("Tab 1");
     const tab2: any = component.queryByText("Tab 2");
diff --git a/app/client/src/widgets/Tabs/TabsWidget.tsx b/app/client/src/widgets/Tabs/TabsWidget.tsx
index 664d6d61f9..39e6319e3c 100644
--- a/app/client/src/widgets/Tabs/TabsWidget.tsx
+++ b/app/client/src/widgets/Tabs/TabsWidget.tsx
@@ -10,6 +10,7 @@ import { WidgetOperations } from "widgets/BaseWidget";
 import * as Sentry from "@sentry/react";
 import { generateReactKey } from "utils/generators";
 import withMeta, { WithMeta } from "../MetaHOC";
+import { GRID_DENSITY_MIGRATION_V1 } from "mockResponses/WidgetConfigResponse";
 
 class TabsWidget extends BaseWidget<
   TabsWidgetProps<TabContainerWidgetProps>,
@@ -136,7 +137,7 @@ class TabsWidget extends BaseWidget<
     };
   }
 
-  static getMetaPropertiesMap() {
+  static getMetaPropertiesMap(): Record<string, any> {
     return {
       selectedTabWidgetId: undefined,
     };
@@ -170,7 +171,7 @@ class TabsWidget extends BaseWidget<
     }
     childWidgetData.shouldScrollContents = false;
     childWidgetData.canExtend = this.props.shouldScrollContents;
-    const { componentWidth, componentHeight } = this.getComponentDimensions();
+    const { componentHeight, componentWidth } = this.getComponentDimensions();
     childWidgetData.rightColumn = componentWidth;
     childWidgetData.isVisible = this.props.isVisible;
     childWidgetData.bottomRow = this.props.shouldScrollContents
@@ -196,8 +197,11 @@ class TabsWidget extends BaseWidget<
         const columns =
           (this.props.rightColumn - this.props.leftColumn) *
           this.props.parentColumnSpace;
+        // GRID_DENSITY_MIGRATION_V1 used to adjust code as per new scaled canvas.
         const rows =
-          (this.props.bottomRow - this.props.topRow - 1) *
+          (this.props.bottomRow -
+            this.props.topRow -
+            GRID_DENSITY_MIGRATION_V1) *
           this.props.parentRowSpace;
         const config = {
           type: WidgetTypes.CANVAS_WIDGET,
@@ -206,6 +210,13 @@ class TabsWidget extends BaseWidget<
           topRow: 1,
           newWidgetId,
           widgetId: this.props.widgetId,
+          leftColumn: 0,
+          rightColumn:
+            (this.props.rightColumn - this.props.leftColumn) *
+            this.props.parentColumnSpace,
+          bottomRow:
+            (this.props.bottomRow - this.props.topRow) *
+            this.props.parentRowSpace,
           props: {
             tabId: tab.id,
             tabName: tab.label,
diff --git a/app/client/src/widgets/TextWidget.tsx b/app/client/src/widgets/TextWidget.tsx
index 22c291cadc..745cdd76c4 100644
--- a/app/client/src/widgets/TextWidget.tsx
+++ b/app/client/src/widgets/TextWidget.tsx
@@ -56,8 +56,10 @@ class TextWidget extends BaseWidget<TextWidgetProps, WidgetState> {
             propertyName: "textColor",
             label: "Text Color",
             controlType: "COLOR_PICKER",
-            isBindProperty: false,
+            isJSConvertible: true,
+            isBindProperty: true,
             isTriggerProperty: false,
+            validation: VALIDATION_TYPES.COLOR_PICKER_TEXT,
           },
           {
             propertyName: "fontSize",
diff --git a/app/client/src/widgets/VideoWidget.tsx b/app/client/src/widgets/VideoWidget.tsx
index 16dbf4d462..bcb4997576 100644
--- a/app/client/src/widgets/VideoWidget.tsx
+++ b/app/client/src/widgets/VideoWidget.tsx
@@ -111,7 +111,7 @@ class VideoWidget extends BaseWidget<VideoWidgetProps, WidgetState> {
   }
 
   getPageView() {
-    const { url, autoPlay, onEnd, onPause, onPlay } = this.props;
+    const { autoPlay, onEnd, onPause, onPlay, url } = this.props;
     return (
       <Suspense fallback={<Skeleton />}>
         <VideoComponent
diff --git a/app/client/src/workers/DataTreeEvaluator.ts b/app/client/src/workers/DataTreeEvaluator.ts
index 767815b367..7c7c03caf0 100644
--- a/app/client/src/workers/DataTreeEvaluator.ts
+++ b/app/client/src/workers/DataTreeEvaluator.ts
@@ -4,9 +4,12 @@ import {
   EvalErrorTypes,
   getDynamicBindings,
   getEntityDynamicBindingPathList,
+  getEvalErrorPath,
+  getEvalValuePath,
   isChildPropertyPath,
   isPathADynamicBinding,
   isPathADynamicTrigger,
+  PropertyEvaluationErrorType,
 } from "utils/DynamicBindingUtils";
 import { WidgetTypeConfigMap } from "utils/WidgetFactory";
 import {
@@ -20,6 +23,7 @@ import {
 } from "entities/DataTree/dataTreeFactory";
 import {
   addDependantsOfNestedPropertyPaths,
+  addErrorToEntityProperty,
   convertPathToString,
   CrashingError,
   DataTreeDiffEvent,
@@ -44,6 +48,13 @@ import {
 import { DATA_BIND_REGEX } from "constants/BindingsConstants";
 import evaluate, { EvalResult } from "workers/evaluate";
 import { substituteDynamicBindingWithValues } from "workers/evaluationSubstitution";
+import { Severity } from "entities/AppsmithConsole";
+
+type EvaluateDataTreeResponse = {
+  dataTree: DataTree;
+  evaluationOrder: string[];
+  removedPaths: string[];
+};
 
 export default class DataTreeEvaluator {
   dependencyMap: DependencyMap = {};
@@ -67,7 +78,7 @@ export default class DataTreeEvaluator {
     this.widgetConfigMap = widgetConfigMap;
   }
 
-  createFirstTree(unEvalTree: DataTree) {
+  createFirstTree(unEvalTree: DataTree): EvaluateDataTreeResponse {
     const totalStart = performance.now();
     // Create dependency map
     const createDependencyStart = performance.now();
@@ -110,6 +121,11 @@ export default class DataTreeEvaluator {
       },
     };
     this.logs.push({ timeTakenForFirstTree });
+    return {
+      dataTree: this.evalTree,
+      evaluationOrder: this.sortedDependencies,
+      removedPaths: [],
+    };
   }
 
   isDynamicLeaf(unEvalTree: DataTree, propertyPath: string) {
@@ -125,7 +141,7 @@ export default class DataTreeEvaluator {
     return relativePropertyPath in entity.bindingPaths;
   }
 
-  updateDataTree(unEvalTree: DataTree) {
+  updateDataTree(unEvalTree: DataTree): EvaluateDataTreeResponse {
     const totalStart = performance.now();
     // Calculate diff
     const diffCheckTimeStart = performance.now();
@@ -133,7 +149,11 @@ export default class DataTreeEvaluator {
     // Since eval tree is listening to possible events that dont cause differences
     // We want to check if no diffs are present and bail out early
     if (differences.length === 0) {
-      return this.evalTree;
+      return {
+        dataTree: this.evalTree,
+        evaluationOrder: [],
+        removedPaths: [],
+      };
     }
     const diffCheckTimeStop = performance.now();
     // Check if dependencies have changed
@@ -158,14 +178,6 @@ export default class DataTreeEvaluator {
 
     const calculateSortOrderStop = performance.now();
 
-    this.logs.push({
-      differences,
-      subTreeSortOrder,
-      sortedDependencies: this.sortedDependencies,
-      inverse: this.inverseDependencyMap,
-      updatedDependencyMap: this.dependencyMap,
-    });
-
     // Evaluate
     const evalStart = performance.now();
 
@@ -180,6 +192,12 @@ export default class DataTreeEvaluator {
       }
       return false;
     });
+    this.logs.push({
+      evaluationOrder,
+      sortedDependencies: this.sortedDependencies,
+      inverse: this.inverseDependencyMap,
+      updatedDependencyMap: this.dependencyMap,
+    });
 
     // Remove any deleted paths from the eval tree
     removedPaths.forEach((removedPath) => {
@@ -204,7 +222,11 @@ export default class DataTreeEvaluator {
       evaluate: (evalStop - evalStart).toFixed(2),
     };
     this.logs.push({ timeTakenForSubTreeEval });
-    return this.evalTree;
+    return {
+      dataTree: this.evalTree,
+      evaluationOrder,
+      removedPaths,
+    };
   }
 
   getCompleteSortOrder(
@@ -305,7 +327,7 @@ export default class DataTreeEvaluator {
     Object.keys(dependencyMap).forEach((key) => {
       dependencyMap[key] = _.flatten(
         dependencyMap[key].map((path) =>
-          extractReferencesFromBinding(key, path, this.allKeys),
+          extractReferencesFromBinding(path, this.allKeys),
         ),
       );
     });
@@ -345,10 +367,21 @@ export default class DataTreeEvaluator {
     }
     if (isAction(entity)) {
       Object.entries(entity.dependencyMap).forEach(
-        ([dependent, entityDependencies]) => {
-          dependencies[`${entityName}.${dependent}`] = entityDependencies.map(
-            (propertyPath) => `${entityName}.${propertyPath}`,
-          );
+        ([path, entityDependencies]) => {
+          const actionDependentPaths: Array<string> = [];
+          const mainPath = `${entityName}.${path}`;
+          // Only add dependencies for paths which exist at the moment in appsmith world
+          if (this.allKeys.hasOwnProperty(mainPath)) {
+            // Only add dependent paths which exist in the data tree. Skip all the other paths to avoid creating
+            // a cyclical dependency.
+            entityDependencies.forEach((dependentPath) => {
+              const completePath = `${entityName}.${dependentPath}`;
+              if (this.allKeys.hasOwnProperty(completePath)) {
+                actionDependentPaths.push(completePath);
+              }
+            });
+            dependencies[mainPath] = actionDependentPaths;
+          }
         },
       );
     }
@@ -380,6 +413,9 @@ export default class DataTreeEvaluator {
           let evalPropertyValue;
           const requiresEval =
             isABindingPath && isDynamicValue(unEvalPropertyValue);
+          if (propertyPath) {
+            _.set(currentTree, getEvalErrorPath(fullPropertyPath), []);
+          }
           if (requiresEval) {
             const evaluationSubstitutionType =
               entity.bindingPaths[propertyPath] ||
@@ -390,6 +426,8 @@ export default class DataTreeEvaluator {
                 currentTree,
                 evaluationSubstitutionType,
                 false,
+                undefined,
+                fullPropertyPath,
               );
             } catch (e) {
               this.errors.push({
@@ -436,6 +474,15 @@ export default class DataTreeEvaluator {
               return _.set(currentTree, fullPropertyPath, parsedValue);
             }
             return _.set(currentTree, fullPropertyPath, evalPropertyValue);
+          } else if (isAction(entity)) {
+            const safeEvaluatedValue = removeFunctions(evalPropertyValue);
+            _.set(
+              currentTree,
+              getEvalValuePath(fullPropertyPath),
+              safeEvaluatedValue,
+            );
+            _.set(currentTree, fullPropertyPath, evalPropertyValue);
+            return currentTree;
           } else {
             return _.set(currentTree, fullPropertyPath, evalPropertyValue);
           }
@@ -475,14 +522,14 @@ export default class DataTreeEvaluator {
 
       let entityType = "UNKNOWN";
       const entityName = node.split(".")[0];
-      const entity = _.find(this.oldUnEvalTree, { name: entityName });
+      const entity = _.get(this.oldUnEvalTree, entityName);
       if (entity && isWidget(entity)) {
         entityType = entity.type;
       } else if (entity && isAction(entity)) {
         entityType = entity.pluginType;
       }
       this.errors.push({
-        type: EvalErrorTypes.DEPENDENCY_ERROR,
+        type: EvalErrorTypes.CYCLICAL_DEPENDENCY_ERROR,
         message: "Cyclic dependency found while evaluating.",
         context: {
           node,
@@ -534,26 +581,30 @@ export default class DataTreeEvaluator {
     evaluationSubstitutionType: EvaluationSubstitutionType,
     returnTriggers: boolean,
     callBackData?: Array<any>,
+    fullPropertyPath?: string,
   ) {
     // Get the {{binding}} bound values
-    const { stringSegments, jsSnippets } = getDynamicBindings(dynamicBinding);
+    const { jsSnippets, stringSegments } = getDynamicBindings(dynamicBinding);
     if (returnTriggers) {
-      const result = this.evaluateDynamicBoundValue(
-        data,
+      return this.evaluateDynamicBoundValue(
         jsSnippets[0],
+        data,
         callBackData,
+        returnTriggers,
       );
-      return result.triggers;
     }
     if (stringSegments.length) {
       // Get the Data Tree value of those "binding "paths
       const values = jsSnippets.map((jsSnippet, index) => {
         if (jsSnippet) {
           const result = this.evaluateDynamicBoundValue(
-            data,
             jsSnippet,
+            data,
             callBackData,
           );
+          if (fullPropertyPath && result.errors.length) {
+            addErrorToEntityProperty(result.errors, data, fullPropertyPath);
+          }
           return result.result;
         } else {
           return stringSegments[index];
@@ -576,21 +627,26 @@ export default class DataTreeEvaluator {
   // Paths are expected to have "{name}.{path}" signature
   // Also returns any action triggers found after evaluating value
   evaluateDynamicBoundValue(
-    data: DataTree,
     js: string,
+    data: DataTree,
     callbackData?: Array<any>,
+    isTriggerBased = false,
   ): EvalResult {
     try {
-      return evaluate(js, data, callbackData);
+      return evaluate(js, data, callbackData, isTriggerBased);
     } catch (e) {
-      this.errors.push({
-        type: EvalErrorTypes.EVAL_ERROR,
-        message: e.message,
-        context: {
-          binding: js,
-        },
-      });
-      return { result: undefined, triggers: [] };
+      return {
+        result: undefined,
+        triggers: [],
+        errors: [
+          {
+            errorType: PropertyEvaluationErrorType.PARSE,
+            raw: js,
+            severity: Severity.ERROR,
+            errorMessage: e.message,
+          },
+        ],
+      };
     }
   }
 
@@ -611,11 +667,12 @@ export default class DataTreeEvaluator {
         EvaluationSubstitutionType.TEMPLATE,
         true,
         undefined,
+        fullPropertyPath,
       );
       valueToValidate = triggers;
     }
     const validation = widget.validationPaths[propertyPath];
-    const { parsed, isValid, message, transformed } = validateWidgetProperty(
+    const { isValid, message, parsed, transformed } = validateWidgetProperty(
       propertyPath,
       valueToValidate,
       widget,
@@ -628,25 +685,24 @@ export default class DataTreeEvaluator {
       ? evalPropertyValue
       : transformed;
     const safeEvaluatedValue = removeFunctions(evaluatedValue);
-    _.set(widget, `evaluatedValues.${propertyPath}`, safeEvaluatedValue);
+    _.set(
+      widget,
+      getEvalValuePath(fullPropertyPath, false),
+      safeEvaluatedValue,
+    );
     if (!isValid) {
-      this.errors.push({
-        type: EvalErrorTypes.WIDGET_PROPERTY_VALIDATION_ERROR,
-        message: message || "",
-        context: {
-          source: {
-            id: widget.widgetId,
-            name: widget.widgetName,
-            type: ENTITY_TYPE.WIDGET,
-            propertyPath: propertyPath,
+      addErrorToEntityProperty(
+        [
+          {
+            raw: unEvalPropertyValue,
+            errorMessage: message || "",
+            errorType: PropertyEvaluationErrorType.VALIDATION,
+            severity: Severity.ERROR,
           },
-        },
-      });
-      _.set(widget, `invalidProps.${propertyPath}`, true);
-      _.set(widget, `validationMessages.${propertyPath}`, message);
-    } else {
-      _.set(widget, `invalidProps.${propertyPath}`, false);
-      _.set(widget, `validationMessages.${propertyPath}`, "");
+        ],
+        currentTree,
+        fullPropertyPath,
+      );
     }
 
     if (isPathADynamicTrigger(widget, propertyPath)) {
@@ -700,188 +756,196 @@ export default class DataTreeEvaluator {
     // In worst case, it tends to take ~12.5% of entire diffCalc (8 ms out of 67ms for 132 array of NEW)
     // TODO: Optimise by only getting paths of changed node
     this.allKeys = getAllPaths(unEvalDataTree);
+    const translatedDiffs = differences.map(
+      translateDiffEventToDataTreeDiffEvent,
+    );
+    this.logs.push({ differences, translatedDiffs });
     // Transform the diff library events to Appsmith evaluator events
-    differences
-      .map(translateDiffEventToDataTreeDiffEvent)
-      .forEach((dataTreeDiff) => {
-        const entityName = dataTreeDiff.payload.propertyPath.split(".")[0];
-        let entity = unEvalDataTree[entityName];
-        if (dataTreeDiff.event === DataTreeDiffEvent.DELETE) {
-          entity = this.oldUnEvalTree[entityName];
-        }
-        const entityType = isValidEntity(entity) ? entity.ENTITY_TYPE : "noop";
+    _.flatten(translatedDiffs).forEach((dataTreeDiff) => {
+      const entityName = dataTreeDiff.payload.propertyPath.split(".")[0];
+      let entity = unEvalDataTree[entityName];
+      if (dataTreeDiff.event === DataTreeDiffEvent.DELETE) {
+        entity = this.oldUnEvalTree[entityName];
+      }
+      const entityType = isValidEntity(entity) ? entity.ENTITY_TYPE : "noop";
 
-        if (entityType !== "noop") {
-          switch (dataTreeDiff.event) {
-            case DataTreeDiffEvent.NEW: {
-              // If a new entity/property was added, add all the internal bindings for this entity to the global dependency map
-              if (
-                (isWidget(entity) || isAction(entity)) &&
-                !this.isDynamicLeaf(
-                  unEvalDataTree,
-                  dataTreeDiff.payload.propertyPath,
-                )
-              ) {
-                const entityDependencyMap: DependencyMap = this.listEntityDependencies(
-                  entity,
-                  entityName,
-                );
-                if (Object.keys(entityDependencyMap).length) {
-                  didUpdateDependencyMap = true;
-                  // The entity might already have some dependencies,
-                  // so we just want to update those
-                  Object.entries(entityDependencyMap).forEach(
-                    ([entityDependent, entityDependencies]) => {
-                      if (this.dependencyMap[entityDependent]) {
-                        this.dependencyMap[
-                          entityDependent
-                        ] = this.dependencyMap[entityDependent].concat(
-                          entityDependencies,
-                        );
-                      } else {
-                        this.dependencyMap[
-                          entityDependent
-                        ] = entityDependencies;
-                      }
-                    },
-                  );
-                }
-              }
-              // Either a new entity or a new property path has been added. Go through existing dynamic bindings and
-              // find out if a new dependency has to be created because the property path used in the binding just became
-              // eligible
-              const possibleReferencesInOldBindings: DependencyMap = this.getPropertyPathReferencesInExistingBindings(
+      if (entityType !== "noop") {
+        switch (dataTreeDiff.event) {
+          case DataTreeDiffEvent.NEW: {
+            // If a new entity/property was added, add all the internal bindings for this entity to the global dependency map
+            if (
+              (isWidget(entity) || isAction(entity)) &&
+              !this.isDynamicLeaf(
                 unEvalDataTree,
                 dataTreeDiff.payload.propertyPath,
+              )
+            ) {
+              const entityDependencyMap: DependencyMap = this.listEntityDependencies(
+                entity,
+                entityName,
               );
-              // We have found some bindings which are related to the new property path and hence should be added to the
-              // global dependency map
-              if (Object.keys(possibleReferencesInOldBindings).length) {
+              if (Object.keys(entityDependencyMap).length) {
                 didUpdateDependencyMap = true;
-                Object.assign(
-                  this.dependencyMap,
-                  possibleReferencesInOldBindings,
+                // The entity might already have some dependencies,
+                // so we just want to update those
+                Object.entries(entityDependencyMap).forEach(
+                  ([entityDependent, entityDependencies]) => {
+                    if (this.dependencyMap[entityDependent]) {
+                      this.dependencyMap[entityDependent] = this.dependencyMap[
+                        entityDependent
+                      ].concat(entityDependencies);
+                    } else {
+                      this.dependencyMap[entityDependent] = entityDependencies;
+                    }
+                  },
                 );
               }
-              break;
             }
-            case DataTreeDiffEvent.DELETE: {
-              // Add to removedPaths as they have been deleted from the evalTree
-              removedPaths.push(dataTreeDiff.payload.propertyPath);
-              // If an existing widget was deleted, remove all the bindings from the global dependency map
-              if (
-                (isWidget(entity) || isAction(entity)) &&
-                dataTreeDiff.payload.propertyPath === entityName
-              ) {
-                const entityDependencies = this.listEntityDependencies(
-                  entity,
-                  entityName,
-                );
-                Object.keys(entityDependencies).forEach((widgetDep) => {
-                  didUpdateDependencyMap = true;
-                  delete this.dependencyMap[widgetDep];
-                });
-              }
-              // Either an existing entity or an existing property path has been deleted. Update the global dependency map
-              // by removing the bindings from the same.
-              Object.keys(this.dependencyMap).forEach((dependencyPath) => {
+            // Either a new entity or a new property path has been added. Go through existing dynamic bindings and
+            // find out if a new dependency has to be created because the property path used in the binding just became
+            // eligible
+            const possibleReferencesInOldBindings: DependencyMap = this.getPropertyPathReferencesInExistingBindings(
+              unEvalDataTree,
+              dataTreeDiff.payload.propertyPath,
+            );
+            // We have found some bindings which are related to the new property path and hence should be added to the
+            // global dependency map
+            if (Object.keys(possibleReferencesInOldBindings).length) {
+              didUpdateDependencyMap = true;
+              Object.assign(
+                this.dependencyMap,
+                possibleReferencesInOldBindings,
+              );
+            }
+            break;
+          }
+          case DataTreeDiffEvent.DELETE: {
+            // Add to removedPaths as they have been deleted from the evalTree
+            removedPaths.push(dataTreeDiff.payload.propertyPath);
+            // If an existing widget was deleted, remove all the bindings from the global dependency map
+            if (
+              (isWidget(entity) || isAction(entity)) &&
+              dataTreeDiff.payload.propertyPath === entityName
+            ) {
+              const entityDependencies = this.listEntityDependencies(
+                entity,
+                entityName,
+              );
+              Object.keys(entityDependencies).forEach((widgetDep) => {
                 didUpdateDependencyMap = true;
-                if (
-                  isChildPropertyPath(
-                    dataTreeDiff.payload.propertyPath,
-                    dependencyPath,
-                  )
-                ) {
-                  delete this.dependencyMap[dependencyPath];
-                } else {
-                  const toRemove: Array<string> = [];
-                  this.dependencyMap[dependencyPath].forEach(
-                    (dependantPath) => {
-                      if (
-                        isChildPropertyPath(
-                          dataTreeDiff.payload.propertyPath,
-                          dependantPath,
-                        )
-                      ) {
-                        dependenciesOfRemovedPaths.push(dependencyPath);
-                        toRemove.push(dependantPath);
-                      }
-                    },
-                  );
-                  this.dependencyMap[dependencyPath] = _.difference(
-                    this.dependencyMap[dependencyPath],
-                    toRemove,
-                  );
-                }
+                delete this.dependencyMap[widgetDep];
               });
-              break;
             }
-
-            case DataTreeDiffEvent.EDIT: {
-              // We only care if the difference is in dynamic bindings since static values do not need
-              // an evaluation.
+            // Either an existing entity or an existing property path has been deleted. Update the global dependency map
+            // by removing the bindings from the same.
+            Object.keys(this.dependencyMap).forEach((dependencyPath) => {
+              didUpdateDependencyMap = true;
               if (
-                (isWidget(entity) || isAction(entity)) &&
-                typeof dataTreeDiff.payload.value === "string"
+                isChildPropertyPath(
+                  dataTreeDiff.payload.propertyPath,
+                  dependencyPath,
+                )
               ) {
-                const entity: DataTreeAction | DataTreeWidget = unEvalDataTree[
-                  entityName
-                ] as DataTreeAction | DataTreeWidget;
-                const fullPropertyPath = dataTreeDiff.payload.propertyPath;
-                const entityPropertyPath = fullPropertyPath.substring(
-                  fullPropertyPath.indexOf(".") + 1,
-                );
-                const isABindingPath = isPathADynamicBinding(
-                  entity,
-                  entityPropertyPath,
-                );
-                if (isABindingPath) {
-                  didUpdateDependencyMap = true;
-
-                  const { jsSnippets } = getDynamicBindings(
-                    dataTreeDiff.payload.value,
-                  );
-                  const correctSnippets = jsSnippets.filter(
-                    (jsSnippet) => !!jsSnippet,
-                  );
-                  // We found a new dynamic binding for this property path. We update the dependency map by overwriting the
-                  // dependencies for this property path with the newly found dependencies
-                  if (correctSnippets.length) {
-                    this.dependencyMap[fullPropertyPath] = correctSnippets;
-                  } else {
-                    // The dependency on this property path has been removed. Delete this property path from the global
-                    // dependency map
-                    delete this.dependencyMap[fullPropertyPath];
+                delete this.dependencyMap[dependencyPath];
+              } else {
+                const toRemove: Array<string> = [];
+                this.dependencyMap[dependencyPath].forEach((dependantPath) => {
+                  if (
+                    isChildPropertyPath(
+                      dataTreeDiff.payload.propertyPath,
+                      dependantPath,
+                    )
+                  ) {
+                    dependenciesOfRemovedPaths.push(dependencyPath);
+                    toRemove.push(dependantPath);
                   }
-                  if (isAction(entity)) {
-                    // Actions have a defined dependency map that should always be maintained
-                    if (entityPropertyPath in entity.dependencyMap) {
-                      const entityDependenciesName = entity.dependencyMap[
-                        entityPropertyPath
-                      ].map((dep) => `${entityName}.${dep}`);
-                      if (fullPropertyPath in this.dependencyMap) {
-                        this.dependencyMap[
-                          fullPropertyPath
-                        ] = this.dependencyMap[fullPropertyPath].concat(
-                          entityDependenciesName,
-                        );
-                      } else {
-                        this.dependencyMap[
-                          fullPropertyPath
-                        ] = entityDependenciesName;
-                      }
+                });
+                this.dependencyMap[dependencyPath] = _.difference(
+                  this.dependencyMap[dependencyPath],
+                  toRemove,
+                );
+              }
+            });
+            break;
+          }
+
+          case DataTreeDiffEvent.EDIT: {
+            // We only care if the difference is in dynamic bindings since static values do not need
+            // an evaluation.
+            if (
+              (isWidget(entity) || isAction(entity)) &&
+              typeof dataTreeDiff.payload.value === "string"
+            ) {
+              const entity: DataTreeAction | DataTreeWidget = unEvalDataTree[
+                entityName
+              ] as DataTreeAction | DataTreeWidget;
+              const fullPropertyPath = dataTreeDiff.payload.propertyPath;
+              const entityPropertyPath = fullPropertyPath.substring(
+                fullPropertyPath.indexOf(".") + 1,
+              );
+              const isABindingPath = isPathADynamicBinding(
+                entity,
+                entityPropertyPath,
+              );
+              if (isABindingPath) {
+                didUpdateDependencyMap = true;
+
+                const { jsSnippets } = getDynamicBindings(
+                  dataTreeDiff.payload.value,
+                );
+                const correctSnippets = jsSnippets.filter(
+                  (jsSnippet) => !!jsSnippet,
+                );
+                // We found a new dynamic binding for this property path. We update the dependency map by overwriting the
+                // dependencies for this property path with the newly found dependencies
+                if (correctSnippets.length) {
+                  this.dependencyMap[fullPropertyPath] = correctSnippets;
+                } else {
+                  // The dependency on this property path has been removed. Delete this property path from the global
+                  // dependency map
+                  delete this.dependencyMap[fullPropertyPath];
+                }
+                if (isAction(entity)) {
+                  // Actions have a defined dependency map that should always be maintained
+                  if (entityPropertyPath in entity.dependencyMap) {
+                    const entityDependenciesName = entity.dependencyMap[
+                      entityPropertyPath
+                    ].map((dep) => `${entityName}.${dep}`);
+
+                    // Filter only the paths which exist in the appsmith world to avoid cyclical dependencies
+                    const filteredEntityDependencies = entityDependenciesName.filter(
+                      (path) => this.allKeys.hasOwnProperty(path),
+                    );
+
+                    // Now assign these existing dependent paths to the property path in dependencyMap
+                    if (fullPropertyPath in this.dependencyMap) {
+                      this.dependencyMap[fullPropertyPath] = this.dependencyMap[
+                        fullPropertyPath
+                      ].concat(filteredEntityDependencies);
+                    } else {
+                      this.dependencyMap[
+                        fullPropertyPath
+                      ] = filteredEntityDependencies;
                     }
                   }
                 }
               }
-              break;
-            }
-            default: {
-              break;
+              // If the whole binding was removed then the value
+              // at this path would be "".
+              // In this case if the path exists in the dependency map
+              // remove it.
+              else if (fullPropertyPath in this.dependencyMap) {
+                delete this.dependencyMap[fullPropertyPath];
+              }
             }
+            break;
+          }
+          default: {
+            break;
           }
         }
-      });
+      }
+    });
     const diffCalcEnd = performance.now();
     const subDepCalcStart = performance.now();
     if (didUpdateDependencyMap) {
@@ -890,7 +954,7 @@ export default class DataTreeEvaluator {
         this.dependencyMap[key] = _.uniq(
           _.flatten(
             this.dependencyMap[key].map((path) =>
-              extractReferencesFromBinding(key, path, this.allKeys),
+              extractReferencesFromBinding(path, this.allKeys),
             ),
           ),
         );
@@ -1027,7 +1091,7 @@ export default class DataTreeEvaluator {
           const propertyBindings = entityPropertyBindings[path];
           const references = _.flatten(
             propertyBindings.map((binding) =>
-              extractReferencesFromBinding(path, binding, this.allKeys),
+              extractReferencesFromBinding(binding, this.allKeys),
             ),
           );
           references.forEach((value) => {
@@ -1089,7 +1153,6 @@ export default class DataTreeEvaluator {
 }
 
 const extractReferencesFromBinding = (
-  path: string,
   dependentPath: string,
   all: Record<string, true>,
 ): Array<string> => {
@@ -1100,7 +1163,7 @@ const extractReferencesFromBinding = (
   identifiers.forEach((identifier: string) => {
     // If the identifier exists directly, add it and return
     if (all.hasOwnProperty(identifier)) {
-      pushDependentsInSubDependencyArray(subDeps, path, identifier);
+      subDeps.push(identifier);
       return;
     }
     const subpaths = _.toPath(identifier);
@@ -1113,7 +1176,7 @@ const extractReferencesFromBinding = (
       current = convertPathToString(subpaths);
       // We've found the dep, add it and return
       if (all.hasOwnProperty(current)) {
-        pushDependentsInSubDependencyArray(subDeps, path, current);
+        subDeps.push(current);
         return;
       }
       subpaths.pop();
@@ -1122,30 +1185,12 @@ const extractReferencesFromBinding = (
   return _.uniq(subDeps);
 };
 
-const pushDependentsInSubDependencyArray = (
-  subDeps: string[],
-  path: string,
-  dependentPath: string,
-): string[] => {
-  // Only add if path is not a child of dependentPath which ensures that cyclical dependency is not introduced
-  // when adding parent-child relationships later
-  if (!isChildPropertyPath(dependentPath, path)) {
-    subDeps.push(dependentPath);
-  }
-  return subDeps;
-};
-
 // TODO cryptic comment below. Dont know if we still need this. Duplicate function
 // referencing DATA_BIND_REGEX fails for the value "{{Table1.tableData[Table1.selectedRowIndex]}}" if you run it multiple times and don't recreate
 const isDynamicValue = (value: string): boolean => DATA_BIND_REGEX.test(value);
 
 function isValidEntity(entity: DataTreeEntity): entity is DataTreeObjectEntity {
   if (!_.isObject(entity)) {
-    // ERRORS.push({
-    //   type: EvalErrorTypes.BAD_UNEVAL_TREE_ERROR,
-    //   message: "Data tree entity is not an object",
-    //   context: entity,
-    // });
     return false;
   }
   return "ENTITY_TYPE" in entity;
diff --git a/app/client/src/workers/evaluate.test.ts b/app/client/src/workers/evaluate.test.ts
index d658e35fc4..bb9d478a2c 100644
--- a/app/client/src/workers/evaluate.test.ts
+++ b/app/client/src/workers/evaluate.test.ts
@@ -25,6 +25,7 @@ describe("evaluate", () => {
     bindingPaths: {},
     triggerPaths: {},
     validationPaths: {},
+    logBlackList: {},
   };
   const dataTree: DataTree = {
     Input1: widget,
@@ -34,19 +35,63 @@ describe("evaluate", () => {
     const response = evaluate(js, {});
     expect(response.result).toBe("Hello!");
   });
-  it("unescapes string and removes linebreaks before evaluation", () => {
-    const js = "'Hello,\\nworld!'";
-    const response = evaluate(js, {});
-    expect(response.result).toBe("Hello,world!");
-  });
   it("throws error for undefined js", () => {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     expect(() => evaluate(undefined, {})).toThrow(TypeError);
   });
-  it("throws for syntax errors", () => {
-    expect(() => evaluate("wrongJS", {})).toThrow(ReferenceError);
-    expect(() => evaluate("{}.map()", {})).toThrow(TypeError);
+  it("Returns for syntax errors", () => {
+    const response1 = evaluate("wrongJS", {});
+    expect(response1).toStrictEqual({
+      result: undefined,
+      triggers: [],
+      errors: [
+        {
+          errorMessage: "'wrongJS' is not defined.",
+          errorSegment: "    const result = wrongJS",
+          errorType: "LINT",
+          raw: `
+  function closedFunction () {
+    const result = wrongJS
+    return result;
+  }
+  closedFunction()
+  `,
+          severity: "warning",
+        },
+        {
+          errorMessage: "ReferenceError: wrongJS is not defined",
+          errorType: "PARSE",
+          raw: `
+  function closedFunction () {
+    const result = wrongJS
+    return result;
+  }
+  closedFunction()
+  `,
+          severity: "error",
+        },
+      ],
+    });
+    const response2 = evaluate("{}.map()", {});
+    expect(response2).toStrictEqual({
+      result: undefined,
+      triggers: [],
+      errors: [
+        {
+          errorMessage: "TypeError: {}.map is not a function",
+          errorType: "PARSE",
+          raw: `
+  function closedFunction () {
+    const result = {}.map()
+    return result;
+  }
+  closedFunction()
+  `,
+          severity: "error",
+        },
+      ],
+    });
   });
   it("evaluates value from data tree", () => {
     const js = "Input1.text";
@@ -55,7 +100,7 @@ describe("evaluate", () => {
   });
   it("gets triggers from a function", () => {
     const js = "showAlert('message', 'info')";
-    const response = evaluate(js, dataTree);
+    const response = evaluate(js, dataTree, undefined, true);
     expect(response.result).toBe(undefined);
     expect(response.triggers).toStrictEqual([
       {
@@ -69,7 +114,25 @@ describe("evaluate", () => {
   });
   it("disallows unsafe function calls", () => {
     const js = "setTimeout(() => {}, 100)";
-    expect(() => evaluate(js, dataTree)).toThrow(TypeError);
+    const response = evaluate(js, dataTree);
+    expect(response).toStrictEqual({
+      result: undefined,
+      triggers: [],
+      errors: [
+        {
+          errorMessage: "TypeError: setTimeout is not a function",
+          errorType: "PARSE",
+          raw: `
+  function closedFunction () {
+    const result = setTimeout(() => {}, 100)
+    return result;
+  }
+  closedFunction()
+  `,
+          severity: "error",
+        },
+      ],
+    });
   });
   it("has access to extra library functions", () => {
     const js = "_.add(1,2)";
diff --git a/app/client/src/workers/evaluate.ts b/app/client/src/workers/evaluate.ts
index 19e9a52706..ef948bbcb0 100644
--- a/app/client/src/workers/evaluate.ts
+++ b/app/client/src/workers/evaluate.ts
@@ -2,62 +2,153 @@ import { ActionDescription, DataTree } from "entities/DataTree/dataTreeFactory";
 import { addFunctions } from "workers/evaluationUtils";
 import _ from "lodash";
 import {
+  EvaluationError,
   extraLibraries,
+  PropertyEvaluationErrorType,
   unsafeFunctionForEval,
 } from "utils/DynamicBindingUtils";
 import unescapeJS from "unescape-js";
+import { JSHINT as jshint } from "jshint";
+import { Severity } from "entities/AppsmithConsole";
 
 export type EvalResult = {
   result: any;
   triggers?: ActionDescription<any>[];
+  errors: EvaluationError[];
 };
 
+export enum EvaluationScriptType {
+  EXPRESSION = "EXPRESSION",
+  ANONYMOUS_FUNCTION = "ANONYMOUS_FUNCTION",
+  TRIGGERS = "TRIGGERS",
+}
+
+const evaluationScripts: Record<
+  EvaluationScriptType,
+  (script: string) => string
+> = {
+  [EvaluationScriptType.EXPRESSION]: (script: string) => `
+  function closedFunction () {
+    const result = ${script}
+    return result;
+  }
+  closedFunction()
+  `,
+  [EvaluationScriptType.ANONYMOUS_FUNCTION]: (script) => `
+  function callback (script) {
+    const userFunction = script;
+    const result = userFunction.apply(self, ARGUMENTS);
+    return result;
+  }
+  callback(${script})
+  `,
+  [EvaluationScriptType.TRIGGERS]: (script) => `
+  function closedFunction () {
+    const result = ${script}
+  }
+  closedFunction()
+  `,
+};
+
+const getScriptToEval = (
+  userScript: string,
+  evalArguments?: Array<any>,
+  isTriggerBased = false,
+): string => {
+  let scriptType = EvaluationScriptType.EXPRESSION;
+  if (evalArguments) {
+    scriptType = EvaluationScriptType.ANONYMOUS_FUNCTION;
+  } else if (isTriggerBased) {
+    scriptType = EvaluationScriptType.TRIGGERS;
+  }
+  return evaluationScripts[scriptType](userScript);
+};
+
+const getLintingErrors = (
+  script: string,
+  data: Record<string, unknown>,
+): EvaluationError[] => {
+  const globalData: Record<string, boolean> = {};
+  Object.keys(data).forEach((datum) => (globalData[datum] = false));
+  const options = {
+    indent: 2,
+    esversion: 7,
+    eqeqeq: true,
+    curly: true,
+    freeze: true,
+    undef: true,
+    unused: true,
+    asi: true,
+    worker: true,
+    globals: globalData,
+  };
+  jshint(script, options);
+
+  return jshint.errors.map((lintError) => {
+    return {
+      errorType: PropertyEvaluationErrorType.LINT,
+      raw: script,
+      severity: lintError.code.startsWith("W")
+        ? Severity.WARNING
+        : Severity.ERROR,
+      errorMessage: lintError.reason,
+      errorSegment: lintError.evidence,
+    };
+  });
+};
+
+const beginsWithLineBreakRegex = /^\s+|\s+$/;
+
 export default function evaluate(
   js: string,
   data: DataTree,
-  callbackData?: Array<any>,
+  evalArguments?: Array<any>,
+  isTriggerBased = false,
 ): EvalResult {
-  const unescapedJS = unescapeJS(js).replace(/(\r\n|\n|\r)/gm, "");
-  const scriptToEvaluate = `
-        function closedFunction () {
-          const result = ${unescapedJS};
-          return { result, triggers: self.triggers }
-        }
-        closedFunction()
-      `;
-  const scriptWithCallback = `
-         function callback (script) {
-            const userFunction = script;
-            const result = userFunction.apply(self, CALLBACK_DATA);
-            return { result, triggers: self.triggers };
-         }
-         callback(${unescapedJS});
-      `;
-  const script = callbackData ? scriptWithCallback : scriptToEvaluate;
-  const { result, triggers } = (function() {
+  // We remove any line breaks from the beginning of the script because that
+  // makes the final function invalid. We also unescape any escaped characters
+  // so that eval can happen
+  const unescapedJS = unescapeJS(js.replace(beginsWithLineBreakRegex, ""));
+  const script = getScriptToEval(unescapedJS, evalArguments, isTriggerBased);
+
+  return (function() {
+    let errors: EvaluationError[] = [];
+    let result;
+    let triggers: any[] = [];
     /**** Setting the eval context ****/
     const GLOBAL_DATA: Record<string, any> = {};
     ///// Adding callback data
-    GLOBAL_DATA.CALLBACK_DATA = callbackData;
-    //// Add internal functions to dataTree;
-    const dataTreeWithFunctions = addFunctions(data);
-    ///// Adding Data tree
-    Object.keys(dataTreeWithFunctions).forEach((datum) => {
-      GLOBAL_DATA[datum] = dataTreeWithFunctions[datum];
-    });
-    ///// Fixing action paths and capturing their execution response
-    if (dataTreeWithFunctions.actionPaths) {
-      GLOBAL_DATA.triggers = [];
-      const pusher = function(this: DataTree, action: any, ...payload: any[]) {
-        const actionPayload = action(...payload);
-        GLOBAL_DATA.triggers.push(actionPayload);
-      };
-      GLOBAL_DATA.actionPaths.forEach((path: string) => {
-        const action = _.get(GLOBAL_DATA, path);
-        const entity = _.get(GLOBAL_DATA, path.split(".")[0]);
-        if (action) {
-          _.set(GLOBAL_DATA, path, pusher.bind(data, action.bind(entity)));
-        }
+    GLOBAL_DATA.ARGUMENTS = evalArguments;
+    if (isTriggerBased) {
+      //// Add internal functions to dataTree;
+      const dataTreeWithFunctions = addFunctions(data);
+      ///// Adding Data tree with functions
+      Object.keys(dataTreeWithFunctions).forEach((datum) => {
+        GLOBAL_DATA[datum] = dataTreeWithFunctions[datum];
+      });
+      ///// Fixing action paths and capturing their execution response
+      if (dataTreeWithFunctions.actionPaths) {
+        GLOBAL_DATA.triggers = [];
+        const pusher = function(
+          this: DataTree,
+          action: any,
+          ...payload: any[]
+        ) {
+          const actionPayload = action(...payload);
+          GLOBAL_DATA.triggers.push(actionPayload);
+        };
+        GLOBAL_DATA.actionPaths.forEach((path: string) => {
+          const action = _.get(GLOBAL_DATA, path);
+          const entity = _.get(GLOBAL_DATA, path.split(".")[0]);
+          if (action) {
+            _.set(GLOBAL_DATA, path, pusher.bind(data, action.bind(entity)));
+          }
+        });
+      }
+    } else {
+      ///// Adding Data tree
+      Object.keys(data).forEach((datum) => {
+        GLOBAL_DATA[datum] = data[datum];
       });
     }
 
@@ -69,6 +160,7 @@ export default function evaluate(
       // @ts-ignore: No types available
       self[key] = GLOBAL_DATA[key];
     });
+    errors = getLintingErrors(script, GLOBAL_DATA);
 
     ///// Adding extra libraries separately
     extraLibraries.forEach((library) => {
@@ -83,8 +175,21 @@ export default function evaluate(
       // @ts-ignore: No types available
       self[func] = undefined;
     });
-
-    const evalResult = eval(script);
+    try {
+      result = eval(script);
+      if (isTriggerBased) {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        triggers = [...self.triggers];
+      }
+    } catch (e) {
+      errors.push({
+        errorMessage: `${e.stack.split(`\n`)[0]}`,
+        severity: Severity.ERROR,
+        raw: script,
+        errorType: PropertyEvaluationErrorType.PARSE,
+      });
+    }
 
     // Remove it from self
     // This is needed so that next eval can have a clean sheet
@@ -94,7 +199,6 @@ export default function evaluate(
       delete self[key];
     });
 
-    return evalResult;
+    return { result, triggers, errors };
   })();
-  return { result, triggers };
 }
diff --git a/app/client/src/workers/evaluation.test.ts b/app/client/src/workers/evaluation.test.ts
index abffdb4d63..f257d124ba 100644
--- a/app/client/src/workers/evaluation.test.ts
+++ b/app/client/src/workers/evaluation.test.ts
@@ -237,6 +237,7 @@ const BASE_ACTION: DataTreeAction = {
   pluginType: PluginType.API,
   run: {},
   data: {},
+  responseMeta: { isExecutionSuccess: false },
   ENTITY_TYPE: ENTITY_TYPE.ACTION,
   bindingPaths: {
     isLoading: EvaluationSubstitutionType.TEMPLATE,
@@ -383,9 +384,9 @@ describe("DataTreeEvaluator", () => {
         text: "Hey there",
       },
     };
-    const updatedEvalTree = evaluator.updateDataTree(updatedUnEvalTree);
-    expect(updatedEvalTree).toHaveProperty("Text2.text", "Hey there");
-    expect(updatedEvalTree).toHaveProperty("Text3.text", "Hey there");
+    const { dataTree } = evaluator.updateDataTree(updatedUnEvalTree);
+    expect(dataTree).toHaveProperty("Text2.text", "Hey there");
+    expect(dataTree).toHaveProperty("Text3.text", "Hey there");
   });
 
   it("Evaluates a dependency change in update run", () => {
@@ -396,10 +397,10 @@ describe("DataTreeEvaluator", () => {
         text: "Label 3",
       },
     };
-    const updatedEvalTree = evaluator.updateDataTree(updatedUnEvalTree);
+    const { dataTree } = evaluator.updateDataTree(updatedUnEvalTree);
     const updatedDependencyMap = evaluator.dependencyMap;
-    expect(updatedEvalTree).toHaveProperty("Text2.text", "Label");
-    expect(updatedEvalTree).toHaveProperty("Text3.text", "Label 3");
+    expect(dataTree).toHaveProperty("Text2.text", "Label");
+    expect(dataTree).toHaveProperty("Text3.text", "Label 3");
     expect(updatedDependencyMap).toStrictEqual({
       Text1: ["Text1.text"],
       Text2: ["Text2.text"],
@@ -444,8 +445,8 @@ describe("DataTreeEvaluator", () => {
       },
     };
 
-    const updatedEvalTree = evaluator.updateDataTree(updatedUnEvalTree);
-    expect(updatedEvalTree).toHaveProperty("Input1.text", "Default value");
+    const { dataTree } = evaluator.updateDataTree(updatedUnEvalTree);
+    expect(dataTree).toHaveProperty("Input1.text", "Default value");
   });
 
   it("Evaluates for value changes in nested diff paths", () => {
@@ -480,11 +481,8 @@ describe("DataTreeEvaluator", () => {
         },
       },
     };
-    const updatedEvalTree = evaluator.updateDataTree(updatedUnEvalTree);
-    expect(updatedEvalTree).toHaveProperty(
-      "Dropdown2.options.0.label",
-      "newValue",
-    );
+    const { dataTree } = evaluator.updateDataTree(updatedUnEvalTree);
+    expect(dataTree).toHaveProperty("Dropdown2.options.0.label", "newValue");
   });
 
   it("Adds an entity with a complicated binding", () => {
@@ -503,9 +501,9 @@ describe("DataTreeEvaluator", () => {
         ],
       },
     };
-    const updatedEvalTree = evaluator.updateDataTree(updatedUnEvalTree);
+    const { dataTree } = evaluator.updateDataTree(updatedUnEvalTree);
     const updatedDependencyMap = evaluator.dependencyMap;
-    expect(updatedEvalTree).toHaveProperty("Table1.tableData", [
+    expect(dataTree).toHaveProperty("Table1.tableData", [
       {
         test: "Hey",
         raw: "Label",
@@ -567,9 +565,9 @@ describe("DataTreeEvaluator", () => {
         ],
       },
     };
-    const updatedEvalTree = evaluator.updateDataTree(updatedUnEvalTree);
+    const { dataTree } = evaluator.updateDataTree(updatedUnEvalTree);
     const updatedDependencyMap = evaluator.dependencyMap;
-    expect(updatedEvalTree).toHaveProperty("Table1.tableData", [
+    expect(dataTree).toHaveProperty("Table1.tableData", [
       {
         test: "Hey",
         raw: "Label",
@@ -579,7 +577,7 @@ describe("DataTreeEvaluator", () => {
         raw: "Label",
       },
     ]);
-    expect(updatedEvalTree).toHaveProperty("Text4.text", "Hey");
+    expect(dataTree).toHaveProperty("Text4.text", "Hey");
     expect(updatedDependencyMap).toStrictEqual({
       Api1: ["Api1.data"],
       Text1: ["Text1.text"],
@@ -656,14 +654,14 @@ describe("DataTreeEvaluator", () => {
         },
       },
     };
-    const evaluatedDataTree2 = evaluator.updateDataTree(updatedTree2);
+    const { dataTree } = evaluator.updateDataTree(updatedTree2);
     expect(evaluator.dependencyMap["Api2.config.body"]).toStrictEqual([
       "Text1.text",
       "Api2.config.pluginSpecifiedTemplates[0].value",
     ]);
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    expect(evaluatedDataTree2.Api2.config.body).toBe("{ 'name': Test }");
+    expect(dataTree.Api2.config.body).toBe("{ 'name': Test }");
     const updatedTree3 = {
       ...updatedTree2,
       Api2: {
@@ -682,13 +680,14 @@ describe("DataTreeEvaluator", () => {
         },
       },
     };
-    const evaluatedDataTree3 = evaluator.updateDataTree(updatedTree3);
+    const evaluatedDataTreeObject = evaluator.updateDataTree(updatedTree3);
+    const dataTree3 = evaluatedDataTreeObject.dataTree;
     expect(evaluator.dependencyMap["Api2.config.body"]).toStrictEqual([
       "Text1.text",
       "Api2.config.pluginSpecifiedTemplates[0].value",
     ]);
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    expect(evaluatedDataTree3.Api2.config.body).toBe("{ 'name': \"Test\" }");
+    expect(dataTree3.Api2.config.body).toBe("{ 'name': \"Test\" }");
   });
 });
diff --git a/app/client/src/workers/evaluation.worker.ts b/app/client/src/workers/evaluation.worker.ts
index fd1e3ff4cb..620f32c8b6 100644
--- a/app/client/src/workers/evaluation.worker.ts
+++ b/app/client/src/workers/evaluation.worker.ts
@@ -7,6 +7,8 @@ import {
   EVAL_WORKER_ACTIONS,
   EvalError,
   EvalErrorTypes,
+  EvaluationError,
+  PropertyEvaluationErrorType,
 } from "utils/DynamicBindingUtils";
 import {
   CrashingError,
@@ -26,7 +28,7 @@ function messageEventListener(
 ) {
   return (e: MessageEvent) => {
     const startTime = performance.now();
-    const { method, requestId, requestData } = e.data;
+    const { method, requestData, requestId } = e.data;
     const responseData = fn(method, requestData);
     const endTime = performance.now();
     ctx.postMessage({
@@ -42,23 +44,31 @@ ctx.addEventListener(
   messageEventListener((method, requestData: any) => {
     switch (method) {
       case EVAL_WORKER_ACTIONS.EVAL_TREE: {
-        const { widgetTypeConfigMap, unevalTree } = requestData;
+        const { unevalTree, widgetTypeConfigMap } = requestData;
         let dataTree: DataTree = unevalTree;
         let errors: EvalError[] = [];
         let logs: any[] = [];
         let dependencies: DependencyMap = {};
+        let dataTreeObject: any = {};
+        let evaluationOrder: string[] = [];
+        let removedPaths: string[] = [];
         try {
           if (!dataTreeEvaluator) {
             dataTreeEvaluator = new DataTreeEvaluator(widgetTypeConfigMap);
-            dataTreeEvaluator.createFirstTree(unevalTree);
-            dataTree = dataTreeEvaluator.evalTree;
+            dataTreeObject = dataTreeEvaluator.createFirstTree(unevalTree);
+            dataTree = dataTreeObject.dataTree;
+            evaluationOrder = dataTreeObject.evaluationOrder;
+            removedPaths = dataTreeObject.removedPaths;
           } else {
-            dataTree = dataTreeEvaluator.updateDataTree(unevalTree);
+            dataTreeObject = dataTreeEvaluator.updateDataTree(unevalTree);
+            dataTree = dataTreeObject.dataTree;
+            evaluationOrder = dataTreeObject.evaluationOrder;
+            removedPaths = dataTreeObject.removedPaths;
           }
 
           // We need to clean it to remove any possible functions inside the tree.
           // If functions exist, it will crash the web worker
-          dataTree = JSON.parse(JSON.stringify(dataTree));
+          dataTree = dataTree && JSON.parse(JSON.stringify(dataTree));
           dependencies = dataTreeEvaluator.inverseDependencyMap;
           errors = dataTreeEvaluator.errors;
           dataTreeEvaluator.clearErrors();
@@ -79,11 +89,14 @@ ctx.addEventListener(
           dataTree = getSafeToRenderDataTree(unevalTree, widgetTypeConfigMap);
           dataTreeEvaluator = undefined;
         }
+        // step 6: eval order
         return {
           dataTree,
           dependencies,
           errors,
+          evaluationOrder,
           logs,
+          removedPaths,
         };
       }
       case EVAL_WORKER_ACTIONS.EVAL_ACTION_BINDINGS: {
@@ -104,12 +117,19 @@ ctx.addEventListener(
         return { values: cleanValues, errors };
       }
       case EVAL_WORKER_ACTIONS.EVAL_TRIGGER: {
-        const { dynamicTrigger, callbackData, dataTree } = requestData;
+        const { callbackData, dataTree, dynamicTrigger } = requestData;
         if (!dataTreeEvaluator) {
           return { triggers: [], errors: [] };
         }
-        const evalTree = dataTreeEvaluator.updateDataTree(dataTree);
-        const triggers = dataTreeEvaluator.getDynamicValue(
+        dataTreeEvaluator.updateDataTree(dataTree);
+        const evalTree = dataTreeEvaluator.evalTree;
+        const {
+          errors: evalErrors,
+          triggers,
+        }: {
+          errors: EvaluationError[];
+          triggers: Array<any>;
+        } = dataTreeEvaluator.getDynamicValue(
           dynamicTrigger,
           evalTree,
           EvaluationSubstitutionType.TEMPLATE,
@@ -119,16 +139,15 @@ ctx.addEventListener(
         const cleanTriggers = removeFunctions(triggers);
         // Transforming eval errors into eval trigger errors. Since trigger
         // errors occur less, we want to treat it separately
-        const errors = dataTreeEvaluator.errors.map((error) => {
-          if (error.type === EvalErrorTypes.EVAL_ERROR) {
-            return {
-              ...error,
-              type: EvalErrorTypes.EVAL_TRIGGER_ERROR,
-            };
-          }
-          return error;
-        });
-        dataTreeEvaluator.clearErrors();
+        const errors = evalErrors
+          .filter(
+            (error) => error.errorType === PropertyEvaluationErrorType.PARSE,
+          )
+          .map((error) => ({
+            ...error,
+            message: error.errorMessage,
+            type: EvalErrorTypes.EVAL_TRIGGER_ERROR,
+          }));
         return { triggers: cleanTriggers, errors };
       }
       case EVAL_WORKER_ACTIONS.CLEAR_CACHE: {
@@ -152,7 +171,7 @@ ctx.addEventListener(
         return true;
       }
       case EVAL_WORKER_ACTIONS.VALIDATE_PROPERTY: {
-        const { property, value, props, validation } = requestData;
+        const { property, props, validation, value } = requestData;
         return removeFunctions(
           validateWidgetProperty(property, value, props, validation),
         );
diff --git a/app/client/src/workers/evaluationSubstitution.ts b/app/client/src/workers/evaluationSubstitution.ts
index 477cc180d0..d4d4511d82 100644
--- a/app/client/src/workers/evaluationSubstitution.ts
+++ b/app/client/src/workers/evaluationSubstitution.ts
@@ -33,8 +33,8 @@ export const smartSubstituteDynamicValues = (
 ): string => {
   const {
     binding,
-    subValues,
     subBindings,
+    subValues,
   } = filterBindingSegmentsAndRemoveQuotes(
     originalBinding,
     subSegments,
@@ -73,8 +73,8 @@ export const parameterSubstituteDynamicValues = (
 ) => {
   const {
     binding,
-    subValues,
     subBindings,
+    subValues,
   } = filterBindingSegmentsAndRemoveQuotes(
     originalBinding,
     subSegments,
diff --git a/app/client/src/workers/evaluationUtils.test.ts b/app/client/src/workers/evaluationUtils.test.ts
index 05127e1bc1..6223a739a8 100644
--- a/app/client/src/workers/evaluationUtils.test.ts
+++ b/app/client/src/workers/evaluationUtils.test.ts
@@ -55,6 +55,7 @@ describe("Add functions", () => {
         bindingPaths: {},
         isLoading: false,
         run: {},
+        responseMeta: { isExecutionSuccess: false },
         ENTITY_TYPE: ENTITY_TYPE.ACTION,
         dependencyMap: {},
       },
diff --git a/app/client/src/workers/evaluationUtils.ts b/app/client/src/workers/evaluationUtils.ts
index 781408fbe8..c6961956d2 100644
--- a/app/client/src/workers/evaluationUtils.ts
+++ b/app/client/src/workers/evaluationUtils.ts
@@ -1,7 +1,12 @@
 import {
   DependencyMap,
+  EVAL_ERROR_PATH,
+  EvaluationError,
+  getEvalErrorPath,
+  getEvalValuePath,
   isChildPropertyPath,
   isDynamicValue,
+  PropertyEvaluationErrorType,
 } from "utils/DynamicBindingUtils";
 import { WidgetProps } from "widgets/BaseWidget";
 import { VALIDATORS } from "./validations";
@@ -16,6 +21,7 @@ import {
 import _ from "lodash";
 import { VALIDATION_TYPES } from "constants/WidgetValidation";
 import { WidgetTypeConfigMap } from "utils/WidgetFactory";
+import { Severity } from "entities/AppsmithConsole";
 
 // Dropdown1.options[1].value -> Dropdown1.options[1]
 // Dropdown1.options[1] -> Dropdown1.options
@@ -63,17 +69,27 @@ function isInt(val: string | number): boolean {
 // Removes the entity name from the property path
 export function getEntityNameAndPropertyPath(
   fullPath: string,
-): { entityName: string; propertyPath: string } {
+): {
+  entityName: string;
+  propertyPath: string;
+} {
   const indexOfFirstDot = fullPath.indexOf(".");
+  if (indexOfFirstDot === -1) {
+    // No dot was found so path is the entity name itself
+    return {
+      entityName: fullPath,
+      propertyPath: "",
+    };
+  }
   const entityName = fullPath.substring(0, indexOfFirstDot);
-  const propertyPath = fullPath.substring(fullPath.indexOf(".") + 1);
+  const propertyPath = fullPath.substring(indexOfFirstDot + 1);
   return { entityName, propertyPath };
 }
 
 export const translateDiffEventToDataTreeDiffEvent = (
   difference: Diff<any, any>,
-): DataTreeDiff => {
-  const result: DataTreeDiff = {
+): DataTreeDiff | DataTreeDiff[] => {
+  let result: DataTreeDiff | DataTreeDiff[] = {
     payload: {
       propertyPath: "",
       value: "",
@@ -110,25 +126,53 @@ export const translateDiffEventToDataTreeDiffEvent = (
           propertyPath,
           value: difference.rhs,
         };
-      } else {
+      } else if (difference.lhs === undefined || difference.rhs === undefined) {
         // Handle static value changes that change structure that can lead to
         // old bindings being eligible
-        if (
-          difference.lhs === undefined &&
-          typeof difference.rhs === "object"
-        ) {
+        if (difference.lhs === undefined && isTrueObject(difference.rhs)) {
           result.event = DataTreeDiffEvent.NEW;
           result.payload = { propertyPath };
         }
-        if (
-          difference.rhs === undefined &&
-          typeof difference.lhs === "object"
-        ) {
+        if (difference.rhs === undefined && isTrueObject(difference.lhs)) {
           result.event = DataTreeDiffEvent.DELETE;
           result.payload = { propertyPath };
         }
-      }
+      } else if (
+        isTrueObject(difference.lhs) &&
+        !isTrueObject(difference.rhs)
+      ) {
+        // This will happen for static value changes where a property went
+        // from being an object to any other type like string or number
+        // in such a case we want to delete all nested paths of the
+        // original lhs object
 
+        result = Object.keys(difference.lhs).map((diffKey) => {
+          const path = `${propertyPath}.${diffKey}`;
+          return {
+            event: DataTreeDiffEvent.DELETE,
+            payload: {
+              propertyPath: path,
+            },
+          };
+        });
+      } else if (
+        !isTrueObject(difference.lhs) &&
+        isTrueObject(difference.rhs)
+      ) {
+        // This will happen for static value changes where a property went
+        // from being any other type like string or number to an object
+        // in such a case we want to add all nested paths of the
+        // new rhs object
+        result = Object.keys(difference.rhs).map((diffKey) => {
+          const path = `${propertyPath}.${diffKey}`;
+          return {
+            event: DataTreeDiffEvent.NEW,
+            payload: {
+              propertyPath: path,
+            },
+          };
+        });
+      }
       break;
     }
     case "A": {
@@ -192,7 +236,11 @@ export const removeFunctions = (value: any) => {
   if (_.isFunction(value)) {
     return "Function call";
   } else if (_.isObject(value)) {
-    return JSON.parse(JSON.stringify(value));
+    return JSON.parse(
+      JSON.stringify(value, (_, v) =>
+        typeof v === "bigint" ? v.toString() : v,
+      ),
+    );
   } else {
     return value;
   }
@@ -279,7 +327,7 @@ export function getValidatedTree(tree: DataTree) {
     Object.entries(entity.validationPaths).forEach(([property, validation]) => {
       const value = _.get(entity, property);
       // Pass it through parse
-      const { parsed, isValid, message, transformed } = validateWidgetProperty(
+      const { isValid, message, parsed, transformed } = validateWidgetProperty(
         property,
         value,
         entity,
@@ -293,13 +341,24 @@ export function getValidatedTree(tree: DataTree) {
         ? value
         : transformed;
       const safeEvaluatedValue = removeFunctions(evaluatedValue);
-      _.set(parsedEntity, `evaluatedValues.${property}`, safeEvaluatedValue);
+      _.set(
+        parsedEntity,
+        getEvalValuePath(`${entityKey}.${property}`, false),
+        safeEvaluatedValue,
+      );
       if (!isValid) {
-        _.set(parsedEntity, `invalidProps.${property}`, true);
-        _.set(parsedEntity, `validationMessages.${property}`, message);
-      } else {
-        _.set(parsedEntity, `invalidProps.${property}`, false);
-        _.set(parsedEntity, `validationMessages.${property}`, "");
+        addErrorToEntityProperty(
+          [
+            {
+              errorType: PropertyEvaluationErrorType.VALIDATION,
+              errorMessage: message || "",
+              severity: Severity.ERROR,
+              raw: value,
+            },
+          ],
+          tree,
+          getEvalErrorPath(`${entityKey}.${property}`, false),
+        );
       }
     });
     return { ...tree, [entityKey]: parsedEntity };
@@ -493,3 +552,31 @@ export function getSafeToRenderDataTree(
     return { ...tree, [entityKey]: safeToRenderEntity };
   }, tree);
 }
+
+export const addErrorToEntityProperty = (
+  errors: EvaluationError[],
+  dataTree: DataTree,
+  path: string,
+) => {
+  const { entityName, propertyPath } = getEntityNameAndPropertyPath(path);
+  const logBlackList = _.get(dataTree, `${entityName}.logBlackList`, {});
+  if (propertyPath && !(propertyPath in logBlackList)) {
+    const existingErrors = _.get(
+      dataTree,
+      `${entityName}.${EVAL_ERROR_PATH}['${propertyPath}']`,
+      [],
+    ) as EvaluationError[];
+    _.set(
+      dataTree,
+      `${entityName}.${EVAL_ERROR_PATH}['${propertyPath}']`,
+      existingErrors.concat(errors),
+    );
+  }
+  return dataTree;
+};
+
+// For the times when you need to know if something truly an object like { a: 1, b: 2}
+// typeof, lodash.isObject and others will return false positives for things like array, null, etc
+export const isTrueObject = (item: unknown): boolean => {
+  return Object.prototype.toString.call(item) === "[object Object]";
+};
diff --git a/app/client/src/workers/validations.test.ts b/app/client/src/workers/validations.test.ts
index 860a86f5bc..2a94d410b8 100644
--- a/app/client/src/workers/validations.test.ts
+++ b/app/client/src/workers/validations.test.ts
@@ -35,7 +35,7 @@ describe("Validate Validators", () => {
         output: {
           isValid: false,
           message:
-            'This value does not evaluate to type: [{ "x": "val", "y": "val" }]',
+            'This value does not evaluate to type: "Array<x:string, y:number>"',
           parsed: [],
           transformed: [{ x: "Jan", y: 1000 }, { x: "Feb" }],
         },
@@ -45,7 +45,7 @@ describe("Validate Validators", () => {
         output: {
           isValid: false,
           message:
-            'This value does not evaluate to type: [{ "x": "val", "y": "val" }]',
+            'This value does not evaluate to type: "Array<x:string, y:number>"',
           parsed: [],
           transformed: undefined,
         },
@@ -126,7 +126,7 @@ describe("Chart Custom Config validator", () => {
     const cases = [
       {
         input: {
-          type: "area2d",
+          type: "area",
           dataSource: {
             chart: {
               caption: "Countries With Most Oil Reserves [2017-18]",
@@ -175,7 +175,7 @@ describe("Chart Custom Config validator", () => {
         output: {
           isValid: true,
           parsed: {
-            type: "area2d",
+            type: "area",
             dataSource: {
               chart: {
                 caption: "Countries With Most Oil Reserves [2017-18]",
@@ -222,7 +222,7 @@ describe("Chart Custom Config validator", () => {
           },
 
           transformed: {
-            type: "area2d",
+            type: "area",
             dataSource: {
               chart: {
                 caption: "Countries With Most Oil Reserves [2017-18]",
@@ -350,6 +350,7 @@ describe("Chart Custom Config validator", () => {
               ],
             },
           },
+
           transformed: {
             type: "area2d",
             dataSource: {
@@ -516,8 +517,7 @@ describe("List data validator", () => {
         input: "sting text",
         output: {
           isValid: false,
-          message:
-            'This value does not evaluate to type: [{ "key1" : "val1", "key2" : "val2" }]',
+          message: 'This value does not evaluate to type: "Array<Object>"',
           parsed: [],
           transformed: "sting text",
         },
@@ -526,8 +526,7 @@ describe("List data validator", () => {
         input: undefined,
         output: {
           isValid: false,
-          message:
-            'This value does not evaluate to type: [{ "key1" : "val1", "key2" : "val2" }]',
+          message: 'This value does not evaluate to type: "Array<Object>"',
           parsed: [],
           transformed: undefined,
         },
@@ -536,8 +535,7 @@ describe("List data validator", () => {
         input: {},
         output: {
           isValid: false,
-          message:
-            'This value does not evaluate to type: [{ "key1" : "val1", "key2" : "val2" }]',
+          message: 'This value does not evaluate to type: "Array<Object>"',
           parsed: [],
           transformed: {},
         },
@@ -580,3 +578,221 @@ describe("List data validator", () => {
     });
   });
 });
+
+describe("Rating widget : defaultRate", () => {
+  const validator = VALIDATORS.RATE_DEFAULT_RATE;
+  it("An input is not a number", () => {
+    const cases = [
+      {
+        input: undefined,
+        output: {
+          isValid: false,
+          parsed: 0,
+          message: 'This value does not evaluate to type "number"',
+        },
+      },
+      {
+        input: "",
+        output: {
+          isValid: true,
+          parsed: 0,
+        },
+      },
+      {
+        input: "string",
+        output: {
+          isValid: false,
+          parsed: 0,
+          message: 'This value does not evaluate to type "number"',
+        },
+      },
+    ];
+    for (const testCase of cases) {
+      const response = validator(testCase.input, DUMMY_WIDGET, {});
+      expect(response).toStrictEqual(testCase.output);
+    }
+  });
+
+  it("An input is a number & maxCount", () => {
+    const cases = [
+      {
+        input: 3,
+        output: {
+          isValid: true,
+          parsed: 3,
+        },
+      },
+      {
+        input: 5,
+        output: {
+          isValid: true,
+          parsed: 5,
+        },
+      },
+      {
+        input: 6,
+        output: {
+          isValid: false,
+          parsed: 6,
+          message: "This value must be less than or equal to max count",
+        },
+      },
+    ];
+    for (const testCase of cases) {
+      const response = validator(
+        testCase.input,
+        { ...DUMMY_WIDGET, maxCount: 5 },
+        {},
+      );
+      expect(response).toStrictEqual(testCase.output);
+    }
+  });
+
+  it("An input is a number & isAllowedHalf=true", () => {
+    const cases = [
+      {
+        input: 3,
+        output: {
+          isValid: true,
+          parsed: 3,
+        },
+      },
+      {
+        input: 3.5,
+        output: {
+          isValid: true,
+          parsed: 3.5,
+        },
+      },
+    ];
+    for (const testCase of cases) {
+      const response = validator(
+        testCase.input,
+        { ...DUMMY_WIDGET, isAllowHalf: true },
+        {},
+      );
+      expect(response).toStrictEqual(testCase.output);
+    }
+  });
+
+  it("An input is a number & isAllowedHalf=false", () => {
+    const cases = [
+      {
+        input: 3,
+        output: {
+          isValid: true,
+          parsed: 3,
+        },
+      },
+      {
+        input: 3.5,
+        output: {
+          isValid: false,
+          parsed: 3.5,
+          message: `This value can be a decimal onlf if 'Allow half' is true`,
+        },
+      },
+    ];
+    for (const testCase of cases) {
+      const response = validator(
+        testCase.input,
+        { ...DUMMY_WIDGET, isAllowHalf: false },
+        {},
+      );
+      expect(response).toStrictEqual(testCase.output);
+    }
+  });
+});
+
+describe("Rating widget : maxCount", () => {
+  const validator = VALIDATORS.RATE_MAX_COUNT;
+  it("An input is not a number", () => {
+    const cases = [
+      {
+        input: undefined,
+        output: {
+          isValid: false,
+          parsed: 0,
+          message: 'This value does not evaluate to type "number"',
+        },
+      },
+      {
+        input: "",
+        output: {
+          isValid: true,
+          parsed: 0,
+        },
+      },
+      {
+        input: "string",
+        output: {
+          isValid: false,
+          parsed: 0,
+          message: 'This value does not evaluate to type "number"',
+        },
+      },
+    ];
+    for (const testCase of cases) {
+      const response = validator(testCase.input, DUMMY_WIDGET, {});
+      expect(response).toStrictEqual(testCase.output);
+    }
+  });
+
+  it("An input is a number, should be an integer", () => {
+    const cases = [
+      {
+        input: 3,
+        output: {
+          isValid: true,
+          parsed: 3,
+        },
+      },
+      {
+        input: 3.5,
+        output: {
+          isValid: false,
+          parsed: 3.5,
+          message: "This value must be integer",
+        },
+      },
+    ];
+    for (const testCase of cases) {
+      const response = validator(testCase.input, DUMMY_WIDGET, {});
+      expect(response).toStrictEqual(testCase.output);
+    }
+  });
+});
+
+describe("Color Picker Text validator", () => {
+  const validator = VALIDATORS.COLOR_PICKER_TEXT;
+  const inputs = [
+    "#e0e0e0",
+    "rgb(200,200,200)",
+    "{{Text2.text}}",
+    "<p>red</p>",
+  ];
+  const expected = [
+    {
+      isValid: true,
+      parsed: "#e0e0e0",
+    },
+    {
+      isValid: true,
+      parsed: "rgb(200,200,200)",
+    },
+    {
+      isValid: false,
+      parsed: "",
+      message: "This value does not evaluate to type: text",
+    },
+    {
+      isValid: false,
+      parsed: "",
+      message: "This value does not evaluate to type: text",
+    },
+  ];
+  inputs.forEach((input, index) => {
+    const response = validator(input, DUMMY_WIDGET);
+    expect(response).toStrictEqual(expected[index]);
+  });
+});
diff --git a/app/client/src/workers/validations.ts b/app/client/src/workers/validations.ts
index 12878ceb02..0d82ef1361 100644
--- a/app/client/src/workers/validations.ts
+++ b/app/client/src/workers/validations.ts
@@ -7,6 +7,7 @@ import {
 import { DataTree } from "../entities/DataTree/dataTreeFactory";
 import _, {
   every,
+  indexOf,
   isBoolean,
   isNil,
   isNumber,
@@ -14,10 +15,15 @@ import _, {
   isPlainObject,
   isString,
   isUndefined,
+  startsWith,
   toNumber,
   toString,
 } from "lodash";
 import { WidgetProps } from "../widgets/BaseWidget";
+import {
+  CUSTOM_CHART_TYPES,
+  CUSTOM_CHART_DEFAULT_PARSED,
+} from "../constants/CustomChartConstants";
 import moment from "moment";
 
 export function validateDateString(
@@ -86,7 +92,7 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
     props: WidgetProps,
     dataTree?: DataTree,
   ): ValidationResponse => {
-    const { isValid, parsed, message } = VALIDATORS[VALIDATION_TYPES.TEXT](
+    const { isValid, message, parsed } = VALIDATORS[VALIDATION_TYPES.TEXT](
       value,
       props,
       dataTree,
@@ -143,9 +149,8 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
     let parsed = value;
     if (isUndefined(value)) {
       return {
-        isValid: false,
+        isValid: true,
         parsed: false,
-        message: `${WIDGET_TYPE_VALIDATION_ERROR} "boolean"`,
       };
     }
     const isABoolean = isBoolean(value);
@@ -155,7 +160,7 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
     if (!isValid) {
       return {
         isValid: isValid,
-        parsed: parsed,
+        parsed: !!parsed,
         message: `${WIDGET_TYPE_VALIDATION_ERROR} "boolean"`,
       };
     }
@@ -221,6 +226,39 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
       };
     }
   },
+  [VALIDATION_TYPES.ARRAY_OPTIONAL]: (value: any): ValidationResponse => {
+    let parsed = value;
+    try {
+      if (!value) {
+        return {
+          isValid: true,
+          parsed: undefined,
+          transformed: undefined,
+        };
+      }
+      if (isString(value)) {
+        parsed = JSON.parse(parsed as string);
+      }
+
+      if (!Array.isArray(parsed)) {
+        return {
+          isValid: false,
+          parsed: [],
+          transformed: parsed,
+          message: `${WIDGET_TYPE_VALIDATION_ERROR} "Array"`,
+        };
+      }
+
+      return { isValid: true, parsed, transformed: parsed };
+    } catch (e) {
+      return {
+        isValid: false,
+        parsed: [],
+        transformed: parsed,
+        message: `${WIDGET_TYPE_VALIDATION_ERROR} "Array"`,
+      };
+    }
+  },
   [VALIDATION_TYPES.TABS_DATA]: (
     value: any,
     props: WidgetProps,
@@ -265,7 +303,7 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
     props: WidgetProps,
     dataTree?: DataTree,
   ): ValidationResponse => {
-    const { isValid, transformed, parsed } = VALIDATORS.ARRAY(
+    const { isValid, parsed, transformed } = VALIDATORS.ARRAY(
       value,
       props,
       dataTree,
@@ -276,7 +314,7 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
         isValid,
         parsed: [],
         transformed,
-        message: `${WIDGET_TYPE_VALIDATION_ERROR}: [{ "key1" : "val1", "key2" : "val2" }]`,
+        message: `${WIDGET_TYPE_VALIDATION_ERROR}: "Array<Object>"`,
       };
     }
 
@@ -293,7 +331,7 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
         isValid: false,
         parsed: [],
         transformed,
-        message: `${WIDGET_TYPE_VALIDATION_ERROR}: [{ "key1" : "val1", "key2" : "val2" }]`,
+        message: `${WIDGET_TYPE_VALIDATION_ERROR}: "Array<Object>"`,
       };
     }
     return { isValid, parsed };
@@ -303,7 +341,7 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
     props: WidgetProps,
     dataTree?: DataTree,
   ): ValidationResponse => {
-    const { isValid, transformed, parsed } = VALIDATORS.ARRAY(
+    const { isValid, parsed, transformed } = VALIDATORS.ARRAY(
       value,
       props,
       dataTree,
@@ -364,7 +402,7 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
       if (!isValid) {
         parsed = [];
         transformed = validatedResponse.transformed;
-        validationMessage = `${WIDGET_TYPE_VALIDATION_ERROR}: [{ "x": "val", "y": "val" }]`;
+        validationMessage = `${WIDGET_TYPE_VALIDATION_ERROR}: "Array<x:string, y:number>"`;
       } else {
         parsed = validatedResponse.parsed;
         transformed = validatedResponse.parsed;
@@ -416,6 +454,15 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
         message: `${WIDGET_TYPE_VALIDATION_ERROR} "{type: string, dataSource: { chart: object, data: Array<{label: string, value: number}>}}"`,
       };
     }
+    // check custom chart exist or not
+    const typeExist = indexOf(CUSTOM_CHART_TYPES, parsed.type) !== -1;
+    if (!typeExist) {
+      return {
+        isValid: false,
+        parsed: { ...CUSTOM_CHART_DEFAULT_PARSED },
+        message: `${WIDGET_TYPE_VALIDATION_ERROR} "{type: string, dataSource: { chart: object, data: Array<{label: string, value: number}>}}"`,
+      };
+    }
     return { isValid, parsed, transformed: parsed };
   },
   [VALIDATION_TYPES.MARKERS]: (
@@ -511,9 +558,8 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
         isValid: false,
         parsed: "",
         message:
-          `${WIDGET_TYPE_VALIDATION_ERROR}: Date ` + props.dateFormat
-            ? props.dateFormat
-            : "",
+          `${WIDGET_TYPE_VALIDATION_ERROR}: Date String ` +
+          (props.dateFormat ? props.dateFormat : ""),
       };
     }
     const isValid = validateDateString(dateString, dateFormat, props.version);
@@ -562,9 +608,8 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
         isValid: false,
         parsed: "",
         message:
-          `${WIDGET_TYPE_VALIDATION_ERROR}: Date ` + dateFormat
-            ? dateFormat
-            : "",
+          `${WIDGET_TYPE_VALIDATION_ERROR}: Date String ` +
+          (dateFormat ? dateFormat : ""),
       };
     }
 
@@ -604,9 +649,8 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
         isValid: false,
         parsed: "",
         message:
-          `${WIDGET_TYPE_VALIDATION_ERROR}: Date ` + dateFormat
-            ? dateFormat
-            : "",
+          `${WIDGET_TYPE_VALIDATION_ERROR}: Date String ` +
+          (dateFormat ? dateFormat : ""),
       };
     }
     const parsedMinDate = moment(dateString, dateFormat);
@@ -631,7 +675,9 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
       return {
         isValid: isValid,
         parsed: "",
-        message: `${WIDGET_TYPE_VALIDATION_ERROR}: Date R`,
+        message:
+          `${WIDGET_TYPE_VALIDATION_ERROR}: Date String ` +
+          (dateFormat ? dateFormat : ""),
       };
     }
     return {
@@ -653,9 +699,8 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
         isValid: false,
         parsed: "",
         message:
-          `${WIDGET_TYPE_VALIDATION_ERROR}: Date ` + dateFormat
-            ? dateFormat
-            : "",
+          `${WIDGET_TYPE_VALIDATION_ERROR}: Date String ` +
+          (dateFormat ? dateFormat : ""),
       };
     }
     const parsedMaxDate = moment(dateString, dateFormat);
@@ -680,7 +725,9 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
       return {
         isValid: isValid,
         parsed: "",
-        message: `${WIDGET_TYPE_VALIDATION_ERROR}: Date R`,
+        message:
+          `${WIDGET_TYPE_VALIDATION_ERROR}: Date String ` +
+          (dateFormat ? dateFormat : ""),
       };
     }
     return {
@@ -709,7 +756,7 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
     props: WidgetProps,
     dataTree?: DataTree,
   ): ValidationResponse => {
-    const { isValid, parsed, message } = VALIDATORS[VALIDATION_TYPES.ARRAY](
+    const { isValid, message, parsed } = VALIDATORS[VALIDATION_TYPES.ARRAY](
       value,
       props,
       dataTree,
@@ -1019,4 +1066,70 @@ export const VALIDATORS: Record<VALIDATION_TYPES, Validator> = {
       message: `${WIDGET_TYPE_VALIDATION_ERROR}: number[]`,
     };
   },
+  [VALIDATION_TYPES.RATE_DEFAULT_RATE]: (
+    value: any,
+    props: WidgetProps,
+  ): ValidationResponse => {
+    const { isValid, message, parsed } = VALIDATORS[VALIDATION_TYPES.NUMBER](
+      value,
+      props,
+    );
+    if (!isValid) {
+      return { isValid, parsed, message };
+    }
+    // default rate must be less than max count
+    if (!isNaN(props.maxCount) && Number(value) > Number(props.maxCount)) {
+      return {
+        isValid: false,
+        parsed,
+        message: `This value must be less than or equal to max count`,
+      };
+    }
+    // default rate can be a decimal onlf if Allow half property is true
+    if (!props.isAllowHalf && !Number.isInteger(parsed)) {
+      return {
+        isValid: false,
+        parsed,
+        message: `This value can be a decimal onlf if 'Allow half' is true`,
+      };
+    }
+    return { isValid, parsed };
+  },
+  [VALIDATION_TYPES.RATE_MAX_COUNT]: (
+    value: any,
+    props: WidgetProps,
+  ): ValidationResponse => {
+    const { isValid, message, parsed } = VALIDATORS[VALIDATION_TYPES.NUMBER](
+      value,
+      props,
+    );
+    if (!isValid) {
+      return { isValid, parsed, message };
+    }
+    // max count must be integer
+    if (!Number.isInteger(parsed)) {
+      return {
+        isValid: false,
+        parsed,
+        message: `This value must be integer`,
+      };
+    }
+    return { isValid, parsed };
+  },
+  [VALIDATION_TYPES.COLOR_PICKER_TEXT]: (
+    value: any,
+    props: WidgetProps,
+  ): ValidationResponse => {
+    // check value should be string
+    const { isValid, parsed } = VALIDATORS[VALIDATION_TYPES.TEXT](value, props);
+    // check value should not html tag or unparsed js
+    if (startsWith(parsed, "{{") || startsWith(parsed, "<")) {
+      return {
+        isValid: false,
+        parsed: "",
+        message: `${WIDGET_TYPE_VALIDATION_ERROR}: text`,
+      };
+    }
+    return { isValid, parsed };
+  },
 };
diff --git a/app/client/start-https.sh b/app/client/start-https.sh
index 692ea718c1..259c14286b 100755
--- a/app/client/start-https.sh
+++ b/app/client/start-https.sh
@@ -87,14 +87,6 @@ case "${uname_out}" in
         "
     ;;
     Darwin*)    machine=Mac
-        # workaround for apple silicon until host.docker.interal works as expected
-        if [[ "$(uname -m)" = "arm64" ]]; then
-            # if no server was passed
-            if [[ -z $1 ]]; then
-                server_proxy_pass='http://"$(ipconfig getifaddr en0)":8080'
-            fi
-            client_proxy_pass='http://"$(ipconfig getifaddr en0)":3000'
-        fi
         echo "
     Starting nginx for MacOS...
         "
diff --git a/app/client/test/factories/WidgetFactoryUtils.ts b/app/client/test/factories/WidgetFactoryUtils.ts
index 55f06e9d59..7200938d47 100644
--- a/app/client/test/factories/WidgetFactoryUtils.ts
+++ b/app/client/test/factories/WidgetFactoryUtils.ts
@@ -26,3 +26,10 @@ export const buildChildren = (children: Partial<WidgetProps>[]) => {
     console.error("Check if child widget data provided");
   }
 };
+
+export const buildDslWithChildren = (childData: Partial<WidgetProps>[]) => {
+  const children: any = buildChildren(childData);
+  return widgetCanvasFactory.build({
+    children,
+  });
+};
diff --git a/app/client/test/factories/Widgets/DividerFactory.ts b/app/client/test/factories/Widgets/DividerFactory.ts
new file mode 100644
index 0000000000..9b93fa1eee
--- /dev/null
+++ b/app/client/test/factories/Widgets/DividerFactory.ts
@@ -0,0 +1,25 @@
+import * as Factory from "factory.ts";
+import { generateReactKey } from "utils/generators";
+import { WidgetProps } from "widgets/BaseWidget";
+
+export const DividerFactory = Factory.Sync.makeFactory<WidgetProps>({
+  isVisible: true,
+  leftColumn: 8,
+  rightColumn: 12,
+  topRow: 12,
+  bottomRow: 13,
+  type: "DIVIDER_WIDGET",
+  orientation: "horizontal",
+  capType: "nc",
+  capSide: 0,
+  strokeStyle: "solid",
+  dividerColor: "black",
+  thickness: 2,
+  isLoading: false,
+  parentId: "qrqizehc5b",
+  dynamicBindingPathList: [],
+  widgetName: Factory.each((i) => `Divider${i + 1}`),
+  widgetId: generateReactKey(),
+  renderMode: "CANVAS",
+  version: 1,
+});
diff --git a/app/client/test/factories/Widgets/ImageFactory.ts b/app/client/test/factories/Widgets/ImageFactory.ts
index 297ccc684c..b05be9c441 100644
--- a/app/client/test/factories/Widgets/ImageFactory.ts
+++ b/app/client/test/factories/Widgets/ImageFactory.ts
@@ -6,6 +6,8 @@ export const ImageFactory = Factory.Sync.makeFactory<WidgetProps>({
   isVisible: true,
   defaultImage:
     "https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png",
+  enableDownload: false,
+  enableRotation: false,
   imageShape: "RECTANGLE",
   image: "",
   widgetName: Factory.each((i) => `Image${i + 1}`),
diff --git a/app/client/test/factories/Widgets/ListFactory.ts b/app/client/test/factories/Widgets/ListFactory.ts
index a91252e06d..4da12f41e4 100644
--- a/app/client/test/factories/Widgets/ListFactory.ts
+++ b/app/client/test/factories/Widgets/ListFactory.ts
@@ -14,7 +14,7 @@ export const ListFactory = Factory.Sync.makeFactory<WidgetProps>({
   topRow: 1,
   bottomRow: 3,
   isLoading: false,
-  items: [],
+  listData: [],
   disablePropertyPane: false,
   widgetName: Factory.each((i) => `List${i + 1}`),
   widgetId: generateReactKey(),
diff --git a/app/client/test/factories/Widgets/WidgetTypeFactories.ts b/app/client/test/factories/Widgets/WidgetTypeFactories.ts
index 0b7a142f0e..7dd5361f7b 100644
--- a/app/client/test/factories/Widgets/WidgetTypeFactories.ts
+++ b/app/client/test/factories/Widgets/WidgetTypeFactories.ts
@@ -22,6 +22,7 @@ import { FilepickerFactory } from "./FilepickerFactory";
 import { VideoFactory } from "./VideoFactory";
 import { SkeletonFactory } from "./SkeletonFactory";
 import { ListFactory } from "./ListFactory";
+import { DividerFactory } from "./DividerFactory";
 
 export const WidgetTypeFactories = {
   SWITCH_WIDGET: SwitchFactory,
@@ -50,4 +51,5 @@ export const WidgetTypeFactories = {
   VIDEO_WIDGET: VideoFactory,
   SKELETON_WIDGET: SkeletonFactory,
   LIST_WIDGET: ListFactory,
+  DIVIDER_WIDGET: DividerFactory,
 };
diff --git a/app/client/test/sagas.ts b/app/client/test/sagas.ts
new file mode 100644
index 0000000000..e44156e80e
--- /dev/null
+++ b/app/client/test/sagas.ts
@@ -0,0 +1,61 @@
+import initSagas from "../src/sagas/InitSagas";
+import apiPaneSagas from "../src/sagas/ApiPaneSagas";
+import userSagas from "../src/sagas/userSagas";
+import pluginSagas from "../src/sagas/PluginSagas";
+import orgSagas from "../src/sagas/OrgSagas";
+import importedCollectionsSagas from "../src/sagas/CollectionSagas";
+import providersSagas from "../src/sagas/ProvidersSaga";
+import curlImportSagas from "../src/sagas/CurlImportSagas";
+import queryPaneSagas from "../src/sagas/QueryPaneSagas";
+import modalSagas from "../src/sagas/ModalSagas";
+import batchSagas from "../src/sagas/BatchSagas";
+import themeSagas from "../src/sagas/ThemeSaga";
+import utilSagas from "../src/sagas/UtilSagas";
+import saaSPaneSagas from "../src/sagas/SaaSPaneSagas";
+import actionExecutionChangeListeners from "../src/sagas/WidgetLoadingSaga";
+import globalSearchSagas from "../src/sagas/GlobalSearchSagas";
+import recentEntitiesSagas from "../src/sagas/RecentEntitiesSagas";
+import commentSagas from "../src/sagas/CommentSagas";
+import websocketSagas from "../src/sagas/WebsocketSagas/WebsocketSagas";
+import debuggerSagas from "../src/sagas/DebuggerSagas";
+import { fetchWidgetCardsSaga } from "../src/sagas/WidgetSidebarSagas";
+import { watchActionSagas } from "../src/sagas/ActionSagas";
+import { watchActionExecutionSagas } from "../src/sagas/ActionExecutionSagas";
+import widgetOperationSagas from "../src/sagas/WidgetOperationSagas";
+import applicationSagas from "../src/sagas/ApplicationSagas";
+import { watchDatasourcesSagas } from "../src/sagas/DatasourcesSagas";
+import tourSagas from "../src/sagas/TourSagas";
+import notificationsSagas from "../src/sagas/NotificationsSagas";
+import selectionCanvasSagas from "../src/sagas/SelectionCanvasSagas";
+
+export const sagasToRunForTests = [
+  initSagas,
+  fetchWidgetCardsSaga,
+  watchActionSagas,
+  watchActionExecutionSagas,
+  widgetOperationSagas,
+  watchDatasourcesSagas,
+  applicationSagas,
+  apiPaneSagas,
+  userSagas,
+  pluginSagas,
+  orgSagas,
+  importedCollectionsSagas,
+  providersSagas,
+  curlImportSagas,
+  queryPaneSagas,
+  modalSagas,
+  batchSagas,
+  themeSagas,
+  actionExecutionChangeListeners,
+  utilSagas,
+  saaSPaneSagas,
+  globalSearchSagas,
+  recentEntitiesSagas,
+  commentSagas,
+  websocketSagas,
+  debuggerSagas,
+  tourSagas,
+  notificationsSagas,
+  selectionCanvasSagas,
+];
diff --git a/app/client/test/setup.ts b/app/client/test/setup.ts
index 9a04bae542..467389f248 100644
--- a/app/client/test/setup.ts
+++ b/app/client/test/setup.ts
@@ -2,10 +2,32 @@ import { setupServer } from "msw/node";
 import { handlers } from "./__mocks__/apiHandlers";
 export const server = setupServer(...handlers);
 
+window.scrollTo = jest.fn();
+
 // establish API mocking before all tests
-beforeAll(() => server.listen())
+beforeAll(() => server.listen());
 // reset any request handlers that are declared as a part of our tests
 // (i.e. for testing one-time error scenarios)
-afterEach(() => server.resetHandlers())
+afterEach(() => server.resetHandlers());
 // clean up once the tests are done
-afterAll(() => server.close())
+afterAll(() => server.close());
+
+// popper.js fix for jest tests
+document.createRange = () => {
+  const range = new Range();
+
+  range.getBoundingClientRect = jest.fn();
+
+  range.getClientRects = () => {
+    return {
+      item: () => null,
+      length: 0,
+      [Symbol.iterator]: jest.fn(),
+    };
+  };
+
+  return range;
+};
+
+// jest events doesnt seem to be handling scrollTo
+Element.prototype.scrollTo = () => {};
diff --git a/app/client/test/testCommon.ts b/app/client/test/testCommon.ts
new file mode 100644
index 0000000000..d1e3c644f1
--- /dev/null
+++ b/app/client/test/testCommon.ts
@@ -0,0 +1,143 @@
+import { getCanvasWidgetsPayload } from "sagas/PageSagas";
+import { updateCurrentPage } from "actions/pageActions";
+import { editorInitializer } from "utils/EditorUtils";
+import {
+  PageListPayload,
+  ReduxActionTypes,
+} from "constants/ReduxActionConstants";
+import { initEditor } from "actions/initActions";
+import { useDispatch } from "react-redux";
+import { extractCurrentDSL } from "utils/WidgetPropsUtils";
+import { setAppMode } from "actions/pageActions";
+import { APP_MODE } from "reducers/entityReducers/appReducer";
+import { createSelector } from "reselect";
+import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
+import { getCanvasWidgets } from "selectors/entitiesSelector";
+import { ContainerWidgetProps } from "widgets/ContainerWidget";
+import { WidgetProps } from "widgets/BaseWidget";
+import CanvasWidgetsNormalizer from "normalizers/CanvasWidgetsNormalizer";
+
+export const useMockDsl = (dsl: any) => {
+  const dispatch = useDispatch();
+  dispatch(setAppMode(APP_MODE.EDIT));
+  const mockResp: any = {
+    data: {
+      id: "page_id",
+      name: "Page1",
+      applicationId: "app_id",
+      isDefault: true,
+      isHidden: false,
+      layouts: [
+        {
+          id: "layout_id",
+          dsl,
+          layoutOnLoadActions: [],
+          layoutActions: [],
+        },
+      ],
+    },
+  };
+  const canvasWidgetsPayload = getCanvasWidgetsPayload(mockResp);
+  dispatch({
+    type: ReduxActionTypes.FETCH_PAGE_DSLS_SUCCESS,
+    payload: [
+      {
+        pageId: mockResp.data.id,
+        dsl: extractCurrentDSL(mockResp),
+      },
+    ],
+  });
+  const pages: PageListPayload = [
+    {
+      pageName: mockResp.data.name,
+      pageId: mockResp.data.id,
+      isDefault: mockResp.data.isDefault,
+      isHidden: !!mockResp.data.isHidden,
+    },
+  ];
+  dispatch({
+    type: ReduxActionTypes.FETCH_PAGE_LIST_SUCCESS,
+    payload: {
+      pages,
+      applicationId: mockResp.data.applicationId,
+    },
+  });
+  dispatch({
+    type: "UPDATE_LAYOUT",
+    payload: { widgets: canvasWidgetsPayload.widgets },
+  });
+
+  dispatch(updateCurrentPage(mockResp.data.id));
+};
+export function MockPageDSL({ dsl, children }: any) {
+  editorInitializer();
+  useMockDsl(dsl);
+  return children;
+}
+
+export const mockGetCanvasWidgetDsl = createSelector(
+  getCanvasWidgets,
+  (
+    canvasWidgets: CanvasWidgetsReduxState,
+  ): ContainerWidgetProps<WidgetProps> => {
+    return CanvasWidgetsNormalizer.denormalize("0", {
+      canvasWidgets,
+    });
+  },
+);
+
+export const syntheticTestMouseEvent = (
+  event: MouseEvent,
+  optionsToAdd = {},
+) => {
+  const options = Object.entries(optionsToAdd);
+  options.forEach(([key, value]) => {
+    Object.defineProperty(event, key, { get: () => value });
+  });
+  return event;
+};
+
+export function MockApplication({ children }: any) {
+  editorInitializer();
+  const dispatch = useDispatch();
+  dispatch(initEditor("app_id", "page_id"));
+  const mockResp: any = {
+    organizationId: "org_id",
+    pages: [{ id: "page_id", name: "Page1", isDefault: true }],
+    id: "app_id",
+    isDefault: true,
+    name: "Page1",
+  };
+  dispatch({
+    type: ReduxActionTypes.FETCH_APPLICATION_SUCCESS,
+    payload: mockResp,
+  });
+  return children;
+}
+
+//got it from @blueprintjs/test-commons to dispatch hotkeys events
+export function dispatchTestKeyboardEventWithCode(
+  target: EventTarget,
+  eventType: string,
+  key: string,
+  keyCode: number,
+  shift = false,
+  meta = false,
+) {
+  const event = document.createEvent("KeyboardEvent");
+  (event as any).initKeyboardEvent(
+    eventType,
+    true,
+    true,
+    window,
+    key,
+    0,
+    meta,
+    false,
+    shift,
+  );
+  Object.defineProperty(event, "key", { get: () => key });
+  Object.defineProperty(event, "which", { get: () => keyCode });
+
+  target.dispatchEvent(event);
+}
diff --git a/app/client/test/testMockedWidgets.tsx b/app/client/test/testMockedWidgets.tsx
new file mode 100644
index 0000000000..eea110370e
--- /dev/null
+++ b/app/client/test/testMockedWidgets.tsx
@@ -0,0 +1,9 @@
+import Canvas from "pages/Editor/Canvas";
+import React from "react";
+import { useSelector } from "react-redux";
+import { mockGetCanvasWidgetDsl } from "./testCommon";
+
+export const MockCanvas = () => {
+  const dsl = useSelector(mockGetCanvasWidgetDsl);
+  return <Canvas dsl={dsl}></Canvas>;
+};
diff --git a/app/client/test/testUtils.tsx b/app/client/test/testUtils.tsx
index 11f9f623f7..9c4d8f8120 100644
--- a/app/client/test/testUtils.tsx
+++ b/app/client/test/testUtils.tsx
@@ -2,19 +2,46 @@ import React, { ReactElement } from "react";
 import { render, RenderOptions, queries } from "@testing-library/react";
 import { Provider } from "react-redux";
 import { ThemeProvider } from "../src/constants/DefaultTheme";
-import store, { testStore } from "../src/store";
 import { getCurrentThemeDetails } from "../src/selectors/themeSelectors";
 import * as customQueries from "./customQueries";
 import { BrowserRouter } from "react-router-dom";
-import { AppState } from "reducers";
+import appReducer, { AppState } from "reducers";
 import { DndProvider } from "react-dnd";
 import TouchBackend from "react-dnd-touch-backend";
+import { applyMiddleware, compose, createStore } from "redux";
+import { reduxBatch } from "@manaflair/redux-batch";
+import createSagaMiddleware from "redux-saga";
+import store, { testStore } from "store";
+import { sagasToRunForTests } from "./sagas";
+import { all, call, spawn } from "redux-saga/effects";
+const testSagaMiddleware = createSagaMiddleware();
+
+const testStoreWithTestMiddleWare = (initialState: Partial<AppState>) =>
+  createStore(
+    appReducer,
+    initialState,
+    compose(reduxBatch, applyMiddleware(testSagaMiddleware), reduxBatch),
+  );
+
+const rootSaga = function*(sagasToRun = sagasToRunForTests) {
+  yield all(
+    sagasToRun.map((saga) =>
+      spawn(function*() {
+        while (true) {
+          yield call(saga);
+          break;
+        }
+      }),
+    ),
+  );
+};
 
 const customRender = (
   ui: ReactElement,
   state?: {
     url?: string;
     initialState?: Partial<AppState>;
+    sagasToRun?: typeof sagasToRunForTests;
   },
   options?: Omit<RenderOptions, "queries">,
 ) => {
@@ -23,6 +50,11 @@ const customRender = (
   if (state && state.initialState) {
     reduxStore = testStore(state.initialState || {});
   }
+  if (state && state.sagasToRun) {
+    reduxStore = testStoreWithTestMiddleWare(reduxStore.getState());
+    testSagaMiddleware.run(() => rootSaga(state.sagasToRun));
+  }
+
   const defaultTheme = getCurrentThemeDetails(reduxStore.getState());
   return render(
     <BrowserRouter>
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index 8af878b06b..72729f5187 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -3,32 +3,32 @@
 
 
 "@algolia/cache-browser-local-storage@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.5.1.tgz#bdf58c30795683fd48310c552c3a10f10fb26e2b"
+  "resolved" "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/cache-common" "4.5.1"
 
 "@algolia/cache-common@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.5.1.tgz#3aefda3382dc30b67091b01a3d7461d937082821"
+  "resolved" "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.5.1.tgz"
+  "version" "4.5.1"
 
 "@algolia/cache-in-memory@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.5.1.tgz#127cd473474f62300a157f4ee3b3f6836003cf35"
+  "resolved" "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/cache-common" "4.5.1"
 
 "@algolia/client-account@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.5.1.tgz#7d3ccda09d3c7849b171c915da0833e7649bab33"
+  "resolved" "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/client-common" "4.5.1"
     "@algolia/client-search" "4.5.1"
     "@algolia/transporter" "4.5.1"
 
 "@algolia/client-analytics@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.5.1.tgz#bfc2a7292a9ea789ca3c99f79b1f96c08d378828"
+  "resolved" "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/client-common" "4.5.1"
     "@algolia/client-search" "4.5.1"
@@ -36,89 +36,89 @@
     "@algolia/transporter" "4.5.1"
 
 "@algolia/client-common@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.5.1.tgz#91a401eba6eafd7cc74a0aeccb4c6e6cb1e72026"
+  "resolved" "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/requester-common" "4.5.1"
     "@algolia/transporter" "4.5.1"
 
 "@algolia/client-recommendation@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-recommendation/-/client-recommendation-4.5.1.tgz#57a1fe30987c90b10d5119b8e7d6cd91c423e54c"
+  "resolved" "https://registry.npmjs.org/@algolia/client-recommendation/-/client-recommendation-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/client-common" "4.5.1"
     "@algolia/requester-common" "4.5.1"
     "@algolia/transporter" "4.5.1"
 
 "@algolia/client-search@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.5.1.tgz#cb798c99d6621e29a36334b92205518a74ecdf3e"
+  "resolved" "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/client-common" "4.5.1"
     "@algolia/requester-common" "4.5.1"
     "@algolia/transporter" "4.5.1"
 
 "@algolia/logger-common@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.5.1.tgz#18d654516369a28e25ad7eee4fc2882fd47ed8ec"
+  "resolved" "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.5.1.tgz"
+  "version" "4.5.1"
 
 "@algolia/logger-console@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.5.1.tgz#c9def97c20bea5eecb4b07f8d3f733c0192d1761"
+  "resolved" "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/logger-common" "4.5.1"
 
 "@algolia/requester-browser-xhr@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.5.1.tgz#838b55209d2c83572df261338f7cd75be36de401"
+  "resolved" "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/requester-common" "4.5.1"
 
 "@algolia/requester-common@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.5.1.tgz#a34d02daa6093e112b528d3bcd5a5467c00ba823"
+  "resolved" "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.5.1.tgz"
+  "version" "4.5.1"
 
 "@algolia/requester-node-http@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.5.1.tgz#29911c104c6714a5cb29d3991f2b50c52301e091"
+  "resolved" "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/requester-common" "4.5.1"
 
 "@algolia/transporter@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.5.1.tgz#e0a5c64f358b6751f867001f51f384d6fc7ede14"
+  "resolved" "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/cache-common" "4.5.1"
     "@algolia/logger-common" "4.5.1"
     "@algolia/requester-common" "4.5.1"
 
-"@babel/code-frame@7.10.4", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.5.5":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.5.5", "@babel/code-frame@7.10.4":
+  "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/highlight" "^7.10.4"
 
 "@babel/code-frame@7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
+  "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz"
+  "version" "7.5.5"
   dependencies:
     "@babel/highlight" "^7.0.0"
 
 "@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c"
+  "resolved" "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz"
+  "version" "7.11.0"
   dependencies:
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    semver "^5.5.0"
+    "browserslist" "^4.12.0"
+    "invariant" "^2.2.4"
+    "semver" "^5.5.0"
 
 "@babel/compat-data@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.1.tgz#d7386a689aa0ddf06255005b4b991988021101a0"
+  "resolved" "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz"
+  "version" "7.12.1"
 
-"@babel/core@7.11.6", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.4.5", "@babel/core@^7.7.4", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
+"@babel/core@*", "@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.0.1", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.11.6", "@babel/core@^7.4.5", "@babel/core@^7.7.4", "@babel/core@^7.7.5", "@babel/core@^7.8.4", "@babel/core@7 || ^7.0.0-rc.2", "@babel/core@7.11.6":
+  "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz"
+  "version" "7.11.6"
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/generator" "^7.11.6"
@@ -128,18 +128,18 @@
     "@babel/template" "^7.10.4"
     "@babel/traverse" "^7.11.5"
     "@babel/types" "^7.11.5"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.19"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
+    "convert-source-map" "^1.7.0"
+    "debug" "^4.1.0"
+    "gensync" "^1.0.0-beta.1"
+    "json5" "^2.1.2"
+    "lodash" "^4.17.19"
+    "resolve" "^1.3.2"
+    "semver" "^5.4.1"
+    "source-map" "^0.5.0"
 
-"@babel/core@7.12.3", "@babel/core@^7.9.0":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
+"@babel/core@^7.9.0":
+  "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz"
+  "version" "7.12.3"
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/generator" "^7.12.1"
@@ -149,89 +149,121 @@
     "@babel/template" "^7.10.4"
     "@babel/traverse" "^7.12.1"
     "@babel/types" "^7.12.1"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.19"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
+    "convert-source-map" "^1.7.0"
+    "debug" "^4.1.0"
+    "gensync" "^1.0.0-beta.1"
+    "json5" "^2.1.2"
+    "lodash" "^4.17.19"
+    "resolve" "^1.3.2"
+    "semver" "^5.4.1"
+    "source-map" "^0.5.0"
+
+"@babel/core@7.12.3":
+  "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz"
+  "version" "7.12.3"
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.12.1"
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helpers" "^7.12.1"
+    "@babel/parser" "^7.12.3"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    "convert-source-map" "^1.7.0"
+    "debug" "^4.1.0"
+    "gensync" "^1.0.0-beta.1"
+    "json5" "^2.1.2"
+    "lodash" "^4.17.19"
+    "resolve" "^1.3.2"
+    "semver" "^5.4.1"
+    "source-map" "^0.5.0"
 
 "@babel/generator@^7.11.5", "@babel/generator@^7.11.6", "@babel/generator@^7.4.0":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
+  "resolved" "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"
+  "version" "7.11.6"
   dependencies:
     "@babel/types" "^7.11.5"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
+    "jsesc" "^2.5.1"
+    "source-map" "^0.5.0"
 
 "@babel/generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468"
+  "resolved" "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/types" "^7.12.1"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
+    "jsesc" "^2.5.1"
+    "source-map" "^0.5.0"
 
 "@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
+  "resolved" "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/types" "^7.10.4"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
+  "resolved" "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
 "@babel/helper-builder-react-jsx-experimental@^7.10.4", "@babel/helper-builder-react-jsx-experimental@^7.11.5":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz#4ea43dd63857b0a35cd1f1b161dc29b43414e79f"
+  "resolved" "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz"
+  "version" "7.11.5"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-module-imports" "^7.10.4"
     "@babel/types" "^7.11.5"
 
 "@babel/helper-builder-react-jsx-experimental@^7.12.1":
-  version "7.12.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
+  "resolved" "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz"
+  "version" "7.12.4"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-module-imports" "^7.12.1"
     "@babel/types" "^7.12.1"
 
 "@babel/helper-builder-react-jsx@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz#8095cddbff858e6fa9c326daee54a2f2732c1d5d"
+  "resolved" "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/types" "^7.10.4"
 
 "@babel/helper-compilation-targets@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
+  "resolved" "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/compat-data" "^7.10.4"
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
-    semver "^5.5.0"
+    "browserslist" "^4.12.0"
+    "invariant" "^2.2.4"
+    "levenary" "^1.1.1"
+    "semver" "^5.5.0"
 
 "@babel/helper-compilation-targets@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz#310e352888fbdbdd8577be8dfdd2afb9e7adcf50"
+  "resolved" "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/compat-data" "^7.12.1"
     "@babel/helper-validator-option" "^7.12.1"
-    browserslist "^4.12.0"
-    semver "^5.5.0"
+    "browserslist" "^4.12.0"
+    "semver" "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
+"@babel/helper-create-class-features-plugin@^7.10.4":
+  "resolved" "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"
+  "version" "7.10.5"
+  dependencies:
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.10.5"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+
+"@babel/helper-create-class-features-plugin@^7.10.5":
+  "resolved" "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"
+  "version" "7.10.5"
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-member-expression-to-functions" "^7.10.5"
@@ -241,8 +273,8 @@
     "@babel/helper-split-export-declaration" "^7.10.4"
 
 "@babel/helper-create-class-features-plugin@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
+  "resolved" "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-member-expression-to-functions" "^7.12.1"
@@ -251,82 +283,82 @@
     "@babel/helper-split-export-declaration" "^7.10.4"
 
 "@babel/helper-create-regexp-features-plugin@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
+  "resolved" "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-regex" "^7.10.4"
-    regexpu-core "^4.7.0"
+    "regexpu-core" "^4.7.0"
 
 "@babel/helper-create-regexp-features-plugin@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8"
+  "resolved" "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-regex" "^7.10.4"
-    regexpu-core "^4.7.1"
+    "regexpu-core" "^4.7.1"
 
 "@babel/helper-define-map@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
+  "resolved" "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"
+  "version" "7.10.5"
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/types" "^7.10.5"
-    lodash "^4.17.19"
+    "lodash" "^4.17.19"
 
 "@babel/helper-explode-assignable-expression@^7.10.4":
-  version "7.11.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz#2d8e3470252cc17aba917ede7803d4a7a276a41b"
+  "resolved" "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"
+  "version" "7.11.4"
   dependencies:
     "@babel/types" "^7.10.4"
 
 "@babel/helper-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  "resolved" "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-get-function-arity" "^7.10.4"
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
 "@babel/helper-get-function-arity@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
+  "resolved" "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/types" "^7.10.4"
 
 "@babel/helper-hoist-variables@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
+  "resolved" "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/types" "^7.10.4"
 
 "@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df"
+  "resolved" "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"
+  "version" "7.11.0"
   dependencies:
     "@babel/types" "^7.11.0"
 
 "@babel/helper-member-expression-to-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
+  "resolved" "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/types" "^7.12.1"
 
 "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
+  "resolved" "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/types" "^7.10.4"
 
 "@babel/helper-module-imports@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz#1644c01591a15a2f084dd6d092d9430eb1d1216c"
+  "resolved" "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/types" "^7.12.1"
 
 "@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
+  "resolved" "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"
+  "version" "7.11.0"
   dependencies:
     "@babel/helper-module-imports" "^7.10.4"
     "@babel/helper-replace-supers" "^7.10.4"
@@ -334,11 +366,11 @@
     "@babel/helper-split-export-declaration" "^7.11.0"
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.11.0"
-    lodash "^4.17.19"
+    "lodash" "^4.17.19"
 
 "@babel/helper-module-transforms@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
+  "resolved" "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-module-imports" "^7.12.1"
     "@babel/helper-replace-supers" "^7.12.1"
@@ -348,27 +380,27 @@
     "@babel/template" "^7.10.4"
     "@babel/traverse" "^7.12.1"
     "@babel/types" "^7.12.1"
-    lodash "^4.17.19"
+    "lodash" "^4.17.19"
 
 "@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
+  "resolved" "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-plugin-utils@7.10.4", "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3", "@babel/helper-plugin-utils@7.10.4":
+  "resolved" "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"
+  "version" "7.10.4"
 
 "@babel/helper-regex@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
+  "resolved" "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz"
+  "version" "7.10.5"
   dependencies:
-    lodash "^4.17.19"
+    "lodash" "^4.17.19"
 
 "@babel/helper-remap-async-to-generator@^7.10.4":
-  version "7.11.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz#4474ea9f7438f18575e30b0cac784045b402a12d"
+  "resolved" "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"
+  "version" "7.11.4"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-wrap-function" "^7.10.4"
@@ -376,16 +408,16 @@
     "@babel/types" "^7.10.4"
 
 "@babel/helper-remap-async-to-generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
+  "resolved" "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-wrap-function" "^7.10.4"
     "@babel/types" "^7.12.1"
 
 "@babel/helper-replace-supers@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
+  "resolved" "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.10.4"
     "@babel/helper-optimise-call-expression" "^7.10.4"
@@ -393,8 +425,8 @@
     "@babel/types" "^7.10.4"
 
 "@babel/helper-replace-supers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz#f15c9cc897439281891e11d5ce12562ac0cf3fa9"
+  "resolved" "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.12.1"
     "@babel/helper-optimise-call-expression" "^7.10.4"
@@ -402,47 +434,47 @@
     "@babel/types" "^7.12.1"
 
 "@babel/helper-simple-access@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
+  "resolved" "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
 "@babel/helper-simple-access@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
+  "resolved" "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/types" "^7.12.1"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729"
+  "resolved" "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"
+  "version" "7.11.0"
   dependencies:
     "@babel/types" "^7.11.0"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  "resolved" "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/types" "^7.12.1"
 
 "@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+  "resolved" "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"
+  "version" "7.11.0"
   dependencies:
     "@babel/types" "^7.11.0"
 
 "@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  "resolved" "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"
+  "version" "7.10.4"
 
 "@babel/helper-validator-option@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
+  "resolved" "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"
+  "version" "7.12.1"
 
 "@babel/helper-wrap-function@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz#8a6f701eab0ff39f765b5a1cfef409990e624b87"
+  "resolved" "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/template" "^7.10.4"
@@ -450,426 +482,426 @@
     "@babel/types" "^7.10.4"
 
 "@babel/helpers@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
+  "resolved" "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/template" "^7.10.4"
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
 "@babel/helpers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.1.tgz#8a8261c1d438ec18cb890434df4ec768734c1e79"
+  "resolved" "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/template" "^7.10.4"
     "@babel/traverse" "^7.12.1"
     "@babel/types" "^7.12.1"
 
 "@babel/highlight@^7.0.0", "@babel/highlight@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  "resolved" "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-validator-identifier" "^7.10.4"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
+    "chalk" "^2.0.0"
+    "js-tokens" "^4.0.0"
 
 "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.10.4", "@babel/parser@^7.11.5", "@babel/parser@^7.4.2", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.7.0", "@babel/parser@^7.9.6":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
+  "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"
+  "version" "7.11.5"
 
 "@babel/parser@^7.12.1", "@babel/parser@^7.12.3":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.3.tgz#a305415ebe7a6c7023b40b5122a0662d928334cd"
+  "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz"
+  "version" "7.12.3"
 
 "@babel/plugin-proposal-async-generator-functions@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"
+  "version" "7.10.5"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-remap-async-to-generator" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-remap-async-to-generator" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@7.12.1", "@babel/plugin-proposal-class-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.7.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@7.12.1":
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"
+  "version" "7.12.1"
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-proposal-decorators@7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz#59271439fed4145456c41067450543aee332d15f"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-decorators" "^7.12.1"
 
 "@babel/plugin-proposal-dynamic-import@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz#ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
 "@babel/plugin-proposal-dynamic-import@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
 "@babel/plugin-proposal-export-namespace-from@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
 "@babel/plugin-proposal-export-namespace-from@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
 "@babel/plugin-proposal-json-strings@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
 "@babel/plugin-proposal-json-strings@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
 "@babel/plugin-proposal-logical-assignment-operators@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"
+  "version" "7.11.0"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
 "@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@7.12.1", "@babel/plugin-proposal-numeric-separator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz#0e2c6774c4ce48be412119b4d693ac777f7685a6"
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@7.12.1":
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
 "@babel/plugin-proposal-numeric-separator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz#ce1590ff0a65ad12970a609d78855e9a4c1aef06"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@7.11.0", "@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.11.0", "@babel/plugin-proposal-object-rest-spread@^7.6.2":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
+"@babel/plugin-proposal-numeric-separator@^7.12.1", "@babel/plugin-proposal-numeric-separator@7.12.1":
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz"
+  "version" "7.12.1"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
+"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.11.0", "@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@7.11.0":
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"
+  "version" "7.11.0"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.10.4"
 
 "@babel/plugin-proposal-object-rest-spread@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.12.1"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@7.12.1", "@babel/plugin-proposal-optional-chaining@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797"
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-
 "@babel/plugin-proposal-optional-chaining@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"
+  "version" "7.11.0"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
+"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@7.12.1":
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz"
+  "version" "7.12.1"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+
 "@babel/plugin-proposal-private-methods@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz#b160d972b8fdba5c7d111a145fc8c421fc2a6909"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-proposal-private-methods@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-proposal-unicode-property-regex@^7.10.4", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-proposal-unicode-property-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
+  "version" "7.8.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-bigint@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-class-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-class-properties@^7.12.1", "@babel/plugin-syntax-class-properties@^7.8.3":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-decorators@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-export-namespace-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-flow@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz#53351dd7ae01995e567d04ce42af1a6e0ba846a6"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-flow@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz#a77670d9abe6d63e8acadf4c31bb1eb5a506bbdd"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-import-meta@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@7.10.4", "@babel/plugin-syntax-jsx@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz#39abaae3cbf710c4373d8429484e6ba21340166c"
+"@babel/plugin-syntax-jsx@^7.10.4", "@babel/plugin-syntax-jsx@7.10.4":
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-jsx@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@7.8.3", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3", "@babel/plugin-syntax-object-rest-spread@7.8.3":
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-top-level-await@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-top-level-await@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-typescript@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz#2f55e770d3501e83af217d782cb7517d7bb34d25"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-typescript@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-arrow-functions@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-arrow-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-async-to-generator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-module-imports" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-remap-async-to-generator" "^7.10.4"
 
 "@babel/plugin-transform-async-to-generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-module-imports" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-remap-async-to-generator" "^7.12.1"
 
 "@babel/plugin-transform-block-scoped-functions@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-block-scoped-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-block-scoping@^7.10.4":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz#5b7efe98852bef8d652c0b28144cd93a9e4b5215"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"
+  "version" "7.11.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-block-scoping@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-classes@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-define-map" "^7.10.4"
@@ -878,11 +910,11 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-replace-supers" "^7.10.4"
     "@babel/helper-split-export-declaration" "^7.10.4"
-    globals "^11.1.0"
+    "globals" "^11.1.0"
 
 "@babel/plugin-transform-classes@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-define-map" "^7.10.4"
@@ -891,335 +923,335 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
-    globals "^11.1.0"
+    "globals" "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-computed-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-destructuring@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-destructuring@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-dotall-regex@^7.10.4", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-dotall-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-duplicate-keys@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-duplicate-keys@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-exponentiation-operator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-exponentiation-operator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-flow-strip-types@7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.1.tgz#8430decfa7eb2aea5414ed4a3fa6e1652b7d77c4"
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-flow" "^7.12.1"
-
 "@babel/plugin-transform-flow-strip-types@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.4.tgz#c497957f09e86e3df7296271e9eb642876bf7788"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-flow" "^7.10.4"
 
+"@babel/plugin-transform-flow-strip-types@7.12.1":
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.1.tgz"
+  "version" "7.12.1"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-flow" "^7.12.1"
+
 "@babel/plugin-transform-for-of@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-for-of@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-function-name@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-member-expression-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz#b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-member-expression-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-modules-amd@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"
+  "version" "7.10.5"
   dependencies:
     "@babel/helper-module-transforms" "^7.10.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "babel-plugin-dynamic-import-node" "^2.3.3"
 
 "@babel/plugin-transform-modules-amd@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "babel-plugin-dynamic-import-node" "^2.3.3"
 
 "@babel/plugin-transform-modules-commonjs@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-module-transforms" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-simple-access" "^7.10.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "babel-plugin-dynamic-import-node" "^2.3.3"
 
 "@babel/plugin-transform-modules-commonjs@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-simple-access" "^7.12.1"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "babel-plugin-dynamic-import-node" "^2.3.3"
 
 "@babel/plugin-transform-modules-systemjs@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"
+  "version" "7.10.5"
   dependencies:
     "@babel/helper-hoist-variables" "^7.10.4"
     "@babel/helper-module-transforms" "^7.10.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "babel-plugin-dynamic-import-node" "^2.3.3"
 
 "@babel/plugin-transform-modules-systemjs@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-hoist-variables" "^7.10.4"
     "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-validator-identifier" "^7.10.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "babel-plugin-dynamic-import-node" "^2.3.3"
 
 "@babel/plugin-transform-modules-umd@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-module-transforms" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-modules-umd@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
 
 "@babel/plugin-transform-new-target@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-new-target@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-object-super@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz#d7146c4d139433e7a6526f888c667e314a093894"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-replace-supers" "^7.10.4"
 
 "@babel/plugin-transform-object-super@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-replace-supers" "^7.12.1"
 
 "@babel/plugin-transform-parameters@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"
+  "version" "7.10.5"
   dependencies:
     "@babel/helper-get-function-arity" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-parameters@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-property-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz#f6fe54b6590352298785b83edd815d214c42e3c0"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-property-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-react-constant-elements@^7.0.0", "@babel/plugin-transform-react-constant-elements@^7.2.0", "@babel/plugin-transform-react-constant-elements@^7.6.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz#0f485260bf1c29012bb973e7e404749eaac12c9e"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-react-constant-elements@^7.9.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.1.tgz#4471f0851feec3231cc9aaa0dccde39947c1ac1e"
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-react-display-name@7.12.1", "@babel/plugin-transform-react-display-name@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz#1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-react-display-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz#b5795f4e3e3140419c3611b7a2a3832b9aef328d"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz"
+  "version" "7.10.4"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-react-display-name@^7.12.1", "@babel/plugin-transform-react-display-name@7.12.1":
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-development@^7.10.4":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.11.5.tgz#e1439e6a57ee3d43e9f54ace363fb29cefe5d7b6"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.11.5.tgz"
+  "version" "7.11.5"
   dependencies:
     "@babel/helper-builder-react-jsx-experimental" "^7.11.5"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-development@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.1.tgz#0b8f8cd531dcf7991f1e5f2c10a2a4f1cfc78e36"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-builder-react-jsx-experimental" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.12.1"
 
 "@babel/plugin-transform-react-jsx-self@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz#cd301a5fed8988c182ed0b9d55e9bd6db0bd9369"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-self@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-source@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz#34f1779117520a779c054f2cdd9680435b9222b4"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz"
+  "version" "7.10.5"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-source@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx@^7.10.4", "@babel/plugin-transform-react-jsx@^7.3.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz#673c9f913948764a4421683b2bef2936968fddf2"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.10.4"
     "@babel/helper-builder-react-jsx-experimental" "^7.10.4"
@@ -1227,8 +1259,8 @@
     "@babel/plugin-syntax-jsx" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.1.tgz#c2d96c77c2b0e4362cc4e77a43ce7c2539d478cb"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.10.4"
     "@babel/helper-builder-react-jsx-experimental" "^7.12.1"
@@ -1236,162 +1268,235 @@
     "@babel/plugin-syntax-jsx" "^7.12.1"
 
 "@babel/plugin-transform-react-pure-annotations@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz#3eefbb73db94afbc075f097523e445354a1c6501"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-react-pure-annotations@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-regenerator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
-    regenerator-transform "^0.14.2"
+    "regenerator-transform" "^0.14.2"
 
 "@babel/plugin-transform-regenerator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
-    regenerator-transform "^0.14.2"
+    "regenerator-transform" "^0.14.2"
 
 "@babel/plugin-transform-reserved-words@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz#8f2682bcdcef9ed327e1b0861585d7013f8a54dd"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-reserved-words@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-runtime@7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-module-imports" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    resolve "^1.8.1"
-    semver "^5.5.1"
+    "resolve" "^1.8.1"
+    "semver" "^5.5.1"
 
 "@babel/plugin-transform-shorthand-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-shorthand-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-spread@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"
+  "version" "7.11.0"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
 
 "@babel/plugin-transform-spread@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
 "@babel/plugin-transform-sticky-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-regex" "^7.10.4"
 
 "@babel/plugin-transform-sticky-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-regex" "^7.10.4"
 
 "@babel/plugin-transform-template-literals@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"
+  "version" "7.10.5"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-template-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-typeof-symbol@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-typeof-symbol@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-typescript@^7.10.4":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz#2b4879676af37342ebb278216dd090ac67f13abb"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"
+  "version" "7.11.0"
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.10.5"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-typescript" "^7.10.4"
 
 "@babel/plugin-transform-typescript@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-typescript" "^7.12.1"
 
 "@babel/plugin-transform-unicode-escapes@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz#feae523391c7651ddac115dae0a9d06857892007"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-unicode-escapes@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-unicode-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-unicode-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/preset-env@7.12.1", "@babel/preset-env@^7.9.5":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
+"@babel/preset-env@^7.1.6", "@babel/preset-env@^7.4.5", "@babel/preset-env@^7.8.4":
+  "resolved" "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz"
+  "version" "7.11.5"
+  dependencies:
+    "@babel/compat-data" "^7.11.0"
+    "@babel/helper-compilation-targets" "^7.10.4"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
+    "@babel/plugin-proposal-class-properties" "^7.10.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
+    "@babel/plugin-proposal-export-namespace-from" "^7.10.4"
+    "@babel/plugin-proposal-json-strings" "^7.10.4"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
+    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.11.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.11.0"
+    "@babel/plugin-proposal-private-methods" "^7.10.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-class-properties" "^7.10.4"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.10.4"
+    "@babel/plugin-transform-arrow-functions" "^7.10.4"
+    "@babel/plugin-transform-async-to-generator" "^7.10.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
+    "@babel/plugin-transform-block-scoping" "^7.10.4"
+    "@babel/plugin-transform-classes" "^7.10.4"
+    "@babel/plugin-transform-computed-properties" "^7.10.4"
+    "@babel/plugin-transform-destructuring" "^7.10.4"
+    "@babel/plugin-transform-dotall-regex" "^7.10.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
+    "@babel/plugin-transform-for-of" "^7.10.4"
+    "@babel/plugin-transform-function-name" "^7.10.4"
+    "@babel/plugin-transform-literals" "^7.10.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
+    "@babel/plugin-transform-modules-amd" "^7.10.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
+    "@babel/plugin-transform-modules-umd" "^7.10.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
+    "@babel/plugin-transform-new-target" "^7.10.4"
+    "@babel/plugin-transform-object-super" "^7.10.4"
+    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/plugin-transform-property-literals" "^7.10.4"
+    "@babel/plugin-transform-regenerator" "^7.10.4"
+    "@babel/plugin-transform-reserved-words" "^7.10.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
+    "@babel/plugin-transform-spread" "^7.11.0"
+    "@babel/plugin-transform-sticky-regex" "^7.10.4"
+    "@babel/plugin-transform-template-literals" "^7.10.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
+    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
+    "@babel/plugin-transform-unicode-regex" "^7.10.4"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.11.5"
+    "browserslist" "^4.12.0"
+    "core-js-compat" "^3.6.2"
+    "invariant" "^2.2.2"
+    "levenary" "^1.1.1"
+    "semver" "^5.5.0"
+
+"@babel/preset-env@^7.9.5":
+  "resolved" "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/compat-data" "^7.12.1"
     "@babel/helper-compilation-targets" "^7.12.1"
@@ -1457,32 +1562,33 @@
     "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
     "@babel/types" "^7.12.1"
-    core-js-compat "^3.6.2"
-    semver "^5.5.0"
+    "core-js-compat" "^3.6.2"
+    "semver" "^5.5.0"
 
-"@babel/preset-env@^7.1.6", "@babel/preset-env@^7.4.5", "@babel/preset-env@^7.8.4":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz#18cb4b9379e3e92ffea92c07471a99a2914e4272"
+"@babel/preset-env@7.12.1":
+  "resolved" "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
-    "@babel/compat-data" "^7.11.0"
-    "@babel/helper-compilation-targets" "^7.10.4"
-    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/compat-data" "^7.12.1"
+    "@babel/helper-compilation-targets" "^7.12.1"
+    "@babel/helper-module-imports" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
-    "@babel/plugin-proposal-class-properties" "^7.10.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
-    "@babel/plugin-proposal-export-namespace-from" "^7.10.4"
-    "@babel/plugin-proposal-json-strings" "^7.10.4"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
-    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.11.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
-    "@babel/plugin-proposal-optional-chaining" "^7.11.0"
-    "@babel/plugin-proposal-private-methods" "^7.10.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
+    "@babel/helper-validator-option" "^7.12.1"
+    "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-dynamic-import" "^7.12.1"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.1"
+    "@babel/plugin-proposal-json-strings" "^7.12.1"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.1"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.10.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.1"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
@@ -1492,79 +1598,64 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.10.4"
-    "@babel/plugin-transform-arrow-functions" "^7.10.4"
-    "@babel/plugin-transform-async-to-generator" "^7.10.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
-    "@babel/plugin-transform-block-scoping" "^7.10.4"
-    "@babel/plugin-transform-classes" "^7.10.4"
-    "@babel/plugin-transform-computed-properties" "^7.10.4"
-    "@babel/plugin-transform-destructuring" "^7.10.4"
-    "@babel/plugin-transform-dotall-regex" "^7.10.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
-    "@babel/plugin-transform-for-of" "^7.10.4"
-    "@babel/plugin-transform-function-name" "^7.10.4"
-    "@babel/plugin-transform-literals" "^7.10.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
-    "@babel/plugin-transform-modules-amd" "^7.10.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
-    "@babel/plugin-transform-modules-umd" "^7.10.4"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
-    "@babel/plugin-transform-new-target" "^7.10.4"
-    "@babel/plugin-transform-object-super" "^7.10.4"
-    "@babel/plugin-transform-parameters" "^7.10.4"
-    "@babel/plugin-transform-property-literals" "^7.10.4"
-    "@babel/plugin-transform-regenerator" "^7.10.4"
-    "@babel/plugin-transform-reserved-words" "^7.10.4"
-    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
-    "@babel/plugin-transform-spread" "^7.11.0"
-    "@babel/plugin-transform-sticky-regex" "^7.10.4"
-    "@babel/plugin-transform-template-literals" "^7.10.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
-    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
-    "@babel/plugin-transform-unicode-regex" "^7.10.4"
+    "@babel/plugin-syntax-top-level-await" "^7.12.1"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-async-to-generator" "^7.12.1"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.1"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-computed-properties" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-dotall-regex" "^7.12.1"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.1"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-function-name" "^7.12.1"
+    "@babel/plugin-transform-literals" "^7.12.1"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.1"
+    "@babel/plugin-transform-modules-amd" "^7.12.1"
+    "@babel/plugin-transform-modules-commonjs" "^7.12.1"
+    "@babel/plugin-transform-modules-systemjs" "^7.12.1"
+    "@babel/plugin-transform-modules-umd" "^7.12.1"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1"
+    "@babel/plugin-transform-new-target" "^7.12.1"
+    "@babel/plugin-transform-object-super" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-property-literals" "^7.12.1"
+    "@babel/plugin-transform-regenerator" "^7.12.1"
+    "@babel/plugin-transform-reserved-words" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/plugin-transform-sticky-regex" "^7.12.1"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.1"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.1"
+    "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.11.5"
-    browserslist "^4.12.0"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
-    semver "^5.5.0"
+    "@babel/types" "^7.12.1"
+    "core-js-compat" "^3.6.2"
+    "semver" "^5.5.0"
 
 "@babel/preset-flow@^7.0.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.10.4.tgz#e0d9c72f8cb02d1633f6a5b7b16763aa2edf659f"
+  "resolved" "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-flow-strip-types" "^7.10.4"
 
 "@babel/preset-modules@^0.1.3":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
+  "resolved" "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"
+  "version" "0.1.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
     "@babel/plugin-transform-dotall-regex" "^7.4.4"
     "@babel/types" "^7.4.4"
-    esutils "^2.0.2"
-
-"@babel/preset-react@7.12.1", "@babel/preset-react@^7.9.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.1.tgz#7f022b13f55b6dd82f00f16d1c599ae62985358c"
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-transform-react-display-name" "^7.12.1"
-    "@babel/plugin-transform-react-jsx" "^7.12.1"
-    "@babel/plugin-transform-react-jsx-development" "^7.12.1"
-    "@babel/plugin-transform-react-jsx-self" "^7.12.1"
-    "@babel/plugin-transform-react-jsx-source" "^7.12.1"
-    "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
+    "esutils" "^2.0.2"
 
 "@babel/preset-react@^7.0.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz#92e8a66d816f9911d11d4cc935be67adfc82dbcf"
+  "resolved" "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-react-display-name" "^7.10.4"
@@ -1574,88 +1665,115 @@
     "@babel/plugin-transform-react-jsx-source" "^7.10.4"
     "@babel/plugin-transform-react-pure-annotations" "^7.10.4"
 
-"@babel/preset-typescript@7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.12.1.tgz#86480b483bb97f75036e8864fe404cc782cc311b"
+"@babel/preset-react@^7.9.4":
+  "resolved" "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-transform-typescript" "^7.12.1"
+    "@babel/plugin-transform-react-display-name" "^7.12.1"
+    "@babel/plugin-transform-react-jsx" "^7.12.1"
+    "@babel/plugin-transform-react-jsx-development" "^7.12.1"
+    "@babel/plugin-transform-react-jsx-self" "^7.12.1"
+    "@babel/plugin-transform-react-jsx-source" "^7.12.1"
+    "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
+
+"@babel/preset-react@7.12.1":
+  "resolved" "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.12.1.tgz"
+  "version" "7.12.1"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-transform-react-display-name" "^7.12.1"
+    "@babel/plugin-transform-react-jsx" "^7.12.1"
+    "@babel/plugin-transform-react-jsx-development" "^7.12.1"
+    "@babel/plugin-transform-react-jsx-self" "^7.12.1"
+    "@babel/plugin-transform-react-jsx-source" "^7.12.1"
+    "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
 "@babel/preset-typescript@^7.1.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz#7d5d052e52a682480d6e2cc5aa31be61c8c25e36"
+  "resolved" "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-typescript" "^7.10.4"
 
-"@babel/register@^7.0.0":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.11.5.tgz#79becf89e0ddd0fba8b92bc279bc0f5d2d7ce2ea"
+"@babel/preset-typescript@7.12.1":
+  "resolved" "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
-    find-cache-dir "^2.0.0"
-    lodash "^4.17.19"
-    make-dir "^2.1.0"
-    pirates "^4.0.0"
-    source-map-support "^0.5.16"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-transform-typescript" "^7.12.1"
+
+"@babel/register@^7.0.0":
+  "resolved" "https://registry.npmjs.org/@babel/register/-/register-7.11.5.tgz"
+  "version" "7.11.5"
+  dependencies:
+    "find-cache-dir" "^2.0.0"
+    "lodash" "^4.17.19"
+    "make-dir" "^2.1.0"
+    "pirates" "^4.0.0"
+    "source-map-support" "^0.5.16"
 
 "@babel/runtime-corejs2@^7.6.3":
-  version "7.11.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.11.2.tgz#700a03945ebad0d31ba6690fc8a6bcc9040faa47"
+  "resolved" "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.11.2.tgz"
+  "version" "7.11.2"
   dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.4"
+    "core-js" "^2.6.5"
+    "regenerator-runtime" "^0.13.4"
 
 "@babel/runtime-corejs3@^7.10.2":
-  version "7.11.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz#02c3029743150188edeb66541195f54600278419"
+  "resolved" "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz"
+  "version" "7.11.2"
   dependencies:
-    core-js-pure "^3.0.0"
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740"
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
-  integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
-  dependencies:
-    regenerator-runtime "^0.13.2"
+    "core-js-pure" "^3.0.0"
+    "regenerator-runtime" "^0.13.4"
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.11.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
+  "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"
+  "version" "7.11.2"
   dependencies:
-    regenerator-runtime "^0.13.4"
+    "regenerator-runtime" "^0.13.4"
 
-"@babel/runtime@^7.10.1", "@babel/runtime@^7.12.5":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
-  integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
+"@babel/runtime@^7.10.1":
+  "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz"
+  "version" "7.13.10"
   dependencies:
-    regenerator-runtime "^0.13.4"
+    "regenerator-runtime" "^0.13.4"
+
+"@babel/runtime@^7.12.5":
+  "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz"
+  "version" "7.13.10"
+  dependencies:
+    "regenerator-runtime" "^0.13.4"
 
 "@babel/runtime@^7.3.4":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.17.tgz#8966d1fc9593bf848602f0662d6b4d0069e3a7ec"
-  integrity sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==
+  "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz"
+  "version" "7.13.17"
   dependencies:
-    regenerator-runtime "^0.13.4"
+    "regenerator-runtime" "^0.13.4"
+
+"@babel/runtime@7.12.1":
+  "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"
+  "version" "7.12.1"
+  dependencies:
+    "regenerator-runtime" "^0.13.4"
+
+"@babel/runtime@7.4.5":
+  "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz"
+  "version" "7.4.5"
+  dependencies:
+    "regenerator-runtime" "^0.13.2"
 
 "@babel/template@^7.10.4", "@babel/template@^7.3.3", "@babel/template@^7.4.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  "resolved" "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/parser" "^7.10.4"
     "@babel/types" "^7.10.4"
 
 "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
+  "resolved" "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"
+  "version" "7.11.5"
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/generator" "^7.11.5"
@@ -1663,13 +1781,13 @@
     "@babel/helper-split-export-declaration" "^7.11.0"
     "@babel/parser" "^7.11.5"
     "@babel/types" "^7.11.5"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
+    "debug" "^4.1.0"
+    "globals" "^11.1.0"
+    "lodash" "^4.17.19"
 
 "@babel/traverse@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.1.tgz#941395e0c5cc86d5d3e75caa095d3924526f0c1e"
+  "resolved" "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/generator" "^7.12.1"
@@ -1677,245 +1795,252 @@
     "@babel/helper-split-export-declaration" "^7.11.0"
     "@babel/parser" "^7.12.1"
     "@babel/types" "^7.12.1"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
+    "debug" "^4.1.0"
+    "globals" "^11.1.0"
+    "lodash" "^4.17.19"
 
 "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.6.0", "@babel/types@^7.6.1", "@babel/types@^7.7.0", "@babel/types@^7.9.6":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
+  "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"
+  "version" "7.11.5"
   dependencies:
     "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
+    "lodash" "^4.17.19"
+    "to-fast-properties" "^2.0.0"
 
-"@babel/types@^7.12.1", "@babel/types@^7.3.3", "@babel/types@^7.9.5":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.1.tgz#e109d9ab99a8de735be287ee3d6a9947a190c4ae"
+"@babel/types@^7.12.1", "@babel/types@^7.9.5":
+  "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
+    "lodash" "^4.17.19"
+    "to-fast-properties" "^2.0.0"
+
+"@babel/types@^7.3.3":
+  "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz"
+  "version" "7.12.1"
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    "lodash" "^4.17.19"
+    "to-fast-properties" "^2.0.0"
 
 "@base2/pretty-print-object@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047"
+  "resolved" "https://registry.npmjs.org/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz"
+  "version" "1.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  "resolved" "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
+  "version" "0.2.3"
 
 "@blueprintjs/core@^3.33.0":
-  version "3.33.0"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/core/-/core-3.33.0.tgz#fe0b21029061fb9beee09f6230bab73ff17c087c"
+  "resolved" "https://registry.npmjs.org/@blueprintjs/core/-/core-3.33.0.tgz"
+  "version" "3.33.0"
   dependencies:
     "@blueprintjs/icons" "^3.22.0"
     "@types/dom4" "^2.0.1"
-    classnames "^2.2"
-    dom4 "^2.1.5"
-    normalize.css "^8.0.1"
-    popper.js "^1.16.1"
-    react-lifecycles-compat "^3.0.4"
-    react-popper "^1.3.7"
-    react-transition-group "^2.9.0"
-    resize-observer-polyfill "^1.5.1"
-    tslib "~1.13.0"
+    "classnames" "^2.2"
+    "dom4" "^2.1.5"
+    "normalize.css" "^8.0.1"
+    "popper.js" "^1.16.1"
+    "react-lifecycles-compat" "^3.0.4"
+    "react-popper" "^1.3.7"
+    "react-transition-group" "^2.9.0"
+    "resize-observer-polyfill" "^1.5.1"
+    "tslib" "~1.13.0"
 
 "@blueprintjs/core@^3.36.0":
-  version "3.36.0"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/core/-/core-3.36.0.tgz#0a271092050c17b84f29426594708180a1b5401a"
+  "resolved" "https://registry.npmjs.org/@blueprintjs/core/-/core-3.36.0.tgz"
+  "version" "3.36.0"
   dependencies:
     "@blueprintjs/icons" "^3.23.0"
     "@types/dom4" "^2.0.1"
-    classnames "^2.2"
-    dom4 "^2.1.5"
-    normalize.css "^8.0.1"
-    popper.js "^1.16.1"
-    react-lifecycles-compat "^3.0.4"
-    react-popper "^1.3.7"
-    react-transition-group "^2.9.0"
-    resize-observer-polyfill "^1.5.1"
-    tslib "~1.13.0"
+    "classnames" "^2.2"
+    "dom4" "^2.1.5"
+    "normalize.css" "^8.0.1"
+    "popper.js" "^1.16.1"
+    "react-lifecycles-compat" "^3.0.4"
+    "react-popper" "^1.3.7"
+    "react-transition-group" "^2.9.0"
+    "resize-observer-polyfill" "^1.5.1"
+    "tslib" "~1.13.0"
 
 "@blueprintjs/core@^3.43.0":
-  version "3.43.0"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/core/-/core-3.43.0.tgz#3d5977c52d99466c7d9952004504c2ecf3caa74d"
-  integrity sha512-96V905Jbmujh5p8bw6uMPFRvS3Xqvssr9kuD30SE7K1Dgp4SbRUjsKN2+hbIdwNpgQoyitDSocnssjL47w38XQ==
+  "resolved" "https://registry.npmjs.org/@blueprintjs/core/-/core-3.43.0.tgz"
+  "version" "3.43.0"
   dependencies:
     "@blueprintjs/icons" "^3.26.0"
     "@types/dom4" "^2.0.1"
-    classnames "^2.2"
-    dom4 "^2.1.5"
-    normalize.css "^8.0.1"
-    popper.js "^1.16.1"
-    react-lifecycles-compat "^3.0.4"
-    react-popper "^1.3.7"
-    react-transition-group "^2.9.0"
-    resize-observer-polyfill "^1.5.1"
-    tslib "~1.13.0"
+    "classnames" "^2.2"
+    "dom4" "^2.1.5"
+    "normalize.css" "^8.0.1"
+    "popper.js" "^1.16.1"
+    "react-lifecycles-compat" "^3.0.4"
+    "react-popper" "^1.3.7"
+    "react-transition-group" "^2.9.0"
+    "resize-observer-polyfill" "^1.5.1"
+    "tslib" "~1.13.0"
 
 "@blueprintjs/datetime@^3.14.0":
-  version "3.19.2"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/datetime/-/datetime-3.19.2.tgz#245d6243cdc78d76c87b6729a51f35f8193f6151"
+  "resolved" "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-3.19.2.tgz"
+  "version" "3.19.2"
   dependencies:
     "@blueprintjs/core" "^3.33.0"
-    classnames "^2.2"
-    react-day-picker "7.4.8"
-    react-lifecycles-compat "^3.0.4"
-    tslib "~1.13.0"
+    "classnames" "^2.2"
+    "react-day-picker" "7.4.8"
+    "react-lifecycles-compat" "^3.0.4"
+    "tslib" "~1.13.0"
 
 "@blueprintjs/icons@^3.10.0", "@blueprintjs/icons@^3.22.0":
-  version "3.22.0"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/icons/-/icons-3.22.0.tgz#6a7c177e9aa96f0ed10bc93d88f7c6687db336ad"
+  "resolved" "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.22.0.tgz"
+  "version" "3.22.0"
   dependencies:
-    classnames "^2.2"
-    tslib "~1.13.0"
+    "classnames" "^2.2"
+    "tslib" "~1.13.0"
 
 "@blueprintjs/icons@^3.23.0":
-  version "3.23.0"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/icons/-/icons-3.23.0.tgz#4cfe0db4363971ac5d8a0a59590a6efc16115dc6"
+  "resolved" "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.23.0.tgz"
+  "version" "3.23.0"
   dependencies:
-    classnames "^2.2"
-    tslib "~1.13.0"
+    "classnames" "^2.2"
+    "tslib" "~1.13.0"
 
 "@blueprintjs/icons@^3.26.0":
-  version "3.26.0"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/icons/-/icons-3.26.0.tgz#d3f0aa0d35a9ebe8648db9651af364dfcc529d9f"
-  integrity sha512-1+yhYH1Fjj5qGx8drZUL2L1R42MiN0WVHTTKYqGEV9TAzhvFHCSZgALD7WNQa+FEibw/8B4U+79IRgUPJNEjow==
+  "resolved" "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.26.0.tgz"
+  "version" "3.26.0"
   dependencies:
-    classnames "^2.2"
-    tslib "~1.13.0"
+    "classnames" "^2.2"
+    "tslib" "~1.13.0"
 
 "@blueprintjs/popover2@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/popover2/-/popover2-0.5.0.tgz#b9086a8cb85026467bc9df8661741555d61510a7"
-  integrity sha512-vVNQPFi3LWw/46AdRTDiV+YupwTlIwrHegBO6AHnHyZI9lei8DhcnPJ7LJjMUqN2r408Lg5aGDEurdRcQc8f1Q==
+  "resolved" "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-0.5.0.tgz"
+  "version" "0.5.0"
   dependencies:
     "@blueprintjs/core" "^3.43.0"
     "@popperjs/core" "^2.5.4"
-    classnames "^2.2"
-    dom4 "^2.1.5"
-    react-popper "^2.2.4"
-    tslib "~1.13.0"
+    "classnames" "^2.2"
+    "dom4" "^2.1.5"
+    "react-popper" "^2.2.4"
+    "tslib" "~1.13.0"
 
 "@blueprintjs/select@^3.10.0", "@blueprintjs/select@^3.14.2":
-  version "3.14.2"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/select/-/select-3.14.2.tgz#a62e18e2f6648fa7cbf248d69502c155d4a7c7bd"
+  "resolved" "https://registry.npmjs.org/@blueprintjs/select/-/select-3.14.2.tgz"
+  "version" "3.14.2"
   dependencies:
     "@blueprintjs/core" "^3.33.0"
-    classnames "^2.2"
-    tslib "~1.13.0"
+    "classnames" "^2.2"
+    "tslib" "~1.13.0"
 
 "@blueprintjs/timezone@^3.6.0":
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/timezone/-/timezone-3.7.2.tgz#d81c5b8920f45c3c1d65620cfc94f8713bd3f1a8"
+  "resolved" "https://registry.npmjs.org/@blueprintjs/timezone/-/timezone-3.7.2.tgz"
+  "version" "3.7.2"
   dependencies:
     "@blueprintjs/core" "^3.33.0"
     "@blueprintjs/select" "^3.14.2"
-    classnames "^2.2"
-    moment "^2.29.0"
-    moment-timezone "^0.5.31"
-    react-lifecycles-compat "^3.0.4"
-    tslib "~1.13.0"
+    "classnames" "^2.2"
+    "moment" "^2.29.0"
+    "moment-timezone" "^0.5.31"
+    "react-lifecycles-compat" "^3.0.4"
+    "tslib" "~1.13.0"
 
 "@cnakazawa/watch@^1.0.3":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  "resolved" "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz"
+  "version" "1.0.4"
   dependencies:
-    exec-sh "^0.3.2"
-    minimist "^1.2.0"
+    "exec-sh" "^0.3.2"
+    "minimist" "^1.2.0"
 
 "@craco/craco@^5.0.0", "@craco/craco@^5.7.0":
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/@craco/craco/-/craco-5.7.0.tgz#ad6a240e0f85ac948f2935581da12d4223d66366"
+  "resolved" "https://registry.npmjs.org/@craco/craco/-/craco-5.7.0.tgz"
+  "version" "5.7.0"
   dependencies:
-    cross-spawn "^7.0.0"
-    lodash "^4.17.15"
-    webpack-merge "^4.2.2"
+    "cross-spawn" "^7.0.0"
+    "lodash" "^4.17.15"
+    "webpack-merge" "^4.2.2"
 
 "@csstools/convert-colors@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
+  "resolved" "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz"
+  "version" "1.4.0"
 
 "@csstools/normalize.css@^10.1.0":
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18"
+  "resolved" "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz"
+  "version" "10.1.0"
 
 "@cypress/listr-verbose-renderer@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#a77492f4b11dcc7c446a34b3e28721afd33c642a"
+  "resolved" "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz"
+  "version" "0.4.1"
   dependencies:
-    chalk "^1.1.3"
-    cli-cursor "^1.0.2"
-    date-fns "^1.27.2"
-    figures "^1.7.0"
+    "chalk" "^1.1.3"
+    "cli-cursor" "^1.0.2"
+    "date-fns" "^1.27.2"
+    "figures" "^1.7.0"
 
 "@cypress/request@^2.88.5":
-  version "2.88.5"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.5.tgz#8d7ecd17b53a849cfd5ab06d5abe7d84976375d7"
+  "resolved" "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz"
+  "version" "2.88.5"
   dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
+    "aws-sign2" "~0.7.0"
+    "aws4" "^1.8.0"
+    "caseless" "~0.12.0"
+    "combined-stream" "~1.0.6"
+    "extend" "~3.0.2"
+    "forever-agent" "~0.6.1"
+    "form-data" "~2.3.2"
+    "har-validator" "~5.1.3"
+    "http-signature" "~1.2.0"
+    "is-typedarray" "~1.0.0"
+    "isstream" "~0.1.2"
+    "json-stringify-safe" "~5.0.1"
+    "mime-types" "~2.1.19"
+    "oauth-sign" "~0.9.0"
+    "performance-now" "^2.1.0"
+    "qs" "~6.5.2"
+    "safe-buffer" "^5.1.2"
+    "tough-cookie" "~2.5.0"
+    "tunnel-agent" "^0.6.0"
+    "uuid" "^3.3.2"
 
 "@cypress/xvfb@^1.2.4":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a"
+  "resolved" "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz"
+  "version" "1.2.4"
   dependencies:
-    debug "^3.1.0"
-    lodash.once "^4.1.1"
+    "debug" "^3.1.0"
+    "lodash.once" "^4.1.1"
 
 "@draft-js-plugins/editor@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@draft-js-plugins/editor/-/editor-4.1.0.tgz#1861fb257ba51ecbd031b8a3d84ee0809de1504e"
-  integrity sha512-i95uGF1GOFwP99qRCjtocGAYanULtkX9/XPeXKwjKx65vnOt/0dvBBdSvzSgrJ9pncHHLUqDfFQKXy/09fTmvg==
+  "resolved" "https://registry.npmjs.org/@draft-js-plugins/editor/-/editor-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    immutable "~3.7.4"
-    prop-types "^15.5.8"
+    "immutable" "~3.7.4"
+    "prop-types" "^15.5.8"
 
-"@draft-js-plugins/mention@^4.3.2":
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/@draft-js-plugins/mention/-/mention-4.3.2.tgz#f72a5a9c62fd5dec4b33138d98595feeb692801f"
-  integrity sha512-VdYLhvWRIOoMouKrixn2K9z54t9/neaX+i6Apyf9D/RZl6U8tvGPuB5bFJD+R4tVYH2i9NW62UpiSxaiwW5OBQ==
+"@draft-js-plugins/mention@^4.5.1":
+  "resolved" "https://registry.npmjs.org/@draft-js-plugins/mention/-/mention-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
-    clsx "^1.0.4"
-    immutable "~3.7.4"
-    lodash-es "^4.17.21"
-    prop-types "^15.5.8"
+    "@popperjs/core" "^2.9.2"
+    "@types/lodash" "^4.14.168"
+    "clsx" "^1.0.4"
+    "immutable" "~3.7.4"
+    "lodash" "^4.17.21"
+    "lodash-es" "^4.17.21"
+    "prop-types" "^15.5.8"
+    "react-popper" "^2.2.5"
 
 "@egoist/vue-to-react@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@egoist/vue-to-react/-/vue-to-react-1.1.0.tgz#83c884b8608e8ee62e76c03e91ce9c26063a91ad"
+  "resolved" "https://registry.npmjs.org/@egoist/vue-to-react/-/vue-to-react-1.1.0.tgz"
+  "version" "1.1.0"
 
 "@emotion/cache@^10.0.27", "@emotion/cache@^10.0.9":
-  version "10.0.29"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0"
+  "resolved" "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz"
+  "version" "10.0.29"
   dependencies:
     "@emotion/sheet" "0.9.4"
     "@emotion/stylis" "0.8.5"
     "@emotion/utils" "0.11.3"
     "@emotion/weak-memoize" "0.2.5"
 
-"@emotion/core@^10.0.20", "@emotion/core@^10.0.9":
-  version "10.0.35"
-  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.35.tgz#513fcf2e22cd4dfe9d3894ed138c9d7a859af9b3"
+"@emotion/core@^10.0.20", "@emotion/core@^10.0.27", "@emotion/core@^10.0.28", "@emotion/core@^10.0.9":
+  "resolved" "https://registry.npmjs.org/@emotion/core/-/core-10.0.35.tgz"
+  "version" "10.0.35"
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@emotion/cache" "^10.0.27"
@@ -1925,44 +2050,44 @@
     "@emotion/utils" "0.11.3"
 
 "@emotion/css@^10.0.27", "@emotion/css@^10.0.9":
-  version "10.0.27"
-  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.27.tgz#3a7458198fbbebb53b01b2b87f64e5e21241e14c"
+  "resolved" "https://registry.npmjs.org/@emotion/css/-/css-10.0.27.tgz"
+  "version" "10.0.27"
   dependencies:
     "@emotion/serialize" "^0.11.15"
     "@emotion/utils" "0.11.3"
-    babel-plugin-emotion "^10.0.27"
+    "babel-plugin-emotion" "^10.0.27"
 
 "@emotion/hash@0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
+  "resolved" "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
+  "version" "0.8.0"
 
-"@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.8":
-  version "0.8.8"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
+"@emotion/is-prop-valid@^0.8.8", "@emotion/is-prop-valid@0.8.8":
+  "resolved" "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"
+  "version" "0.8.8"
   dependencies:
     "@emotion/memoize" "0.7.4"
 
 "@emotion/memoize@0.7.4":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"
+  "resolved" "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz"
+  "version" "0.7.4"
 
 "@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16":
-  version "0.11.16"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz#dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad"
+  "resolved" "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz"
+  "version" "0.11.16"
   dependencies:
     "@emotion/hash" "0.8.0"
     "@emotion/memoize" "0.7.4"
     "@emotion/unitless" "0.7.5"
     "@emotion/utils" "0.11.3"
-    csstype "^2.5.7"
+    "csstype" "^2.5.7"
 
 "@emotion/sheet@0.9.4":
-  version "0.9.4"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5"
+  "resolved" "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz"
+  "version" "0.9.4"
 
 "@emotion/styled-base@^10.0.27":
-  version "10.0.31"
-  resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a"
+  "resolved" "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.31.tgz"
+  "version" "10.0.31"
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@emotion/is-prop-valid" "0.8.8"
@@ -1970,46 +2095,46 @@
     "@emotion/utils" "0.11.3"
 
 "@emotion/styled@^10.0.17":
-  version "10.0.27"
-  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.27.tgz#12cb67e91f7ad7431e1875b1d83a94b814133eaf"
+  "resolved" "https://registry.npmjs.org/@emotion/styled/-/styled-10.0.27.tgz"
+  "version" "10.0.27"
   dependencies:
     "@emotion/styled-base" "^10.0.27"
-    babel-plugin-emotion "^10.0.27"
+    "babel-plugin-emotion" "^10.0.27"
 
-"@emotion/stylis@0.8.5", "@emotion/stylis@^0.8.4":
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04"
+"@emotion/stylis@^0.8.4", "@emotion/stylis@0.8.5":
+  "resolved" "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz"
+  "version" "0.8.5"
 
-"@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.4":
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
+"@emotion/unitless@^0.7.4", "@emotion/unitless@0.7.5":
+  "resolved" "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz"
+  "version" "0.7.5"
 
 "@emotion/utils@0.11.3":
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz#a759863867befa7e583400d322652a3f44820924"
+  "resolved" "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz"
+  "version" "0.11.3"
 
 "@emotion/weak-memoize@0.2.5":
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
+  "resolved" "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz"
+  "version" "0.2.5"
 
 "@eslint/eslintrc@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
+  "resolved" "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz"
+  "version" "0.2.1"
   dependencies:
-    ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    lodash "^4.17.19"
-    minimatch "^3.0.4"
-    strip-json-comments "^3.1.1"
+    "ajv" "^6.12.4"
+    "debug" "^4.1.1"
+    "espree" "^7.3.0"
+    "globals" "^12.1.0"
+    "ignore" "^4.0.6"
+    "import-fresh" "^3.2.1"
+    "js-yaml" "^3.13.1"
+    "lodash" "^4.17.19"
+    "minimatch" "^3.0.4"
+    "strip-json-comments" "^3.1.1"
 
 "@fusioncharts/charts@^3.16.0":
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/@fusioncharts/charts/-/charts-3.16.0.tgz#1a03dee54cec6b47232800df066c306b97f19e3b"
+  "resolved" "https://registry.npmjs.org/@fusioncharts/charts/-/charts-3.16.0.tgz"
+  "version" "3.16.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@fusioncharts/core" "^1.2.0"
@@ -2017,51 +2142,51 @@
     "@fusioncharts/utils" "^1.2.0"
 
 "@fusioncharts/constructor@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@fusioncharts/constructor/-/constructor-1.2.0.tgz#ef76cf535d1eff3ac4f247ffa36dc6f91f581d7a"
+  "resolved" "https://registry.npmjs.org/@fusioncharts/constructor/-/constructor-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@fusioncharts/core" "^1.2.0"
     "@fusioncharts/maps" "^3.16.0"
 
 "@fusioncharts/core@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@fusioncharts/core/-/core-1.2.0.tgz#36acb9691acc25ecc230eaa8d1e3ca7fe99823d2"
+  "resolved" "https://registry.npmjs.org/@fusioncharts/core/-/core-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@fusioncharts/utils" "^1.2.0"
-    core-js "^3.0.1"
-    ramda "^0.25.0"
+    "core-js" "^3.0.1"
+    "ramda" "^0.25.0"
 
 "@fusioncharts/datatable@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@fusioncharts/datatable/-/datatable-1.2.0.tgz#24a4d04f1059febd423d423e93b49d5e53c7bedd"
+  "resolved" "https://registry.npmjs.org/@fusioncharts/datatable/-/datatable-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@fusioncharts/utils" "^1.2.0"
 
 "@fusioncharts/features@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@fusioncharts/features/-/features-1.2.0.tgz#7dd803ed9b94c09974548b7edbe6ac08d2abb75e"
+  "resolved" "https://registry.npmjs.org/@fusioncharts/features/-/features-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@fusioncharts/core" "^1.2.0"
     "@fusioncharts/utils" "^1.2.0"
 
 "@fusioncharts/fusiontime@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@fusioncharts/fusiontime/-/fusiontime-2.4.0.tgz#eec24d3d479b7d03a942b21f7cff8ab8a9ef8fac"
+  "resolved" "https://registry.npmjs.org/@fusioncharts/fusiontime/-/fusiontime-2.4.0.tgz"
+  "version" "2.4.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@fusioncharts/charts" "^3.16.0"
     "@fusioncharts/core" "^1.2.0"
     "@fusioncharts/datatable" "^1.2.0"
     "@fusioncharts/utils" "^1.2.0"
-    ramda "^0.25.0"
+    "ramda" "^0.25.0"
 
 "@fusioncharts/maps@^3.16.0":
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/@fusioncharts/maps/-/maps-3.16.0.tgz#7f6b9ba406dc07acc04966819c8622e563327095"
+  "resolved" "https://registry.npmjs.org/@fusioncharts/maps/-/maps-3.16.0.tgz"
+  "version" "3.16.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@fusioncharts/charts" "^3.16.0"
@@ -2069,8 +2194,8 @@
     "@fusioncharts/features" "^1.2.0"
 
 "@fusioncharts/powercharts@^3.16.0":
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/@fusioncharts/powercharts/-/powercharts-3.16.0.tgz#f7278204e3213c8c23abd4ded4c9d6ec60c62f42"
+  "resolved" "https://registry.npmjs.org/@fusioncharts/powercharts/-/powercharts-3.16.0.tgz"
+  "version" "3.16.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@fusioncharts/charts" "^3.16.0"
@@ -2078,15 +2203,15 @@
     "@fusioncharts/utils" "^1.2.0"
 
 "@fusioncharts/utils@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@fusioncharts/utils/-/utils-1.2.0.tgz#c640174f66f9bdc9e2050b4d8cbf6e6ccf57ab31"
+  "resolved" "https://registry.npmjs.org/@fusioncharts/utils/-/utils-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
-    ramda "^0.25.0"
+    "ramda" "^0.25.0"
 
 "@fusioncharts/widgets@^3.16.0":
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/@fusioncharts/widgets/-/widgets-3.16.0.tgz#62adea8fd95c35728cdc3b6bcc320d34e652dec9"
+  "resolved" "https://registry.npmjs.org/@fusioncharts/widgets/-/widgets-3.16.0.tgz"
+  "version" "3.16.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@fusioncharts/charts" "^3.16.0"
@@ -2096,24 +2221,24 @@
     "@fusioncharts/utils" "^1.2.0"
 
 "@github/g-emoji-element@^1.1.5":
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/@github/g-emoji-element/-/g-emoji-element-1.1.5.tgz#4fd6b20caf49b88705cf3365d1d1f00a69dfa29a"
+  "resolved" "https://registry.npmjs.org/@github/g-emoji-element/-/g-emoji-element-1.1.5.tgz"
+  "version" "1.1.5"
 
 "@hapi/address@2.x.x":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
+  "resolved" "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"
+  "version" "2.1.4"
 
 "@hapi/bourne@1.x.x":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a"
+  "resolved" "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"
+  "version" "1.3.2"
 
-"@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0":
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06"
+"@hapi/hoek@^8.3.0", "@hapi/hoek@8.x.x":
+  "resolved" "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"
+  "version" "8.5.1"
 
 "@hapi/joi@^15.1.0":
-  version "15.1.1"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7"
+  "resolved" "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"
+  "version" "15.1.1"
   dependencies:
     "@hapi/address" "2.x.x"
     "@hapi/bourne" "1.x.x"
@@ -2121,51 +2246,51 @@
     "@hapi/topo" "3.x.x"
 
 "@hapi/topo@3.x.x":
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"
+  "resolved" "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"
+  "version" "3.1.6"
   dependencies:
     "@hapi/hoek" "^8.3.0"
 
 "@icons/material@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
+  "resolved" "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz"
+  "version" "0.2.4"
 
 "@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  "resolved" "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    camelcase "^5.3.1"
-    find-up "^4.1.0"
-    get-package-type "^0.1.0"
-    js-yaml "^3.13.1"
-    resolve-from "^5.0.0"
+    "camelcase" "^5.3.1"
+    "find-up" "^4.1.0"
+    "get-package-type" "^0.1.0"
+    "js-yaml" "^3.13.1"
+    "resolve-from" "^5.0.0"
 
 "@istanbuljs/schema@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
+  "resolved" "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz"
+  "version" "0.1.2"
 
 "@jest/console@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
+  "resolved" "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
     "@jest/source-map" "^24.9.0"
-    chalk "^2.0.1"
-    slash "^2.0.0"
+    "chalk" "^2.0.1"
+    "slash" "^2.0.0"
 
 "@jest/console@^26.6.1":
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.1.tgz#6a19eaac4aa8687b4db9130495817c65aec3d34e"
+  "resolved" "https://registry.npmjs.org/@jest/console/-/console-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
     "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^26.6.1"
-    jest-util "^26.6.1"
-    slash "^3.0.0"
+    "chalk" "^4.0.0"
+    "jest-message-util" "^26.6.1"
+    "jest-util" "^26.6.1"
+    "slash" "^3.0.0"
 
 "@jest/core@^26.6.0", "@jest/core@^26.6.1":
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.1.tgz#77426822f667a2cda82bf917cee11cc8ba71f9ac"
+  "resolved" "https://registry.npmjs.org/@jest/core/-/core-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/console" "^26.6.1"
     "@jest/reporters" "^26.6.1"
@@ -2173,392 +2298,387 @@
     "@jest/transform" "^26.6.1"
     "@jest/types" "^26.6.1"
     "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-changed-files "^26.6.1"
-    jest-config "^26.6.1"
-    jest-haste-map "^26.6.1"
-    jest-message-util "^26.6.1"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.1"
-    jest-resolve-dependencies "^26.6.1"
-    jest-runner "^26.6.1"
-    jest-runtime "^26.6.1"
-    jest-snapshot "^26.6.1"
-    jest-util "^26.6.1"
-    jest-validate "^26.6.1"
-    jest-watcher "^26.6.1"
-    micromatch "^4.0.2"
-    p-each-series "^2.1.0"
-    rimraf "^3.0.0"
-    slash "^3.0.0"
-    strip-ansi "^6.0.0"
+    "ansi-escapes" "^4.2.1"
+    "chalk" "^4.0.0"
+    "exit" "^0.1.2"
+    "graceful-fs" "^4.2.4"
+    "jest-changed-files" "^26.6.1"
+    "jest-config" "^26.6.1"
+    "jest-haste-map" "^26.6.1"
+    "jest-message-util" "^26.6.1"
+    "jest-regex-util" "^26.0.0"
+    "jest-resolve" "^26.6.1"
+    "jest-resolve-dependencies" "^26.6.1"
+    "jest-runner" "^26.6.1"
+    "jest-runtime" "^26.6.1"
+    "jest-snapshot" "^26.6.1"
+    "jest-util" "^26.6.1"
+    "jest-validate" "^26.6.1"
+    "jest-watcher" "^26.6.1"
+    "micromatch" "^4.0.2"
+    "p-each-series" "^2.1.0"
+    "rimraf" "^3.0.0"
+    "slash" "^3.0.0"
+    "strip-ansi" "^6.0.0"
 
 "@jest/environment@^26.6.0", "@jest/environment@^26.6.1":
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.1.tgz#38a56f1cc66f96bf53befcc5ebeaf1c2dce90e9a"
+  "resolved" "https://registry.npmjs.org/@jest/environment/-/environment-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/fake-timers" "^26.6.1"
     "@jest/types" "^26.6.1"
     "@types/node" "*"
-    jest-mock "^26.6.1"
+    "jest-mock" "^26.6.1"
 
 "@jest/fake-timers@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93"
+  "resolved" "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
     "@jest/types" "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-mock "^24.9.0"
+    "jest-message-util" "^24.9.0"
+    "jest-mock" "^24.9.0"
 
 "@jest/fake-timers@^26.6.1":
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.1.tgz#5aafba1822075b7142e702b906094bea15f51acf"
+  "resolved" "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
     "@sinonjs/fake-timers" "^6.0.1"
     "@types/node" "*"
-    jest-message-util "^26.6.1"
-    jest-mock "^26.6.1"
-    jest-util "^26.6.1"
+    "jest-message-util" "^26.6.1"
+    "jest-mock" "^26.6.1"
+    "jest-util" "^26.6.1"
 
 "@jest/globals@^26.6.1":
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.1.tgz#b232c7611d8a2de62b4bf9eb9a007138322916f4"
+  "resolved" "https://registry.npmjs.org/@jest/globals/-/globals-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/environment" "^26.6.1"
     "@jest/types" "^26.6.1"
-    expect "^26.6.1"
+    "expect" "^26.6.1"
 
 "@jest/reporters@^26.6.1":
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.1.tgz#582ede05278cf5eeffe58bc519f4a35f54fbcb0d"
+  "resolved" "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
     "@jest/console" "^26.6.1"
     "@jest/test-result" "^26.6.1"
     "@jest/transform" "^26.6.1"
     "@jest/types" "^26.6.1"
-    chalk "^4.0.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.2.4"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^4.0.3"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    jest-haste-map "^26.6.1"
-    jest-resolve "^26.6.1"
-    jest-util "^26.6.1"
-    jest-worker "^26.6.1"
-    slash "^3.0.0"
-    source-map "^0.6.0"
-    string-length "^4.0.1"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^6.0.1"
+    "chalk" "^4.0.0"
+    "collect-v8-coverage" "^1.0.0"
+    "exit" "^0.1.2"
+    "glob" "^7.1.2"
+    "graceful-fs" "^4.2.4"
+    "istanbul-lib-coverage" "^3.0.0"
+    "istanbul-lib-instrument" "^4.0.3"
+    "istanbul-lib-report" "^3.0.0"
+    "istanbul-lib-source-maps" "^4.0.0"
+    "istanbul-reports" "^3.0.2"
+    "jest-haste-map" "^26.6.1"
+    "jest-resolve" "^26.6.1"
+    "jest-util" "^26.6.1"
+    "jest-worker" "^26.6.1"
+    "slash" "^3.0.0"
+    "source-map" "^0.6.0"
+    "string-length" "^4.0.1"
+    "terminal-link" "^2.0.0"
+    "v8-to-istanbul" "^6.0.1"
   optionalDependencies:
-    node-notifier "^8.0.0"
+    "node-notifier" "^8.0.0"
 
 "@jest/source-map@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
+  "resolved" "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.1.15"
-    source-map "^0.6.0"
+    "callsites" "^3.0.0"
+    "graceful-fs" "^4.1.15"
+    "source-map" "^0.6.0"
 
 "@jest/source-map@^26.5.0":
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.5.0.tgz#98792457c85bdd902365cd2847b58fff05d96367"
+  "resolved" "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz"
+  "version" "26.5.0"
   dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.2.4"
-    source-map "^0.6.0"
+    "callsites" "^3.0.0"
+    "graceful-fs" "^4.2.4"
+    "source-map" "^0.6.0"
 
 "@jest/test-result@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
+  "resolved" "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
     "@jest/console" "^24.9.0"
     "@jest/types" "^24.9.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
 
 "@jest/test-result@^26.6.0", "@jest/test-result@^26.6.1":
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.1.tgz#d75698d8a06aa663e8936663778c831512330cc1"
+  "resolved" "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/console" "^26.6.1"
     "@jest/types" "^26.6.1"
     "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
+    "collect-v8-coverage" "^1.0.0"
 
 "@jest/test-sequencer@^26.6.1":
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.1.tgz#34216ac2c194b0eeebde30d25424d1134703fd2e"
+  "resolved" "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/test-result" "^26.6.1"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.1"
-    jest-runner "^26.6.1"
-    jest-runtime "^26.6.1"
+    "graceful-fs" "^4.2.4"
+    "jest-haste-map" "^26.6.1"
+    "jest-runner" "^26.6.1"
+    "jest-runtime" "^26.6.1"
 
 "@jest/transform@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56"
+  "resolved" "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
     "@babel/core" "^7.1.0"
     "@jest/types" "^24.9.0"
-    babel-plugin-istanbul "^5.1.0"
-    chalk "^2.0.1"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.1.15"
-    jest-haste-map "^24.9.0"
-    jest-regex-util "^24.9.0"
-    jest-util "^24.9.0"
-    micromatch "^3.1.10"
-    pirates "^4.0.1"
-    realpath-native "^1.1.0"
-    slash "^2.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "2.4.1"
+    "babel-plugin-istanbul" "^5.1.0"
+    "chalk" "^2.0.1"
+    "convert-source-map" "^1.4.0"
+    "fast-json-stable-stringify" "^2.0.0"
+    "graceful-fs" "^4.1.15"
+    "jest-haste-map" "^24.9.0"
+    "jest-regex-util" "^24.9.0"
+    "jest-util" "^24.9.0"
+    "micromatch" "^3.1.10"
+    "pirates" "^4.0.1"
+    "realpath-native" "^1.1.0"
+    "slash" "^2.0.0"
+    "source-map" "^0.6.1"
+    "write-file-atomic" "2.4.1"
 
 "@jest/transform@^26.6.1":
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.1.tgz#f70786f96e0f765947b4fb4f54ffcfb7bd783711"
+  "resolved" "https://registry.npmjs.org/@jest/transform/-/transform-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@babel/core" "^7.1.0"
     "@jest/types" "^26.6.1"
-    babel-plugin-istanbul "^6.0.0"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.1"
-    jest-regex-util "^26.0.0"
-    jest-util "^26.6.1"
-    micromatch "^4.0.2"
-    pirates "^4.0.1"
-    slash "^3.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "^3.0.0"
+    "babel-plugin-istanbul" "^6.0.0"
+    "chalk" "^4.0.0"
+    "convert-source-map" "^1.4.0"
+    "fast-json-stable-stringify" "^2.0.0"
+    "graceful-fs" "^4.2.4"
+    "jest-haste-map" "^26.6.1"
+    "jest-regex-util" "^26.0.0"
+    "jest-util" "^26.6.1"
+    "micromatch" "^4.0.2"
+    "pirates" "^4.0.1"
+    "slash" "^3.0.0"
+    "source-map" "^0.6.1"
+    "write-file-atomic" "^3.0.0"
 
 "@jest/types@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
+  "resolved" "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
 "@jest/types@^25.5.0":
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
+  "resolved" "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz"
+  "version" "25.5.0"
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^15.0.0"
-    chalk "^3.0.0"
+    "chalk" "^3.0.0"
 
 "@jest/types@^26.6.0", "@jest/types@^26.6.1":
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.1.tgz#2638890e8031c0bc8b4681e0357ed986e2f866c5"
+  "resolved" "https://registry.npmjs.org/@jest/types/-/types-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
     "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
+    "chalk" "^4.0.0"
 
 "@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
+  "resolved" "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz"
+  "version" "26.6.2"
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
     "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
+    "chalk" "^4.0.0"
 
 "@manaflair/redux-batch@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@manaflair/redux-batch/-/redux-batch-1.0.0.tgz#3af65dc3ac4ba81cf115c96f9759a6d4077b49f5"
+  "resolved" "https://registry.npmjs.org/@manaflair/redux-batch/-/redux-batch-1.0.0.tgz"
+  "version" "1.0.0"
 
 "@mdx-js/loader@^1.5.1":
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.18.tgz#8d63fcc029573b3a33968c78d1c5e927ad8e497d"
+  "resolved" "https://registry.npmjs.org/@mdx-js/loader/-/loader-1.6.18.tgz"
+  "version" "1.6.18"
   dependencies:
     "@mdx-js/mdx" "1.6.18"
     "@mdx-js/react" "1.6.18"
-    loader-utils "2.0.0"
+    "loader-utils" "2.0.0"
 
-"@mdx-js/mdx@1.6.18", "@mdx-js/mdx@^1.5.1":
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.18.tgz#c73345ef75be0ec303c5d87f3b95cbe55c192742"
+"@mdx-js/mdx@^1.5.1", "@mdx-js/mdx@1.6.18":
+  "resolved" "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.18.tgz"
+  "version" "1.6.18"
   dependencies:
     "@babel/core" "7.11.6"
     "@babel/plugin-syntax-jsx" "7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "7.8.3"
     "@mdx-js/util" "1.6.18"
-    babel-plugin-apply-mdx-type-prop "1.6.18"
-    babel-plugin-extract-import-names "1.6.18"
-    camelcase-css "2.0.1"
-    detab "2.0.3"
-    hast-util-raw "6.0.1"
-    lodash.uniq "4.5.0"
-    mdast-util-to-hast "9.1.1"
-    remark-footnotes "2.0.0"
-    remark-mdx "1.6.18"
-    remark-parse "8.0.3"
-    remark-squeeze-paragraphs "4.0.0"
-    style-to-object "0.3.0"
-    unified "9.2.0"
-    unist-builder "2.0.3"
-    unist-util-visit "2.0.3"
+    "babel-plugin-apply-mdx-type-prop" "1.6.18"
+    "babel-plugin-extract-import-names" "1.6.18"
+    "camelcase-css" "2.0.1"
+    "detab" "2.0.3"
+    "hast-util-raw" "6.0.1"
+    "lodash.uniq" "4.5.0"
+    "mdast-util-to-hast" "9.1.1"
+    "remark-footnotes" "2.0.0"
+    "remark-mdx" "1.6.18"
+    "remark-parse" "8.0.3"
+    "remark-squeeze-paragraphs" "4.0.0"
+    "style-to-object" "0.3.0"
+    "unified" "9.2.0"
+    "unist-builder" "2.0.3"
+    "unist-util-visit" "2.0.3"
 
-"@mdx-js/react@1.6.18", "@mdx-js/react@^1.5.1":
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.18.tgz#f83cbb2355de9cf36a213140ce21647da1e34fa7"
+"@mdx-js/react@^1.5.1", "@mdx-js/react@1.6.18":
+  "resolved" "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.18.tgz"
+  "version" "1.6.18"
 
 "@mdx-js/util@1.6.18":
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.18.tgz#c7563bf72cb4520b8b7100b64006a64be717e936"
+  "resolved" "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.18.tgz"
+  "version" "1.6.18"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  "resolved" "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"
+  "version" "2.2.1"
   dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
+    "call-me-maybe" "^1.0.1"
+    "glob-to-regexp" "^0.3.0"
 
 "@mswjs/cookies@^0.1.4":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@mswjs/cookies/-/cookies-0.1.4.tgz#85ef872997eea2acd888f21af0b2067224dac244"
-  integrity sha512-gdtmSv21D4wHTnqF4rrZVX6ye7mQ4nRCTIHYnHBr4SkgoXaiqe3sMvUzXm43+H4PnL0EAKvUTxRVSSXz2xebeg==
+  "resolved" "https://registry.npmjs.org/@mswjs/cookies/-/cookies-0.1.4.tgz"
+  "version" "0.1.4"
   dependencies:
     "@types/set-cookie-parser" "^2.4.0"
-    set-cookie-parser "^2.4.6"
+    "set-cookie-parser" "^2.4.6"
 
 "@mswjs/interceptors@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@mswjs/interceptors/-/interceptors-0.8.1.tgz#8ef43a8b7b25c7b9a2bac67b3702167e25e5fc07"
-  integrity sha512-OI9FYmtURESZG3QDNz4Yt3osy3HY4T3FjlRw+AG4QS1UDdTSZ0tuPFAkp23nGR9ojmbSSj4gSMjf5+R8Oi/qtQ==
+  "resolved" "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.8.1.tgz"
+  "version" "0.8.1"
   dependencies:
     "@open-draft/until" "^1.0.3"
-    debug "^4.3.0"
-    headers-utils "^3.0.2"
-    strict-event-emitter "^0.2.0"
+    "debug" "^4.3.0"
+    "headers-utils" "^3.0.2"
+    "strict-event-emitter" "^0.2.0"
 
 "@nodelib/fs.scandir@2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  "resolved" "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"
+  "version" "2.1.3"
   dependencies:
     "@nodelib/fs.stat" "2.0.3"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+    "run-parallel" "^1.1.9"
 
 "@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  "resolved" "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"
+  "version" "1.1.3"
+
+"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.3":
+  "resolved" "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"
+  "version" "2.0.3"
 
 "@nodelib/fs.walk@^1.2.3":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  "resolved" "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"
+  "version" "1.2.4"
   dependencies:
     "@nodelib/fs.scandir" "2.1.3"
-    fastq "^1.6.0"
+    "fastq" "^1.6.0"
 
 "@npmcli/move-file@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464"
+  "resolved" "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    mkdirp "^1.0.4"
+    "mkdirp" "^1.0.4"
 
 "@open-draft/until@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca"
-  integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==
+  "resolved" "https://registry.npmjs.org/@open-draft/until/-/until-1.0.3.tgz"
+  "version" "1.0.3"
 
 "@optimizely/js-sdk-datafile-manager@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@optimizely/js-sdk-datafile-manager/-/js-sdk-datafile-manager-0.8.0.tgz#de213b45777236b1e41082eeb63eaceea267e0fb"
+  "resolved" "https://registry.npmjs.org/@optimizely/js-sdk-datafile-manager/-/js-sdk-datafile-manager-0.8.0.tgz"
+  "version" "0.8.0"
   dependencies:
     "@optimizely/js-sdk-logging" "^0.1.0"
     "@optimizely/js-sdk-utils" "^0.4.0"
-    decompress-response "^4.2.1"
+    "decompress-response" "^4.2.1"
 
 "@optimizely/js-sdk-event-processor@^0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@optimizely/js-sdk-event-processor/-/js-sdk-event-processor-0.6.0.tgz#3a60234b79f0259ad2897d9136d1a4449f6849fd"
+  "resolved" "https://registry.npmjs.org/@optimizely/js-sdk-event-processor/-/js-sdk-event-processor-0.6.0.tgz"
+  "version" "0.6.0"
   dependencies:
     "@optimizely/js-sdk-logging" "^0.1.0"
     "@optimizely/js-sdk-utils" "^0.4.0"
 
 "@optimizely/js-sdk-logging@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@optimizely/js-sdk-logging/-/js-sdk-logging-0.1.0.tgz#e5950c3d9a708fbd5931a043130469c5df7f64e8"
+  "resolved" "https://registry.npmjs.org/@optimizely/js-sdk-logging/-/js-sdk-logging-0.1.0.tgz"
+  "version" "0.1.0"
   dependencies:
     "@optimizely/js-sdk-utils" "^0.1.0"
 
 "@optimizely/js-sdk-utils@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@optimizely/js-sdk-utils/-/js-sdk-utils-0.1.0.tgz#e3ac1fef81f11c15774f4743c3fa7c65d9c3352a"
+  "resolved" "https://registry.npmjs.org/@optimizely/js-sdk-utils/-/js-sdk-utils-0.1.0.tgz"
+  "version" "0.1.0"
   dependencies:
-    uuid "^3.3.2"
+    "uuid" "^3.3.2"
 
 "@optimizely/js-sdk-utils@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@optimizely/js-sdk-utils/-/js-sdk-utils-0.4.0.tgz#835b88bc7b5365a5c4a3d073c01c3a55d9f93a8f"
+  "resolved" "https://registry.npmjs.org/@optimizely/js-sdk-utils/-/js-sdk-utils-0.4.0.tgz"
+  "version" "0.4.0"
   dependencies:
-    uuid "^3.3.2"
+    "uuid" "^3.3.2"
 
 "@optimizely/optimizely-sdk@^4.0.0":
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/@optimizely/optimizely-sdk/-/optimizely-sdk-4.3.4.tgz#b323b91dc8af9656dde8bcf696801bd71443e202"
+  "resolved" "https://registry.npmjs.org/@optimizely/optimizely-sdk/-/optimizely-sdk-4.3.4.tgz"
+  "version" "4.3.4"
   dependencies:
     "@optimizely/js-sdk-datafile-manager" "^0.8.0"
     "@optimizely/js-sdk-event-processor" "^0.6.0"
     "@optimizely/js-sdk-logging" "^0.1.0"
     "@optimizely/js-sdk-utils" "^0.4.0"
-    json-schema "^0.2.3"
-    murmurhash "0.0.2"
+    "json-schema" "^0.2.3"
+    "murmurhash" "0.0.2"
 
 "@pmmmwh/react-refresh-webpack-plugin@0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.2.tgz#1f9741e0bde9790a0e13272082ed7272a083620d"
+  "resolved" "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.2.tgz"
+  "version" "0.4.2"
   dependencies:
-    ansi-html "^0.0.7"
-    error-stack-parser "^2.0.6"
-    html-entities "^1.2.1"
-    native-url "^0.2.6"
-    schema-utils "^2.6.5"
-    source-map "^0.7.3"
+    "ansi-html" "^0.0.7"
+    "error-stack-parser" "^2.0.6"
+    "html-entities" "^1.2.1"
+    "native-url" "^0.2.6"
+    "schema-utils" "^2.6.5"
+    "source-map" "^0.7.3"
 
-"@popperjs/core@^2.5.4":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
-  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
+"@popperjs/core@^2.0.0", "@popperjs/core@^2.5.4", "@popperjs/core@^2.9.2":
+  "resolved" "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz"
+  "version" "2.9.2"
 
 "@reach/router@^1.2.1":
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.3.4.tgz#d2574b19370a70c80480ed91f3da840136d10f8c"
+  "resolved" "https://registry.npmjs.org/@reach/router/-/router-1.3.4.tgz"
+  "version" "1.3.4"
   dependencies:
-    create-react-context "0.3.0"
-    invariant "^2.2.3"
-    prop-types "^15.6.1"
-    react-lifecycles-compat "^3.0.4"
+    "create-react-context" "0.3.0"
+    "invariant" "^2.2.3"
+    "prop-types" "^15.6.1"
+    "react-lifecycles-compat" "^3.0.4"
 
 "@redux-saga/core@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.1.3.tgz#3085097b57a4ea8db5528d58673f20ce0950f6a4"
+  "resolved" "https://registry.npmjs.org/@redux-saga/core/-/core-1.1.3.tgz"
+  "version" "1.1.3"
   dependencies:
     "@babel/runtime" "^7.6.3"
     "@redux-saga/deferred" "^1.1.2"
@@ -2566,175 +2686,167 @@
     "@redux-saga/is" "^1.1.2"
     "@redux-saga/symbols" "^1.1.2"
     "@redux-saga/types" "^1.1.0"
-    redux "^4.0.4"
-    typescript-tuple "^2.2.1"
+    "redux" "^4.0.4"
+    "typescript-tuple" "^2.2.1"
 
 "@redux-saga/deferred@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.1.2.tgz#59937a0eba71fff289f1310233bc518117a71888"
+  "resolved" "https://registry.npmjs.org/@redux-saga/deferred/-/deferred-1.1.2.tgz"
+  "version" "1.1.2"
 
 "@redux-saga/delay-p@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.1.2.tgz#8f515f4b009b05b02a37a7c3d0ca9ddc157bb355"
+  "resolved" "https://registry.npmjs.org/@redux-saga/delay-p/-/delay-p-1.1.2.tgz"
+  "version" "1.1.2"
   dependencies:
     "@redux-saga/symbols" "^1.1.2"
 
 "@redux-saga/is@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.2.tgz#ae6c8421f58fcba80faf7cadb7d65b303b97e58e"
+  "resolved" "https://registry.npmjs.org/@redux-saga/is/-/is-1.1.2.tgz"
+  "version" "1.1.2"
   dependencies:
     "@redux-saga/symbols" "^1.1.2"
     "@redux-saga/types" "^1.1.0"
 
 "@redux-saga/symbols@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.2.tgz#216a672a487fc256872b8034835afc22a2d0595d"
+  "resolved" "https://registry.npmjs.org/@redux-saga/symbols/-/symbols-1.1.2.tgz"
+  "version" "1.1.2"
 
 "@redux-saga/types@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.1.0.tgz#0e81ce56b4883b4b2a3001ebe1ab298b84237204"
+  "resolved" "https://registry.npmjs.org/@redux-saga/types/-/types-1.1.0.tgz"
+  "version" "1.1.0"
 
 "@rollup/plugin-node-resolve@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz#80de384edfbd7bfc9101164910f86078151a3eca"
+  "resolved" "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz"
+  "version" "7.1.3"
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
     "@types/resolve" "0.0.8"
-    builtin-modules "^3.1.0"
-    is-module "^1.0.0"
-    resolve "^1.14.2"
+    "builtin-modules" "^3.1.0"
+    "is-module" "^1.0.0"
+    "resolve" "^1.14.2"
 
 "@rollup/plugin-replace@^2.3.1":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.3.3.tgz#cd6bae39444de119f5d905322b91ebd4078562e7"
+  "resolved" "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.3.3.tgz"
+  "version" "2.3.3"
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
-    magic-string "^0.25.5"
+    "magic-string" "^0.25.5"
 
 "@rollup/pluginutils@^3.0.8":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
+  "resolved" "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
     "@types/estree" "0.0.39"
-    estree-walker "^1.0.1"
-    picomatch "^2.2.2"
+    "estree-walker" "^1.0.1"
+    "picomatch" "^2.2.2"
 
 "@samverschueren/stream-to-observable@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"
+  "resolved" "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz"
+  "version" "0.3.1"
   dependencies:
-    any-observable "^0.3.0"
+    "any-observable" "^0.3.0"
 
 "@scarf/scarf@^1.0.5":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@scarf/scarf/-/scarf-1.1.0.tgz#b84b4a91cd938a688d36245b7a7db6fbc476a499"
+  "resolved" "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.1.0.tgz"
+  "version" "1.1.0"
 
 "@sentry/browser@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.2.4.tgz#b74757b1f76e7a525e6eaca39668db36db82cb21"
-  integrity sha512-OV1CQUxNawncpSEcrA+YccOu72rLC0tyYq/Pc4D/ihpfJmvR0o0L8vZYESay55V5lcqnJPFp8IyCJ2bF8IZTsA==
+  "resolved" "https://registry.npmjs.org/@sentry/browser/-/browser-6.2.4.tgz"
+  "version" "6.2.4"
   dependencies:
     "@sentry/core" "6.2.4"
     "@sentry/types" "6.2.4"
     "@sentry/utils" "6.2.4"
-    tslib "^1.9.3"
+    "tslib" "^1.9.3"
 
 "@sentry/cli@^1.58.0":
-  version "1.58.0"
-  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.58.0.tgz#b1609f10e71539951499866502b13bf3a270fe79"
+  "resolved" "https://registry.npmjs.org/@sentry/cli/-/cli-1.58.0.tgz"
+  "version" "1.58.0"
   dependencies:
-    https-proxy-agent "^5.0.0"
-    mkdirp "^0.5.5"
-    node-fetch "^2.6.0"
-    progress "^2.0.3"
-    proxy-from-env "^1.1.0"
+    "https-proxy-agent" "^5.0.0"
+    "mkdirp" "^0.5.5"
+    "node-fetch" "^2.6.0"
+    "progress" "^2.0.3"
+    "proxy-from-env" "^1.1.0"
 
 "@sentry/core@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.2.4.tgz#613102074208958c580df4e7e06e9aa6b4d5f40c"
-  integrity sha512-8Z98OTM4wFS2n3T+V8a6cYWHDAk1byWuMb8JquZLdYgR5O1jkSpSFrhksQ+B/wDbVw05VOolSNFJsDTC2D5qXg==
+  "resolved" "https://registry.npmjs.org/@sentry/core/-/core-6.2.4.tgz"
+  "version" "6.2.4"
   dependencies:
     "@sentry/hub" "6.2.4"
     "@sentry/minimal" "6.2.4"
     "@sentry/types" "6.2.4"
     "@sentry/utils" "6.2.4"
-    tslib "^1.9.3"
+    "tslib" "^1.9.3"
 
 "@sentry/hub@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.2.4.tgz#0e25b851dc04b806713c8d878b1e11696ccf47ea"
-  integrity sha512-dY8Vj3c4oIirNNNzWkJvoRMzjlU8Nw3PJ/IwhdWjiQhj5/oqOzJwJQSMeOKdOGIhArAifr0hSXdy1+tHGEOOdQ==
+  "resolved" "https://registry.npmjs.org/@sentry/hub/-/hub-6.2.4.tgz"
+  "version" "6.2.4"
   dependencies:
     "@sentry/types" "6.2.4"
     "@sentry/utils" "6.2.4"
-    tslib "^1.9.3"
+    "tslib" "^1.9.3"
 
 "@sentry/minimal@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.2.4.tgz#7d8d490b0942e14cde544c0a77550693e4702d97"
-  integrity sha512-KN+Abbz5CCAceSMvwymSG8GIVPaz4Y/xuY7R7dA8IlzncHaWRQ/Ss0PXjYUWL4YoTlTK6id1AW0i3JMICHMVgw==
+  "resolved" "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.2.4.tgz"
+  "version" "6.2.4"
   dependencies:
     "@sentry/hub" "6.2.4"
     "@sentry/types" "6.2.4"
-    tslib "^1.9.3"
+    "tslib" "^1.9.3"
 
 "@sentry/react@^6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.2.4.tgz#7d5a67a6e5f01238bf88e91433841da5180916f0"
-  integrity sha512-0TqM51HwnAUoDSYyK38Bq/m6xLqWHsOL98Uu4HoMMmx6VXW1xf1UDxhjmIQFfjWfYT5tlld0CoDRfTJJlc82Ow==
+  "resolved" "https://registry.npmjs.org/@sentry/react/-/react-6.2.4.tgz"
+  "version" "6.2.4"
   dependencies:
     "@sentry/browser" "6.2.4"
     "@sentry/minimal" "6.2.4"
     "@sentry/types" "6.2.4"
     "@sentry/utils" "6.2.4"
-    hoist-non-react-statics "^3.3.2"
-    tslib "^1.9.3"
+    "hoist-non-react-statics" "^3.3.2"
+    "tslib" "^1.9.3"
 
 "@sentry/tracing@^6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.2.4.tgz#4af650c180a41b72e130c7b92838fa9d1040792e"
-  integrity sha512-FNPTd22Q487SVyGM4BXlVeeRwPr9CG0OV8bz+GRHQtpVDhL+zdkGlIJYbxZnrOcdyYNVgLCJUPDHqyv55nhU4A==
+  "resolved" "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.2.4.tgz"
+  "version" "6.2.4"
   dependencies:
     "@sentry/hub" "6.2.4"
     "@sentry/minimal" "6.2.4"
     "@sentry/types" "6.2.4"
     "@sentry/utils" "6.2.4"
-    tslib "^1.9.3"
+    "tslib" "^1.9.3"
 
 "@sentry/types@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.2.4.tgz#5974e64f000e6084d92d752e6ca199dc2ef4438f"
-  integrity sha512-c+vEExoj8H67NPaskTvxJBSAtDWzfFXOmlkicEZPUWbkL+Yxxlbzp1lI8K6GOks56UYMUBUU/fwQvv/34cO96g==
+  "resolved" "https://registry.npmjs.org/@sentry/types/-/types-6.2.4.tgz"
+  "version" "6.2.4"
 
 "@sentry/utils@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.2.4.tgz#ab6a0bdfa2a32428f6b1ee87082d9bd40a226b11"
-  integrity sha512-lavbb3yQMUleVffmDkPH7X3dlgbXlyiFNmfER+swJ6WRxa4Yq6I8yea2s6maoqnZMhZe+yztn455DPwXIItfCA==
+  "resolved" "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.4.tgz"
+  "version" "6.2.4"
   dependencies:
     "@sentry/types" "6.2.4"
-    tslib "^1.9.3"
+    "tslib" "^1.9.3"
 
 "@sentry/webpack-plugin@^1.12.1":
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.13.0.tgz#98c1b75cf0cfdb0d2b39240ecc4ffe9e6c28dbd4"
+  "resolved" "https://registry.npmjs.org/@sentry/webpack-plugin/-/webpack-plugin-1.13.0.tgz"
+  "version" "1.13.0"
   dependencies:
     "@sentry/cli" "^1.58.0"
 
 "@sinonjs/commons@^1.7.0":
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
+  "resolved" "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz"
+  "version" "1.8.1"
   dependencies:
-    type-detect "4.0.8"
+    "type-detect" "4.0.8"
 
 "@sinonjs/fake-timers@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
+  "resolved" "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz"
+  "version" "6.0.1"
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
 "@storybook/addon-actions@^5.3.19":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.21.tgz#16eed3eb24996adfcbf70bd476a261324d6de593"
+  "resolved" "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/addons" "5.3.21"
     "@storybook/api" "5.3.21"
@@ -2742,18 +2854,18 @@
     "@storybook/components" "5.3.21"
     "@storybook/core-events" "5.3.21"
     "@storybook/theming" "5.3.21"
-    core-js "^3.0.1"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
-    react "^16.8.3"
-    react-inspector "^4.0.0"
-    uuid "^3.3.2"
+    "core-js" "^3.0.1"
+    "fast-deep-equal" "^2.0.1"
+    "global" "^4.3.2"
+    "polished" "^3.3.1"
+    "prop-types" "^15.7.2"
+    "react" "^16.8.3"
+    "react-inspector" "^4.0.0"
+    "uuid" "^3.3.2"
 
 "@storybook/addon-backgrounds@^5.3.19":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-5.3.21.tgz#7f5e549eb18c45976fca85c4f04212e72ae5c9d7"
+  "resolved" "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/addons" "5.3.21"
     "@storybook/api" "5.3.21"
@@ -2761,26 +2873,26 @@
     "@storybook/components" "5.3.21"
     "@storybook/core-events" "5.3.21"
     "@storybook/theming" "5.3.21"
-    core-js "^3.0.1"
-    memoizerific "^1.11.3"
-    react "^16.8.3"
-    util-deprecate "^1.0.2"
+    "core-js" "^3.0.1"
+    "memoizerific" "^1.11.3"
+    "react" "^16.8.3"
+    "util-deprecate" "^1.0.2"
 
 "@storybook/addon-contexts@^5.3.19":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-contexts/-/addon-contexts-5.3.21.tgz#53771c5c47a8d31624e807ae1736bdbccf47e431"
+  "resolved" "https://registry.npmjs.org/@storybook/addon-contexts/-/addon-contexts-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/addons" "5.3.21"
     "@storybook/api" "5.3.21"
     "@storybook/components" "5.3.21"
     "@storybook/core-events" "5.3.21"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    qs "^6.6.0"
+    "core-js" "^3.0.1"
+    "global" "^4.3.2"
+    "qs" "^6.6.0"
 
 "@storybook/addon-docs@^5.3.19":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-5.3.21.tgz#6635d9d3c58641679512bd09b36264ca3f26c17e"
+  "resolved" "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@babel/generator" "^7.4.0"
     "@babel/parser" "^7.4.2"
@@ -2798,28 +2910,28 @@
     "@storybook/postinstall" "5.3.21"
     "@storybook/source-loader" "5.3.21"
     "@storybook/theming" "5.3.21"
-    acorn "^7.1.0"
-    acorn-jsx "^5.1.0"
-    acorn-walk "^7.0.0"
-    core-js "^3.0.1"
-    doctrine "^3.0.0"
-    escodegen "^1.12.0"
-    global "^4.3.2"
-    html-tags "^3.1.0"
-    js-string-escape "^1.0.1"
-    lodash "^4.17.15"
-    prop-types "^15.7.2"
-    react-element-to-jsx-string "^14.1.0"
-    remark-external-links "^5.0.0"
-    remark-slug "^5.1.2"
-    ts-dedent "^1.1.0"
-    util-deprecate "^1.0.2"
-    vue-docgen-api "^4.1.0"
-    vue-docgen-loader "^1.3.0-beta.0"
+    "acorn" "^7.1.0"
+    "acorn-jsx" "^5.1.0"
+    "acorn-walk" "^7.0.0"
+    "core-js" "^3.0.1"
+    "doctrine" "^3.0.0"
+    "escodegen" "^1.12.0"
+    "global" "^4.3.2"
+    "html-tags" "^3.1.0"
+    "js-string-escape" "^1.0.1"
+    "lodash" "^4.17.15"
+    "prop-types" "^15.7.2"
+    "react-element-to-jsx-string" "^14.1.0"
+    "remark-external-links" "^5.0.0"
+    "remark-slug" "^5.1.2"
+    "ts-dedent" "^1.1.0"
+    "util-deprecate" "^1.0.2"
+    "vue-docgen-api" "^4.1.0"
+    "vue-docgen-loader" "^1.3.0-beta.0"
 
 "@storybook/addon-knobs@^5.3.19":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-5.3.21.tgz#dd721700e5eab2969b3854dc73c855a03fb7aba8"
+  "resolved" "https://registry.npmjs.org/@storybook/addon-knobs/-/addon-knobs-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/addons" "5.3.21"
     "@storybook/api" "5.3.21"
@@ -2828,36 +2940,36 @@
     "@storybook/core-events" "5.3.21"
     "@storybook/theming" "5.3.21"
     "@types/react-color" "^3.0.1"
-    copy-to-clipboard "^3.0.8"
-    core-js "^3.0.1"
-    escape-html "^1.0.3"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    prop-types "^15.7.2"
-    qs "^6.6.0"
-    react-color "^2.17.0"
-    react-lifecycles-compat "^3.0.4"
-    react-select "^3.0.8"
+    "copy-to-clipboard" "^3.0.8"
+    "core-js" "^3.0.1"
+    "escape-html" "^1.0.3"
+    "fast-deep-equal" "^2.0.1"
+    "global" "^4.3.2"
+    "lodash" "^4.17.15"
+    "prop-types" "^15.7.2"
+    "qs" "^6.6.0"
+    "react-color" "^2.17.0"
+    "react-lifecycles-compat" "^3.0.4"
+    "react-select" "^3.0.8"
 
 "@storybook/addon-links@^5.3.19":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-5.3.21.tgz#4bae11c5de77fcce1f5429be3454376870512db2"
+  "resolved" "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/addons" "5.3.21"
     "@storybook/client-logger" "5.3.21"
     "@storybook/core-events" "5.3.21"
     "@storybook/csf" "0.0.1"
     "@storybook/router" "5.3.21"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    prop-types "^15.7.2"
-    qs "^6.6.0"
-    ts-dedent "^1.1.0"
+    "core-js" "^3.0.1"
+    "global" "^4.3.2"
+    "prop-types" "^15.7.2"
+    "qs" "^6.6.0"
+    "ts-dedent" "^1.1.0"
 
 "@storybook/addon-notes@^5.3.19":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.21.tgz#1382e322c1027e8fb681c48bcbf4d73ca89d132a"
+  "resolved" "https://registry.npmjs.org/@storybook/addon-notes/-/addon-notes-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/addons" "5.3.21"
     "@storybook/api" "5.3.21"
@@ -2866,28 +2978,28 @@
     "@storybook/core-events" "5.3.21"
     "@storybook/router" "5.3.21"
     "@storybook/theming" "5.3.21"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    markdown-to-jsx "^6.10.3"
-    memoizerific "^1.11.3"
-    prop-types "^15.7.2"
-    util-deprecate "^1.0.2"
+    "core-js" "^3.0.1"
+    "global" "^4.3.2"
+    "markdown-to-jsx" "^6.10.3"
+    "memoizerific" "^1.11.3"
+    "prop-types" "^15.7.2"
+    "util-deprecate" "^1.0.2"
 
-"@storybook/addons@5.3.21", "@storybook/addons@^5.3.19":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.21.tgz#ee312c738c33e8c34dc11777ef93522c3c36e56a"
+"@storybook/addons@^5.0.0 || ^6.0.0", "@storybook/addons@^5.3.19", "@storybook/addons@5.3.21":
+  "resolved" "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/api" "5.3.21"
     "@storybook/channels" "5.3.21"
     "@storybook/client-logger" "5.3.21"
     "@storybook/core-events" "5.3.21"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    util-deprecate "^1.0.2"
+    "core-js" "^3.0.1"
+    "global" "^4.3.2"
+    "util-deprecate" "^1.0.2"
 
 "@storybook/api@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.21.tgz#8f1772de53b65e1a65d2f0257463d621a8617c58"
+  "resolved" "https://registry.npmjs.org/@storybook/api/-/api-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@reach/router" "^1.2.1"
     "@storybook/channels" "5.3.21"
@@ -2897,38 +3009,38 @@
     "@storybook/router" "5.3.21"
     "@storybook/theming" "5.3.21"
     "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    prop-types "^15.6.2"
-    react "^16.8.3"
-    semver "^6.0.0"
-    shallow-equal "^1.1.0"
-    store2 "^2.7.1"
-    telejson "^3.2.0"
-    util-deprecate "^1.0.2"
+    "core-js" "^3.0.1"
+    "fast-deep-equal" "^2.0.1"
+    "global" "^4.3.2"
+    "lodash" "^4.17.15"
+    "memoizerific" "^1.11.3"
+    "prop-types" "^15.6.2"
+    "react" "^16.8.3"
+    "semver" "^6.0.0"
+    "shallow-equal" "^1.1.0"
+    "store2" "^2.7.1"
+    "telejson" "^3.2.0"
+    "util-deprecate" "^1.0.2"
 
 "@storybook/channel-postmessage@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.21.tgz#9c08bf1c108ff973dbca18e582680d25178db1d4"
+  "resolved" "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/channels" "5.3.21"
     "@storybook/client-logger" "5.3.21"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    telejson "^3.2.0"
+    "core-js" "^3.0.1"
+    "global" "^4.3.2"
+    "telejson" "^3.2.0"
 
 "@storybook/channels@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.21.tgz#53ba622b171d68b3b102983a62aa05149a49497b"
+  "resolved" "https://registry.npmjs.org/@storybook/channels/-/channels-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
-    core-js "^3.0.1"
+    "core-js" "^3.0.1"
 
 "@storybook/client-api@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.21.tgz#5b218a28f24219c32ab4b92a6af2a3e452fb8089"
+  "resolved" "https://registry.npmjs.org/@storybook/client-api/-/client-api-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/addons" "5.3.21"
     "@storybook/channel-postmessage" "5.3.21"
@@ -2937,58 +3049,58 @@
     "@storybook/core-events" "5.3.21"
     "@storybook/csf" "0.0.1"
     "@types/webpack-env" "^1.15.0"
-    core-js "^3.0.1"
-    eventemitter3 "^4.0.0"
-    global "^4.3.2"
-    is-plain-object "^3.0.0"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    stable "^0.1.8"
-    ts-dedent "^1.1.0"
-    util-deprecate "^1.0.2"
+    "core-js" "^3.0.1"
+    "eventemitter3" "^4.0.0"
+    "global" "^4.3.2"
+    "is-plain-object" "^3.0.0"
+    "lodash" "^4.17.15"
+    "memoizerific" "^1.11.3"
+    "qs" "^6.6.0"
+    "stable" "^0.1.8"
+    "ts-dedent" "^1.1.0"
+    "util-deprecate" "^1.0.2"
 
 "@storybook/client-logger@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.21.tgz#912c83b0d358e70acad1ad4abe199de4c38b109f"
+  "resolved" "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
-    core-js "^3.0.1"
+    "core-js" "^3.0.1"
 
-"@storybook/components@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.21.tgz#17ee371a2455c6e807c3d3135a9266e63ad7651a"
+"@storybook/components@^5.0.0 || ^6.0.0", "@storybook/components@5.3.21":
+  "resolved" "https://registry.npmjs.org/@storybook/components/-/components-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/client-logger" "5.3.21"
     "@storybook/theming" "5.3.21"
     "@types/react-syntax-highlighter" "11.0.4"
     "@types/react-textarea-autosize" "^4.3.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    markdown-to-jsx "^6.11.4"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    popper.js "^1.14.7"
-    prop-types "^15.7.2"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-focus-lock "^2.1.0"
-    react-helmet-async "^1.0.2"
-    react-popper-tooltip "^2.8.3"
-    react-syntax-highlighter "^11.0.2"
-    react-textarea-autosize "^7.1.0"
-    simplebar-react "^1.0.0-alpha.6"
-    ts-dedent "^1.1.0"
+    "core-js" "^3.0.1"
+    "global" "^4.3.2"
+    "lodash" "^4.17.15"
+    "markdown-to-jsx" "^6.11.4"
+    "memoizerific" "^1.11.3"
+    "polished" "^3.3.1"
+    "popper.js" "^1.14.7"
+    "prop-types" "^15.7.2"
+    "react" "^16.8.3"
+    "react-dom" "^16.8.3"
+    "react-focus-lock" "^2.1.0"
+    "react-helmet-async" "^1.0.2"
+    "react-popper-tooltip" "^2.8.3"
+    "react-syntax-highlighter" "^11.0.2"
+    "react-textarea-autosize" "^7.1.0"
+    "simplebar-react" "^1.0.0-alpha.6"
+    "ts-dedent" "^1.1.0"
 
 "@storybook/core-events@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.21.tgz#41d81c3f107302a032545fc86ff344230c04b9e9"
+  "resolved" "https://registry.npmjs.org/@storybook/core-events/-/core-events-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
-    core-js "^3.0.1"
+    "core-js" "^3.0.1"
 
 "@storybook/core@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.21.tgz#da963166ea24601f318266a3aa6bbc06fc8fb175"
+  "resolved" "https://registry.npmjs.org/@storybook/core/-/core-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.7.0"
     "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
@@ -3005,102 +3117,102 @@
     "@storybook/router" "5.3.21"
     "@storybook/theming" "5.3.21"
     "@storybook/ui" "5.3.21"
-    airbnb-js-shims "^2.2.1"
-    ansi-to-html "^0.6.11"
-    autoprefixer "^9.7.2"
-    babel-plugin-add-react-displayname "^0.0.5"
-    babel-plugin-emotion "^10.0.20"
-    babel-plugin-macros "^2.7.0"
-    babel-preset-minify "^0.5.0 || 0.6.0-alpha.5"
-    boxen "^4.1.0"
-    case-sensitive-paths-webpack-plugin "^2.2.0"
-    chalk "^3.0.0"
-    cli-table3 "0.5.1"
-    commander "^4.0.1"
-    core-js "^3.0.1"
-    corejs-upgrade-webpack-plugin "^2.2.0"
-    css-loader "^3.0.0"
-    detect-port "^1.3.0"
-    dotenv-webpack "^1.7.0"
-    ejs "^2.7.4"
-    express "^4.17.0"
-    file-loader "^4.2.0"
-    file-system-cache "^1.0.5"
-    find-cache-dir "^3.0.0"
-    find-up "^4.1.0"
-    fs-extra "^8.0.1"
-    glob-base "^0.3.0"
-    global "^4.3.2"
-    html-webpack-plugin "^4.0.0-beta.2"
-    inquirer "^7.0.0"
-    interpret "^2.0.0"
-    ip "^1.1.5"
-    json5 "^2.1.1"
-    lazy-universal-dotenv "^3.0.1"
-    micromatch "^4.0.2"
-    node-fetch "^2.6.0"
-    open "^7.0.0"
-    pnp-webpack-plugin "1.5.0"
-    postcss-flexbugs-fixes "^4.1.0"
-    postcss-loader "^3.0.0"
-    pretty-hrtime "^1.0.3"
-    qs "^6.6.0"
-    raw-loader "^3.1.0"
-    react-dev-utils "^9.0.0"
-    regenerator-runtime "^0.13.3"
-    resolve "^1.11.0"
-    resolve-from "^5.0.0"
-    semver "^6.0.0"
-    serve-favicon "^2.5.0"
-    shelljs "^0.8.3"
-    style-loader "^1.0.0"
-    terser-webpack-plugin "^2.1.2"
-    ts-dedent "^1.1.0"
-    unfetch "^4.1.0"
-    url-loader "^2.0.1"
-    util-deprecate "^1.0.2"
-    webpack "^4.33.0"
-    webpack-dev-middleware "^3.7.0"
-    webpack-hot-middleware "^2.25.0"
-    webpack-virtual-modules "^0.2.0"
+    "airbnb-js-shims" "^2.2.1"
+    "ansi-to-html" "^0.6.11"
+    "autoprefixer" "^9.7.2"
+    "babel-plugin-add-react-displayname" "^0.0.5"
+    "babel-plugin-emotion" "^10.0.20"
+    "babel-plugin-macros" "^2.7.0"
+    "babel-preset-minify" "^0.5.0 || 0.6.0-alpha.5"
+    "boxen" "^4.1.0"
+    "case-sensitive-paths-webpack-plugin" "^2.2.0"
+    "chalk" "^3.0.0"
+    "cli-table3" "0.5.1"
+    "commander" "^4.0.1"
+    "core-js" "^3.0.1"
+    "corejs-upgrade-webpack-plugin" "^2.2.0"
+    "css-loader" "^3.0.0"
+    "detect-port" "^1.3.0"
+    "dotenv-webpack" "^1.7.0"
+    "ejs" "^2.7.4"
+    "express" "^4.17.0"
+    "file-loader" "^4.2.0"
+    "file-system-cache" "^1.0.5"
+    "find-cache-dir" "^3.0.0"
+    "find-up" "^4.1.0"
+    "fs-extra" "^8.0.1"
+    "glob-base" "^0.3.0"
+    "global" "^4.3.2"
+    "html-webpack-plugin" "^4.0.0-beta.2"
+    "inquirer" "^7.0.0"
+    "interpret" "^2.0.0"
+    "ip" "^1.1.5"
+    "json5" "^2.1.1"
+    "lazy-universal-dotenv" "^3.0.1"
+    "micromatch" "^4.0.2"
+    "node-fetch" "^2.6.0"
+    "open" "^7.0.0"
+    "pnp-webpack-plugin" "1.5.0"
+    "postcss-flexbugs-fixes" "^4.1.0"
+    "postcss-loader" "^3.0.0"
+    "pretty-hrtime" "^1.0.3"
+    "qs" "^6.6.0"
+    "raw-loader" "^3.1.0"
+    "react-dev-utils" "^9.0.0"
+    "regenerator-runtime" "^0.13.3"
+    "resolve" "^1.11.0"
+    "resolve-from" "^5.0.0"
+    "semver" "^6.0.0"
+    "serve-favicon" "^2.5.0"
+    "shelljs" "^0.8.3"
+    "style-loader" "^1.0.0"
+    "terser-webpack-plugin" "^2.1.2"
+    "ts-dedent" "^1.1.0"
+    "unfetch" "^4.1.0"
+    "url-loader" "^2.0.1"
+    "util-deprecate" "^1.0.2"
+    "webpack" "^4.33.0"
+    "webpack-dev-middleware" "^3.7.0"
+    "webpack-hot-middleware" "^2.25.0"
+    "webpack-virtual-modules" "^0.2.0"
 
 "@storybook/csf@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.0.1.tgz#95901507dc02f0bc6f9ac8ee1983e2fc5bb98ce6"
+  "resolved" "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.1.tgz"
+  "version" "0.0.1"
   dependencies:
-    lodash "^4.17.15"
+    "lodash" "^4.17.15"
 
-"@storybook/node-logger@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.21.tgz#f11d45042bd57dc69e9037d8f374d9fd0aad8071"
+"@storybook/node-logger@*", "@storybook/node-logger@5.3.21":
+  "resolved" "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@types/npmlog" "^4.1.2"
-    chalk "^3.0.0"
-    core-js "^3.0.1"
-    npmlog "^4.1.2"
-    pretty-hrtime "^1.0.3"
-    regenerator-runtime "^0.13.3"
+    "chalk" "^3.0.0"
+    "core-js" "^3.0.1"
+    "npmlog" "^4.1.2"
+    "pretty-hrtime" "^1.0.3"
+    "regenerator-runtime" "^0.13.3"
 
 "@storybook/postinstall@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-5.3.21.tgz#fa6246d93e4c1519bf85b9f31174f4d16c98f36b"
+  "resolved" "https://registry.npmjs.org/@storybook/postinstall/-/postinstall-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
-    core-js "^3.0.1"
+    "core-js" "^3.0.1"
 
 "@storybook/preset-create-react-app@^3.1.4":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-3.1.4.tgz#64bb674f69fe860ef1a4909e686775adf6c05fdd"
+  "resolved" "https://registry.npmjs.org/@storybook/preset-create-react-app/-/preset-create-react-app-3.1.4.tgz"
+  "version" "3.1.4"
   dependencies:
     "@types/babel__core" "^7.1.7"
     "@types/webpack" "^4.41.13"
-    babel-plugin-react-docgen "^4.1.0"
-    pnp-webpack-plugin "^1.6.4"
-    react-docgen-typescript-plugin "^0.5.0"
-    semver "^7.3.2"
+    "babel-plugin-react-docgen" "^4.1.0"
+    "pnp-webpack-plugin" "^1.6.4"
+    "react-docgen-typescript-plugin" "^0.5.0"
+    "semver" "^7.3.2"
 
-"@storybook/react@^5.3.19":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-5.3.21.tgz#f7f364d3d3adc70746a12cf8b6614952f41d4bd0"
+"@storybook/react@^5.3.19", "@storybook/react@>=5.2":
+  "resolved" "https://registry.npmjs.org/@storybook/react/-/react-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@babel/plugin-transform-react-constant-elements" "^7.6.3"
     "@babel/preset-flow" "^7.0.0"
@@ -3110,69 +3222,69 @@
     "@storybook/node-logger" "5.3.21"
     "@svgr/webpack" "^4.0.3"
     "@types/webpack-env" "^1.15.0"
-    babel-plugin-add-react-displayname "^0.0.5"
-    babel-plugin-named-asset-import "^0.3.1"
-    babel-plugin-react-docgen "^4.0.0"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    mini-css-extract-plugin "^0.7.0"
-    prop-types "^15.7.2"
-    react-dev-utils "^9.0.0"
-    regenerator-runtime "^0.13.3"
-    semver "^6.0.0"
-    ts-dedent "^1.1.0"
-    webpack "^4.33.0"
+    "babel-plugin-add-react-displayname" "^0.0.5"
+    "babel-plugin-named-asset-import" "^0.3.1"
+    "babel-plugin-react-docgen" "^4.0.0"
+    "core-js" "^3.0.1"
+    "global" "^4.3.2"
+    "lodash" "^4.17.15"
+    "mini-css-extract-plugin" "^0.7.0"
+    "prop-types" "^15.7.2"
+    "react-dev-utils" "^9.0.0"
+    "regenerator-runtime" "^0.13.3"
+    "semver" "^6.0.0"
+    "ts-dedent" "^1.1.0"
+    "webpack" "^4.33.0"
 
 "@storybook/router@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.21.tgz#32b08e5daa90a6ffa024bb670b874525a712a901"
+  "resolved" "https://registry.npmjs.org/@storybook/router/-/router-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@reach/router" "^1.2.1"
     "@storybook/csf" "0.0.1"
     "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    util-deprecate "^1.0.2"
+    "core-js" "^3.0.1"
+    "global" "^4.3.2"
+    "lodash" "^4.17.15"
+    "memoizerific" "^1.11.3"
+    "qs" "^6.6.0"
+    "util-deprecate" "^1.0.2"
 
 "@storybook/source-loader@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-5.3.21.tgz#d5f8758fc6b2d9f0ca45e2ffbffa513d5151fd9e"
+  "resolved" "https://registry.npmjs.org/@storybook/source-loader/-/source-loader-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@storybook/addons" "5.3.21"
     "@storybook/client-logger" "5.3.21"
     "@storybook/csf" "0.0.1"
-    core-js "^3.0.1"
-    estraverse "^4.2.0"
-    global "^4.3.2"
-    loader-utils "^1.2.3"
-    prettier "^1.16.4"
-    prop-types "^15.7.2"
-    regenerator-runtime "^0.13.3"
+    "core-js" "^3.0.1"
+    "estraverse" "^4.2.0"
+    "global" "^4.3.2"
+    "loader-utils" "^1.2.3"
+    "prettier" "^1.16.4"
+    "prop-types" "^15.7.2"
+    "regenerator-runtime" "^0.13.3"
 
-"@storybook/theming@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.21.tgz#ae2dc101aa57c3be4df1724ae729e11bad118e0b"
+"@storybook/theming@^5.0.0 || ^6.0.0", "@storybook/theming@5.3.21":
+  "resolved" "https://registry.npmjs.org/@storybook/theming/-/theming-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@emotion/core" "^10.0.20"
     "@emotion/styled" "^10.0.17"
     "@storybook/client-logger" "5.3.21"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.19"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
-    resolve-from "^5.0.0"
-    ts-dedent "^1.1.0"
+    "core-js" "^3.0.1"
+    "deep-object-diff" "^1.1.0"
+    "emotion-theming" "^10.0.19"
+    "global" "^4.3.2"
+    "memoizerific" "^1.11.3"
+    "polished" "^3.3.1"
+    "prop-types" "^15.7.2"
+    "resolve-from" "^5.0.0"
+    "ts-dedent" "^1.1.0"
 
 "@storybook/ui@5.3.21":
-  version "5.3.21"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.21.tgz#b42568e03353b47aaab1b6449311f38858585f81"
+  "resolved" "https://registry.npmjs.org/@storybook/ui/-/ui-5.3.21.tgz"
+  "version" "5.3.21"
   dependencies:
     "@emotion/core" "^10.0.20"
     "@storybook/addons" "5.3.21"
@@ -3183,183 +3295,183 @@
     "@storybook/core-events" "5.3.21"
     "@storybook/router" "5.3.21"
     "@storybook/theming" "5.3.21"
-    copy-to-clipboard "^3.0.8"
-    core-js "^3.0.1"
-    core-js-pure "^3.0.1"
-    emotion-theming "^10.0.19"
-    fast-deep-equal "^2.0.1"
-    fuse.js "^3.4.6"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    markdown-to-jsx "^6.11.4"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
-    qs "^6.6.0"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-draggable "^4.0.3"
-    react-helmet-async "^1.0.2"
-    react-hotkeys "2.0.0"
-    react-sizeme "^2.6.7"
-    regenerator-runtime "^0.13.2"
-    resolve-from "^5.0.0"
-    semver "^6.0.0"
-    store2 "^2.7.1"
-    telejson "^3.2.0"
-    util-deprecate "^1.0.2"
+    "copy-to-clipboard" "^3.0.8"
+    "core-js" "^3.0.1"
+    "core-js-pure" "^3.0.1"
+    "emotion-theming" "^10.0.19"
+    "fast-deep-equal" "^2.0.1"
+    "fuse.js" "^3.4.6"
+    "global" "^4.3.2"
+    "lodash" "^4.17.15"
+    "markdown-to-jsx" "^6.11.4"
+    "memoizerific" "^1.11.3"
+    "polished" "^3.3.1"
+    "prop-types" "^15.7.2"
+    "qs" "^6.6.0"
+    "react" "^16.8.3"
+    "react-dom" "^16.8.3"
+    "react-draggable" "^4.0.3"
+    "react-helmet-async" "^1.0.2"
+    "react-hotkeys" "2.0.0"
+    "react-sizeme" "^2.6.7"
+    "regenerator-runtime" "^0.13.2"
+    "resolve-from" "^5.0.0"
+    "semver" "^6.0.0"
+    "store2" "^2.7.1"
+    "telejson" "^3.2.0"
+    "util-deprecate" "^1.0.2"
 
 "@styled-system/background@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@styled-system/background/-/background-5.1.2.tgz#75c63d06b497ab372b70186c0bf608d62847a2ba"
+  "resolved" "https://registry.npmjs.org/@styled-system/background/-/background-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
     "@styled-system/core" "^5.1.2"
 
 "@styled-system/border@^5.1.5":
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/@styled-system/border/-/border-5.1.5.tgz#0493d4332d2b59b74bb0d57d08c73eb555761ba6"
+  "resolved" "https://registry.npmjs.org/@styled-system/border/-/border-5.1.5.tgz"
+  "version" "5.1.5"
   dependencies:
     "@styled-system/core" "^5.1.2"
 
 "@styled-system/color@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@styled-system/color/-/color-5.1.2.tgz#b8d6b4af481faabe4abca1a60f8daa4ccc2d9f43"
+  "resolved" "https://registry.npmjs.org/@styled-system/color/-/color-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
     "@styled-system/core" "^5.1.2"
 
 "@styled-system/core@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@styled-system/core/-/core-5.1.2.tgz#b8b7b86455d5a0514f071c4fa8e434b987f6a772"
+  "resolved" "https://registry.npmjs.org/@styled-system/core/-/core-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
-    object-assign "^4.1.1"
+    "object-assign" "^4.1.1"
 
 "@styled-system/css@^5.1.5":
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/@styled-system/css/-/css-5.1.5.tgz#0460d5f3ff962fa649ea128ef58d9584f403bbbc"
+  "resolved" "https://registry.npmjs.org/@styled-system/css/-/css-5.1.5.tgz"
+  "version" "5.1.5"
 
 "@styled-system/flexbox@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@styled-system/flexbox/-/flexbox-5.1.2.tgz#077090f43f61c3852df63da24e4108087a8beecf"
+  "resolved" "https://registry.npmjs.org/@styled-system/flexbox/-/flexbox-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
     "@styled-system/core" "^5.1.2"
 
 "@styled-system/grid@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@styled-system/grid/-/grid-5.1.2.tgz#7165049877732900b99cd00759679fbe45c6c573"
+  "resolved" "https://registry.npmjs.org/@styled-system/grid/-/grid-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
     "@styled-system/core" "^5.1.2"
 
 "@styled-system/layout@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@styled-system/layout/-/layout-5.1.2.tgz#12d73e79887e10062f4dbbbc2067462eace42339"
+  "resolved" "https://registry.npmjs.org/@styled-system/layout/-/layout-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
     "@styled-system/core" "^5.1.2"
 
 "@styled-system/position@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@styled-system/position/-/position-5.1.2.tgz#56961266566836f57a24d8e8e33ce0c1adb59dd3"
+  "resolved" "https://registry.npmjs.org/@styled-system/position/-/position-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
     "@styled-system/core" "^5.1.2"
 
 "@styled-system/shadow@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@styled-system/shadow/-/shadow-5.1.2.tgz#beddab28d7de03cd0177a87ac4ed3b3b6d9831fd"
+  "resolved" "https://registry.npmjs.org/@styled-system/shadow/-/shadow-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
     "@styled-system/core" "^5.1.2"
 
 "@styled-system/space@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@styled-system/space/-/space-5.1.2.tgz#38925d2fa29a41c0eb20e65b7c3efb6e8efce953"
+  "resolved" "https://registry.npmjs.org/@styled-system/space/-/space-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
     "@styled-system/core" "^5.1.2"
 
 "@styled-system/typography@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@styled-system/typography/-/typography-5.1.2.tgz#65fb791c67d50cd2900d234583eaacdca8c134f7"
+  "resolved" "https://registry.npmjs.org/@styled-system/typography/-/typography-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
     "@styled-system/core" "^5.1.2"
 
 "@styled-system/variant@^5.1.5":
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/@styled-system/variant/-/variant-5.1.5.tgz#8446d8aad06af3a4c723d717841df2dbe4ddeafd"
+  "resolved" "https://registry.npmjs.org/@styled-system/variant/-/variant-5.1.5.tgz"
+  "version" "5.1.5"
   dependencies:
     "@styled-system/core" "^5.1.2"
     "@styled-system/css" "^5.1.5"
 
 "@surma/rollup-plugin-off-main-thread@^1.1.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.1.tgz#bf1343e5a926e5a1da55e3affd761dda4ce143ef"
+  "resolved" "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.1.tgz"
+  "version" "1.4.1"
   dependencies:
-    ejs "^2.6.1"
-    magic-string "^0.25.0"
+    "ejs" "^2.6.1"
+    "magic-string" "^0.25.0"
 
 "@svgr/babel-plugin-add-jsx-attribute@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz#dadcb6218503532d6884b210e7f3c502caaa44b1"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz"
+  "version" "4.2.0"
 
 "@svgr/babel-plugin-add-jsx-attribute@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz#81ef61947bb268eb9d50523446f9c638fb355906"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz"
+  "version" "5.4.0"
 
 "@svgr/babel-plugin-remove-jsx-attribute@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-4.2.0.tgz#297550b9a8c0c7337bea12bdfc8a80bb66f85abc"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-4.2.0.tgz"
+  "version" "4.2.0"
 
 "@svgr/babel-plugin-remove-jsx-attribute@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz#6b2c770c95c874654fd5e1d5ef475b78a0a962ef"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz"
+  "version" "5.4.0"
 
 "@svgr/babel-plugin-remove-jsx-empty-expression@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-4.2.0.tgz#c196302f3e68eab6a05e98af9ca8570bc13131c7"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-4.2.0.tgz"
+  "version" "4.2.0"
 
 "@svgr/babel-plugin-remove-jsx-empty-expression@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz#25621a8915ed7ad70da6cea3d0a6dbc2ea933efd"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz"
+  "version" "5.0.1"
 
 "@svgr/babel-plugin-replace-jsx-attribute-value@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-4.2.0.tgz#310ec0775de808a6a2e4fd4268c245fd734c1165"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-4.2.0.tgz"
+  "version" "4.2.0"
 
 "@svgr/babel-plugin-replace-jsx-attribute-value@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz#0b221fc57f9fcd10e91fe219e2cd0dd03145a897"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz"
+  "version" "5.0.1"
 
 "@svgr/babel-plugin-svg-dynamic-title@^4.3.3":
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.3.tgz#2cdedd747e5b1b29ed4c241e46256aac8110dd93"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.3.tgz"
+  "version" "4.3.3"
 
 "@svgr/babel-plugin-svg-dynamic-title@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz#139b546dd0c3186b6e5db4fefc26cb0baea729d7"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz"
+  "version" "5.4.0"
 
 "@svgr/babel-plugin-svg-em-dimensions@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-4.2.0.tgz#9a94791c9a288108d20a9d2cc64cac820f141391"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-4.2.0.tgz"
+  "version" "4.2.0"
 
 "@svgr/babel-plugin-svg-em-dimensions@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz#6543f69526632a133ce5cabab965deeaea2234a0"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz"
+  "version" "5.4.0"
 
 "@svgr/babel-plugin-transform-react-native-svg@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-4.2.0.tgz#151487322843359a1ca86b21a3815fd21a88b717"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-4.2.0.tgz"
+  "version" "4.2.0"
 
 "@svgr/babel-plugin-transform-react-native-svg@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz#00bf9a7a73f1cad3948cdab1f8dfb774750f8c80"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz"
+  "version" "5.4.0"
 
 "@svgr/babel-plugin-transform-svg-component@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-4.2.0.tgz#5f1e2f886b2c85c67e76da42f0f6be1b1767b697"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-4.2.0.tgz"
+  "version" "4.2.0"
 
 "@svgr/babel-plugin-transform-svg-component@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.4.0.tgz#a2212b4d018e6075a058bb7e220a66959ef7a03c"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.4.0.tgz"
+  "version" "5.4.0"
 
 "@svgr/babel-preset@^4.3.3":
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.3.3.tgz#a75d8c2f202ac0e5774e6bfc165d028b39a1316c"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-4.3.3.tgz"
+  "version" "4.3.3"
   dependencies:
     "@svgr/babel-plugin-add-jsx-attribute" "^4.2.0"
     "@svgr/babel-plugin-remove-jsx-attribute" "^4.2.0"
@@ -3371,8 +3483,8 @@
     "@svgr/babel-plugin-transform-svg-component" "^4.2.0"
 
 "@svgr/babel-preset@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-5.4.0.tgz#da21854643e1c4ad2279239baa7d5a8b128c1f15"
+  "resolved" "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.4.0.tgz"
+  "version" "5.4.0"
   dependencies:
     "@svgr/babel-plugin-add-jsx-attribute" "^5.4.0"
     "@svgr/babel-plugin-remove-jsx-attribute" "^5.4.0"
@@ -3384,83 +3496,70 @@
     "@svgr/babel-plugin-transform-svg-component" "^5.4.0"
 
 "@svgr/core@^4.3.3":
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/@svgr/core/-/core-4.3.3.tgz#b37b89d5b757dc66e8c74156d00c368338d24293"
+  "resolved" "https://registry.npmjs.org/@svgr/core/-/core-4.3.3.tgz"
+  "version" "4.3.3"
   dependencies:
     "@svgr/plugin-jsx" "^4.3.3"
-    camelcase "^5.3.1"
-    cosmiconfig "^5.2.1"
+    "camelcase" "^5.3.1"
+    "cosmiconfig" "^5.2.1"
 
 "@svgr/core@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/core/-/core-5.4.0.tgz#655378ee43679eb94fee3d4e1976e38252dff8e7"
+  "resolved" "https://registry.npmjs.org/@svgr/core/-/core-5.4.0.tgz"
+  "version" "5.4.0"
   dependencies:
     "@svgr/plugin-jsx" "^5.4.0"
-    camelcase "^6.0.0"
-    cosmiconfig "^6.0.0"
+    "camelcase" "^6.0.0"
+    "cosmiconfig" "^6.0.0"
 
 "@svgr/hast-util-to-babel-ast@^4.3.2":
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-4.3.2.tgz#1d5a082f7b929ef8f1f578950238f630e14532b8"
+  "resolved" "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-4.3.2.tgz"
+  "version" "4.3.2"
   dependencies:
     "@babel/types" "^7.4.4"
 
 "@svgr/hast-util-to-babel-ast@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.4.0.tgz#bb5d002e428f510aa5b53ec0a02377a95b367715"
+  "resolved" "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.4.0.tgz"
+  "version" "5.4.0"
   dependencies:
     "@babel/types" "^7.9.5"
 
 "@svgr/plugin-jsx@^4.3.3":
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.3.3.tgz#e2ba913dbdfbe85252a34db101abc7ebd50992fa"
+  "resolved" "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-4.3.3.tgz"
+  "version" "4.3.3"
   dependencies:
     "@babel/core" "^7.4.5"
     "@svgr/babel-preset" "^4.3.3"
     "@svgr/hast-util-to-babel-ast" "^4.3.2"
-    svg-parser "^2.0.0"
+    "svg-parser" "^2.0.0"
 
 "@svgr/plugin-jsx@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-5.4.0.tgz#ab47504c55615833c6db70fca2d7e489f509787c"
+  "resolved" "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.4.0.tgz"
+  "version" "5.4.0"
   dependencies:
     "@babel/core" "^7.7.5"
     "@svgr/babel-preset" "^5.4.0"
     "@svgr/hast-util-to-babel-ast" "^5.4.0"
-    svg-parser "^2.0.2"
+    "svg-parser" "^2.0.2"
 
 "@svgr/plugin-svgo@^4.3.1":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-4.3.1.tgz#daac0a3d872e3f55935c6588dd370336865e9e32"
+  "resolved" "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-4.3.1.tgz"
+  "version" "4.3.1"
   dependencies:
-    cosmiconfig "^5.2.1"
-    merge-deep "^3.0.2"
-    svgo "^1.2.2"
+    "cosmiconfig" "^5.2.1"
+    "merge-deep" "^3.0.2"
+    "svgo" "^1.2.2"
 
 "@svgr/plugin-svgo@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-5.4.0.tgz#45d9800b7099a6f7b4d85ebac89ab9abe8592f64"
+  "resolved" "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.4.0.tgz"
+  "version" "5.4.0"
   dependencies:
-    cosmiconfig "^6.0.0"
-    merge-deep "^3.0.2"
-    svgo "^1.2.2"
-
-"@svgr/webpack@5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-5.4.0.tgz#b68bc86e29cf007292b96ced65f80971175632e0"
-  dependencies:
-    "@babel/core" "^7.9.0"
-    "@babel/plugin-transform-react-constant-elements" "^7.9.0"
-    "@babel/preset-env" "^7.9.5"
-    "@babel/preset-react" "^7.9.4"
-    "@svgr/core" "^5.4.0"
-    "@svgr/plugin-jsx" "^5.4.0"
-    "@svgr/plugin-svgo" "^5.4.0"
-    loader-utils "^2.0.0"
+    "cosmiconfig" "^6.0.0"
+    "merge-deep" "^3.0.2"
+    "svgo" "^1.2.2"
 
 "@svgr/webpack@^4.0.3":
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.3.tgz#13cc2423bf3dff2d494f16b17eb7eacb86895017"
+  "resolved" "https://registry.npmjs.org/@svgr/webpack/-/webpack-4.3.3.tgz"
+  "version" "4.3.3"
   dependencies:
     "@babel/core" "^7.4.5"
     "@babel/plugin-transform-react-constant-elements" "^7.0.0"
@@ -3469,79 +3568,89 @@
     "@svgr/core" "^4.3.3"
     "@svgr/plugin-jsx" "^4.3.3"
     "@svgr/plugin-svgo" "^4.3.1"
-    loader-utils "^1.2.3"
+    "loader-utils" "^1.2.3"
 
-"@testing-library/dom@^7.28.1":
-  version "7.30.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.30.1.tgz#07b6f3ccd7f1f1e34ab0406932073e2971817f3d"
-  integrity sha512-RQUvqqq2lxTCOffhSNxpX/9fCoR+nwuQPmG5uhuuEH5KBAzNf2bK3OzBoWjm5zKM78SLjnGRAKt8hRjQA4E46A==
+"@svgr/webpack@5.4.0":
+  "resolved" "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.4.0.tgz"
+  "version" "5.4.0"
+  dependencies:
+    "@babel/core" "^7.9.0"
+    "@babel/plugin-transform-react-constant-elements" "^7.9.0"
+    "@babel/preset-env" "^7.9.5"
+    "@babel/preset-react" "^7.9.4"
+    "@svgr/core" "^5.4.0"
+    "@svgr/plugin-jsx" "^5.4.0"
+    "@svgr/plugin-svgo" "^5.4.0"
+    "loader-utils" "^2.0.0"
+
+"@testing-library/dom@^7.28.1", "@testing-library/dom@>=7.21.4":
+  "resolved" "https://registry.npmjs.org/@testing-library/dom/-/dom-7.30.1.tgz"
+  "version" "7.30.1"
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
     "@types/aria-query" "^4.2.0"
-    aria-query "^4.2.2"
-    chalk "^4.1.0"
-    dom-accessibility-api "^0.5.4"
-    lz-string "^1.4.4"
-    pretty-format "^26.6.2"
+    "aria-query" "^4.2.2"
+    "chalk" "^4.1.0"
+    "dom-accessibility-api" "^0.5.4"
+    "lz-string" "^1.4.4"
+    "pretty-format" "^26.6.2"
 
 "@testing-library/jest-dom@^5.11.4":
-  version "5.11.4"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.4.tgz#f325c600db352afb92995c2576022b35621ddc99"
+  "resolved" "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.11.4.tgz"
+  "version" "5.11.4"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@types/testing-library__jest-dom" "^5.9.1"
-    aria-query "^4.2.2"
-    chalk "^3.0.0"
-    css "^3.0.0"
-    css.escape "^1.5.1"
-    lodash "^4.17.15"
-    redent "^3.0.0"
+    "aria-query" "^4.2.2"
+    "chalk" "^3.0.0"
+    "css" "^3.0.0"
+    "css.escape" "^1.5.1"
+    "lodash" "^4.17.15"
+    "redent" "^3.0.0"
 
 "@testing-library/react@^11.2.6":
-  version "11.2.6"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.6.tgz#586a23adc63615985d85be0c903f374dab19200b"
-  integrity sha512-TXMCg0jT8xmuU8BkKMtp8l7Z50Ykew5WNX8UoIKTaLFwKkP2+1YDhOLA2Ga3wY4x29jyntk7EWfum0kjlYiSjQ==
+  "resolved" "https://registry.npmjs.org/@testing-library/react/-/react-11.2.6.tgz"
+  "version" "11.2.6"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@testing-library/dom" "^7.28.1"
 
 "@testing-library/user-event@^13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-13.1.1.tgz#1e011de944cf4d2a917cef6c3046c26389943e24"
-  integrity sha512-B4roX+0mpXKGj8ndd38YoIo3IV9pmTTWxr/2cOke5apTtrNabEUE0KMBccpcAcYlfPcr7uMu+dxeeC3HdXd9qQ==
+  "resolved" "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.1.1.tgz"
+  "version" "13.1.1"
   dependencies:
     "@babel/runtime" "^7.12.5"
 
 "@transloadit/prettier-bytes@0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz#cdb5399f445fdd606ed833872fa0cabdbc51686b"
+  "resolved" "https://registry.npmjs.org/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz"
+  "version" "0.0.7"
 
 "@types/algoliasearch-helper@*":
-  version "2.26.1"
-  resolved "https://registry.yarnpkg.com/@types/algoliasearch-helper/-/algoliasearch-helper-2.26.1.tgz#60cf377e7cb4bd9a55f7eba35182792763230a24"
+  "resolved" "https://registry.npmjs.org/@types/algoliasearch-helper/-/algoliasearch-helper-2.26.1.tgz"
+  "version" "2.26.1"
   dependencies:
     "@types/algoliasearch" "*"
 
 "@types/algoliasearch@*":
-  version "3.34.11"
-  resolved "https://registry.yarnpkg.com/@types/algoliasearch/-/algoliasearch-3.34.11.tgz#a7f3b89a95578be3acd972167bdbadb5dcf71660"
+  "resolved" "https://registry.npmjs.org/@types/algoliasearch/-/algoliasearch-3.34.11.tgz"
+  "version" "3.34.11"
 
 "@types/anymatch@*":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
+  "resolved" "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"
+  "version" "1.3.1"
 
 "@types/aria-query@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
+  "resolved" "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.0.tgz"
+  "version" "4.2.0"
 
 "@types/asap@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/asap/-/asap-2.0.0.tgz#d529e9608c83499a62ae08c871c5e62271aa2963"
+  "resolved" "https://registry.npmjs.org/@types/asap/-/asap-2.0.0.tgz"
+  "version" "2.0.0"
 
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.10"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
+  "resolved" "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz"
+  "version" "7.1.10"
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -3550,739 +3659,779 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8"
+  "resolved" "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz"
+  "version" "7.6.2"
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz#b8aaeba0a45caca7b56a5de9459872dde3727214"
+  "resolved" "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz"
+  "version" "7.0.3"
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
+  "resolved" "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"
+  "version" "7.0.15"
   dependencies:
     "@babel/types" "^7.3.0"
 
 "@types/chance@^1.0.7":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@types/chance/-/chance-1.1.0.tgz#7d8e6bd0506344d94c042f692d59d20f8eb7d66d"
+  "resolved" "https://registry.npmjs.org/@types/chance/-/chance-1.1.0.tgz"
+  "version" "1.1.0"
 
 "@types/codemirror@^0.0.96":
-  version "0.0.96"
-  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.96.tgz#73b52e784a246cebef31d544fef45ea764de5bad"
+  "resolved" "https://registry.npmjs.org/@types/codemirror/-/codemirror-0.0.96.tgz"
+  "version" "0.0.96"
   dependencies:
     "@types/tern" "*"
 
 "@types/component-emitter@^1.2.10":
-  version "1.2.10"
-  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea"
-  integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==
+  "resolved" "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz"
+  "version" "1.2.10"
 
 "@types/cookie@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108"
-  integrity sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg==
+  "resolved" "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz"
+  "version" "0.4.0"
 
 "@types/deep-diff@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/deep-diff/-/deep-diff-1.0.0.tgz#7eba3202a99b3a207f758f351f7f86387269fc40"
+  "resolved" "https://registry.npmjs.org/@types/deep-diff/-/deep-diff-1.0.0.tgz"
+  "version" "1.0.0"
 
 "@types/dom4@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/dom4/-/dom4-2.0.1.tgz#506d5781b9bcab81bd9a878b198aec7dee2a6033"
+  "resolved" "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.1.tgz"
+  "version" "2.0.1"
 
 "@types/downloadjs@^1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@types/downloadjs/-/downloadjs-1.4.2.tgz#6734e60840cd8df3f0f8937c80e67efe7de6f886"
+  "resolved" "https://registry.npmjs.org/@types/downloadjs/-/downloadjs-1.4.2.tgz"
+  "version" "1.4.2"
 
 "@types/draft-js@^0.11.1":
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/@types/draft-js/-/draft-js-0.11.1.tgz#f67920c9583054143e263704e250dd3086de3ef3"
-  integrity sha512-jV4LAXYdVvS0ahIROZehkKqHgfLxaDBl3fzfEVqho8NxFAtEaObdIiu7FpPUu/Y97PlJVxGajar7aSikQqz9sQ==
+  "resolved" "https://registry.npmjs.org/@types/draft-js/-/draft-js-0.11.1.tgz"
+  "version" "0.11.1"
+  dependencies:
+    "@types/react" "*"
+    "immutable" "~3.7.4"
+
+"@types/emoji-mart@^3.0.4":
+  "resolved" "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.4.tgz"
+  "version" "3.0.4"
   dependencies:
     "@types/react" "*"
-    immutable "~3.7.4"
 
 "@types/eslint@^7.2.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.4.tgz#d12eeed7741d2491b69808576ac2d20c14f74c41"
+  "resolved" "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.4.tgz"
+  "version" "7.2.4"
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
 "@types/estree@*":
-  version "0.0.45"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
+  "resolved" "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz"
+  "version" "0.0.45"
 
 "@types/estree@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  "resolved" "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"
+  "version" "0.0.39"
 
 "@types/glob@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
+  "resolved" "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz"
+  "version" "7.1.3"
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/googlemaps@^3.39.6":
-  version "3.40.0"
-  resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.40.0.tgz#786743648ab464fbeaa4cfe15230a7297273b309"
+"@types/googlemaps@^3.0.0", "@types/googlemaps@^3.39.6":
+  "resolved" "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.40.0.tgz"
+  "version" "3.40.0"
 
 "@types/graceful-fs@^4.1.2":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753"
+  "resolved" "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.4.tgz"
+  "version" "4.1.4"
   dependencies:
     "@types/node" "*"
 
 "@types/hast@^2.0.0":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.1.tgz#b16872f2a6144c7025f296fb9636a667ebb79cd9"
+  "resolved" "https://registry.npmjs.org/@types/hast/-/hast-2.3.1.tgz"
+  "version" "2.3.1"
   dependencies:
     "@types/unist" "*"
 
 "@types/history@*":
-  version "4.7.8"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
+  "resolved" "https://registry.npmjs.org/@types/history/-/history-4.7.8.tgz"
+  "version" "4.7.8"
 
 "@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
+  "resolved" "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz"
+  "version" "3.3.1"
   dependencies:
     "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
+    "hoist-non-react-statics" "^3.3.0"
 
 "@types/html-minifier-terser@^5.0.0":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50"
+  "resolved" "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"
+  "version" "5.1.1"
 
 "@types/inquirer@^7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-7.3.1.tgz#1f231224e7df11ccfaf4cf9acbcc3b935fea292d"
-  integrity sha512-osD38QVIfcdgsPCT0V3lD7eH0OFurX71Jft18bZrsVQWVRt6TuxRzlr0GJLrxoHZR2V5ph7/qP8se/dcnI7o0g==
+  "resolved" "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.1.tgz"
+  "version" "7.3.1"
   dependencies:
     "@types/through" "*"
-    rxjs "^6.4.0"
+    "rxjs" "^6.4.0"
 
 "@types/invariant@^2.2.30":
-  version "2.2.34"
-  resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.34.tgz#05e4f79f465c2007884374d4795452f995720bbe"
+  "resolved" "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.34.tgz"
+  "version" "2.2.34"
 
 "@types/is-function@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/is-function/-/is-function-1.0.0.tgz#1b0b819b1636c7baf0d6785d030d12edf70c3e83"
+  "resolved" "https://registry.npmjs.org/@types/is-function/-/is-function-1.0.0.tgz"
+  "version" "1.0.0"
 
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
+  "resolved" "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"
+  "version" "2.0.3"
 
 "@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  "resolved" "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^1.1.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"
+  "resolved" "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"
+  "version" "1.1.2"
   dependencies:
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
 "@types/istanbul-reports@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
+  "resolved" "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@*":
-  version "26.0.14"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz#078695f8f65cb55c5a98450d65083b2b73e5a3f3"
+  "resolved" "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz"
+  "version" "26.0.14"
   dependencies:
-    jest-diff "^25.2.1"
-    pretty-format "^25.2.1"
+    "jest-diff" "^25.2.1"
+    "pretty-format" "^25.2.1"
 
 "@types/jest@^24.0.22":
-  version "24.9.1"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz#02baf9573c78f1b9974a5f36778b366aa77bd534"
+  "resolved" "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz"
+  "version" "24.9.1"
   dependencies:
-    jest-diff "^24.3.0"
+    "jest-diff" "^24.3.0"
 
 "@types/js-levenshtein@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@types/js-levenshtein/-/js-levenshtein-1.1.0.tgz#9541eec4ad6e3ec5633270a3a2b55d981edc44a9"
-  integrity sha512-14t0v1ICYRtRVcHASzes0v/O+TIeASb8aD55cWF1PidtInhFWSXcmhzhHqGjUWf9SUq1w70cvd1cWKUULubAfQ==
+  "resolved" "https://registry.npmjs.org/@types/js-levenshtein/-/js-levenshtein-1.1.0.tgz"
+  "version" "1.1.0"
+
+"@types/jshint@^2.12.0":
+  "resolved" "https://registry.npmjs.org/@types/jshint/-/jshint-2.12.0.tgz"
+  "version" "2.12.0"
 
 "@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
+  "resolved" "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"
+  "version" "7.0.6"
 
 "@types/json5@^0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  "resolved" "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
+  "version" "0.0.29"
+
+"@types/lodash@^4.14.105":
+  "resolved" "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz"
+  "version" "4.14.170"
 
 "@types/lodash@^4.14.120":
-  version "4.14.162"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.162.tgz#65d78c397e0d883f44afbf1f7ba9867022411470"
+  "resolved" "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.162.tgz"
+  "version" "4.14.162"
+
+"@types/lodash@^4.14.168":
+  "resolved" "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.169.tgz"
+  "version" "4.14.169"
 
 "@types/marked@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-1.2.2.tgz#1f858a0e690247ecf3b2eef576f98f86e8d960d4"
+  "resolved" "https://registry.npmjs.org/@types/marked/-/marked-1.2.2.tgz"
+  "version" "1.2.2"
 
 "@types/mdast@^3.0.0":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
+  "resolved" "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz"
+  "version" "3.0.3"
   dependencies:
     "@types/unist" "*"
 
 "@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  "resolved" "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"
+  "version" "3.0.3"
+
+"@types/minimist@^1.2.0":
+  "resolved" "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz"
+  "version" "1.2.1"
 
 "@types/moment-timezone@^0.5.10":
-  version "0.5.30"
-  resolved "https://registry.yarnpkg.com/@types/moment-timezone/-/moment-timezone-0.5.30.tgz#340ed45fe3e715f4a011f5cfceb7cb52aad46fc7"
+  "resolved" "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.30.tgz"
+  "version" "0.5.30"
   dependencies:
-    moment-timezone "*"
+    "moment-timezone" "*"
 
 "@types/nanoid@^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@types/nanoid/-/nanoid-2.1.0.tgz#41edfda78986e9127d0dc14de982de766f994020"
+  "resolved" "https://registry.npmjs.org/@types/nanoid/-/nanoid-2.1.0.tgz"
+  "version" "2.1.0"
+  dependencies:
+    "@types/node" "*"
+
+"@types/node-forge@^0.10.0":
+  "resolved" "https://registry.npmjs.org/@types/node-forge/-/node-forge-0.10.0.tgz"
+  "version" "0.10.0"
   dependencies:
     "@types/node" "*"
 
 "@types/node@*":
-  version "14.11.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.8.tgz#fe2012f2355e4ce08bca44aeb3abbb21cf88d33f"
+  "resolved" "https://registry.npmjs.org/@types/node/-/node-14.11.8.tgz"
+  "version" "14.11.8"
 
 "@types/node@^10.12.18":
-  version "10.17.39"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.39.tgz#ce1122758d0608de8303667cebf171f44192629b"
+  "resolved" "https://registry.npmjs.org/@types/node/-/node-10.17.39.tgz"
+  "version" "10.17.39"
 
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  "resolved" "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"
+  "version" "2.4.0"
 
 "@types/npmlog@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.2.tgz#d070fe6a6b78755d1092a3dc492d34c3d8f871c4"
+  "resolved" "https://registry.npmjs.org/@types/npmlog/-/npmlog-4.1.2.tgz"
+  "version" "4.1.2"
 
 "@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  "resolved" "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
+  "version" "4.0.0"
 
 "@types/parse5@^5.0.0":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
+  "resolved" "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz"
+  "version" "5.0.3"
 
 "@types/prettier@^2.0.0":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz#b6ab3bba29e16b821d84e09ecfaded462b816b00"
+  "resolved" "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.5.tgz"
+  "version" "2.1.5"
 
 "@types/prismjs@^1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.16.1.tgz#50b82947207847db6abcbcd14caa89e3b897c259"
+  "resolved" "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.16.1.tgz"
+  "version" "1.16.1"
 
 "@types/prop-types@*", "@types/prop-types@^15.7.3":
-  version "15.7.3"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
+  "resolved" "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz"
+  "version" "15.7.3"
 
 "@types/q@^1.5.1":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
+  "resolved" "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz"
+  "version" "1.5.4"
 
 "@types/reach__router@^1.2.3":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.6.tgz#413417ce74caab331c70ce6a03a4c825188e4709"
+  "resolved" "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.6.tgz"
+  "version" "1.3.6"
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
 
 "@types/react-beautiful-dnd@^11.0.4":
-  version "11.0.5"
-  resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-11.0.5.tgz#2f5bc733dd46da28312c8ee0c126ab7202b90247"
+  "resolved" "https://registry.npmjs.org/@types/react-beautiful-dnd/-/react-beautiful-dnd-11.0.5.tgz"
+  "version" "11.0.5"
   dependencies:
     "@types/react" "*"
 
 "@types/react-color@^3.0.1":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-3.0.4.tgz#c63daf012ad067ac0127bdd86725f079d02082bd"
+  "resolved" "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.4.tgz"
+  "version" "3.0.4"
   dependencies:
     "@types/react" "*"
     "@types/reactcss" "*"
 
 "@types/react-custom-scrollbars@^4.0.7":
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/@types/react-custom-scrollbars/-/react-custom-scrollbars-4.0.7.tgz#b1312ec749fcf4a01fee7466508501e072ede7ea"
+  "resolved" "https://registry.npmjs.org/@types/react-custom-scrollbars/-/react-custom-scrollbars-4.0.7.tgz"
+  "version" "4.0.7"
   dependencies:
     "@types/react" "*"
 
 "@types/react-dom@*", "@types/react-dom@^16.8.0":
-  version "16.9.8"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
+  "resolved" "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.8.tgz"
+  "version" "16.9.8"
+  dependencies:
+    "@types/react" "*"
+
+"@types/react-google-recaptcha@^2.1.1":
+  "integrity" "sha512-xK9ckpiHJKLo92RIBlDRidpqM9Y+9W1L58jWJgHgaAzYOlxWNftnn55+Lg+F8U9mar20MxyI3dZCRIx9xyz8lA=="
+  "resolved" "https://registry.npmjs.org/@types/react-google-recaptcha/-/react-google-recaptcha-2.1.1.tgz"
+  "version" "2.1.1"
   dependencies:
     "@types/react" "*"
 
 "@types/react-helmet@^5.0.14":
-  version "5.0.16"
-  resolved "https://registry.yarnpkg.com/@types/react-helmet/-/react-helmet-5.0.16.tgz#dafac5f043665b880559285a27c71a69abd1f29e"
+  "resolved" "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-5.0.16.tgz"
+  "version" "5.0.16"
   dependencies:
     "@types/react" "*"
 
 "@types/react-instantsearch-core@*":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/@types/react-instantsearch-core/-/react-instantsearch-core-6.3.1.tgz#038e9102301748de6459d8d2a2d94b9a01f3c22c"
+  "resolved" "https://registry.npmjs.org/@types/react-instantsearch-core/-/react-instantsearch-core-6.3.1.tgz"
+  "version" "6.3.1"
   dependencies:
     "@types/algoliasearch-helper" "*"
     "@types/react" "*"
 
 "@types/react-instantsearch-dom@^6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@types/react-instantsearch-dom/-/react-instantsearch-dom-6.3.0.tgz#5543a2fbe85d5c8a7658d61fdb92fcba1cf2e616"
+  "resolved" "https://registry.npmjs.org/@types/react-instantsearch-dom/-/react-instantsearch-dom-6.3.0.tgz"
+  "version" "6.3.0"
   dependencies:
     "@types/react" "*"
     "@types/react-instantsearch-core" "*"
 
 "@types/react-native@*":
-  version "0.63.25"
-  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.63.25.tgz#a08bbe17a75cce993f52655a8fe75f30bf77e965"
+  "resolved" "https://registry.npmjs.org/@types/react-native/-/react-native-0.63.25.tgz"
+  "version" "0.63.25"
   dependencies:
     "@types/react" "*"
 
 "@types/react-redux@^7.0.1":
-  version "7.1.9"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.9.tgz#280c13565c9f13ceb727ec21e767abe0e9b4aec3"
+  "resolved" "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.9.tgz"
+  "version" "7.1.9"
   dependencies:
     "@types/hoist-non-react-statics" "^3.3.0"
     "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-    redux "^4.0.0"
+    "hoist-non-react-statics" "^3.3.0"
+    "redux" "^4.0.0"
 
 "@types/react-router-dom@^5.1.2":
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.6.tgz#07b14e7ab1893a837c8565634960dc398564b1fb"
+  "resolved" "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.6.tgz"
+  "version" "5.1.6"
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
     "@types/react-router" "*"
 
 "@types/react-router@*":
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.8.tgz#4614e5ba7559657438e17766bb95ef6ed6acc3fa"
+  "resolved" "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.8.tgz"
+  "version" "5.1.8"
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
 
 "@types/react-select@^3.0.5":
-  version "3.0.22"
-  resolved "https://registry.yarnpkg.com/@types/react-select/-/react-select-3.0.22.tgz#b88306365e99fa86809a5c0ce0f1b4e8d0b626bf"
+  "resolved" "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.22.tgz"
+  "version" "3.0.22"
   dependencies:
     "@types/react" "*"
     "@types/react-dom" "*"
     "@types/react-transition-group" "*"
 
 "@types/react-syntax-highlighter@11.0.4":
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.4.tgz#d86d17697db62f98046874f62fdb3e53a0bbc4cd"
+  "resolved" "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.4.tgz"
+  "version" "11.0.4"
   dependencies:
     "@types/react" "*"
 
 "@types/react-table@^7.0.13":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@types/react-table/-/react-table-7.0.24.tgz#ef27334f8da55d7890dc8dbec63a3f873f8d97fe"
+  "resolved" "https://registry.npmjs.org/@types/react-table/-/react-table-7.0.24.tgz"
+  "version" "7.0.24"
   dependencies:
     "@types/react" "*"
 
 "@types/react-tabs@^2.3.1":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@types/react-tabs/-/react-tabs-2.3.2.tgz#99fb6866bbc6912d44f7bbc99eca03fbbd217960"
+  "resolved" "https://registry.npmjs.org/@types/react-tabs/-/react-tabs-2.3.2.tgz"
+  "version" "2.3.2"
   dependencies:
     "@types/react" "*"
 
 "@types/react-test-renderer@^17.0.1":
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-17.0.1.tgz#3120f7d1c157fba9df0118dae20cb0297ee0e06b"
-  integrity sha512-3Fi2O6Zzq/f3QR9dRnlnHso9bMl7weKCviFmfF6B4LS1Uat6Hkm15k0ZAQuDz+UBq6B3+g+NM6IT2nr5QgPzCw==
+  "resolved" "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-17.0.1.tgz"
+  "version" "17.0.1"
   dependencies:
     "@types/react" "*"
 
 "@types/react-textarea-autosize@^4.3.3":
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/@types/react-textarea-autosize/-/react-textarea-autosize-4.3.5.tgz#6c4d2753fa1864c98c0b2b517f67bb1f6e4c46de"
+  "resolved" "https://registry.npmjs.org/@types/react-textarea-autosize/-/react-textarea-autosize-4.3.5.tgz"
+  "version" "4.3.5"
   dependencies:
     "@types/react" "*"
 
 "@types/react-transition-group@*":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d"
+  "resolved" "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.0.tgz"
+  "version" "4.4.0"
   dependencies:
     "@types/react" "*"
 
 "@types/react-window@^1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.2.tgz#a5a6b2762ce73ffaab7911ee1397cf645f2459fe"
+  "resolved" "https://registry.npmjs.org/@types/react-window/-/react-window-1.8.2.tgz"
+  "version" "1.8.2"
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16.8.2":
-  version "16.9.52"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.52.tgz#c46c72d1a1d8d9d666f4dd2066c0e22600ccfde1"
+"@types/react@*", "@types/react@^15.0.0 || ^16.0.0", "@types/react@^16.8.0", "@types/react@^16.8.2":
+  "resolved" "https://registry.npmjs.org/@types/react/-/react-16.9.52.tgz"
+  "version" "16.9.52"
   dependencies:
     "@types/prop-types" "*"
-    csstype "^3.0.2"
+    "csstype" "^3.0.2"
+
+"@types/react@^16.0.40":
+  "resolved" "https://registry.npmjs.org/@types/react/-/react-16.14.8.tgz"
+  "version" "16.14.8"
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    "csstype" "^3.0.2"
 
 "@types/reactcss@*":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@types/reactcss/-/reactcss-1.2.3.tgz#af28ae11bbb277978b99d04d1eedfd068ca71834"
+  "resolved" "https://registry.npmjs.org/@types/reactcss/-/reactcss-1.2.3.tgz"
+  "version" "1.2.3"
   dependencies:
     "@types/react" "*"
 
 "@types/redux-form@^8.1.9":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@types/redux-form/-/redux-form-8.3.0.tgz#d253e0078a4940187b946459e0bb4d6a355018b1"
+  "resolved" "https://registry.npmjs.org/@types/redux-form/-/redux-form-8.3.0.tgz"
+  "version" "8.3.0"
   dependencies:
     "@types/react" "*"
-    redux "^3.6.0 || ^4.0.0"
+    "redux" "^3.6.0 || ^4.0.0"
 
 "@types/redux-mock-store@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/redux-mock-store/-/redux-mock-store-1.0.2.tgz#c27d5deadfb29d8514bdb0fc2cadae6feea1922d"
+  "resolved" "https://registry.npmjs.org/@types/redux-mock-store/-/redux-mock-store-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    redux "^4.0.5"
+    "redux" "^4.0.5"
+
+"@types/resize-observer-browser@^0.1.5":
+  "resolved" "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.5.tgz"
+  "version" "0.1.5"
 
 "@types/resolve@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
+  "resolved" "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz"
+  "version" "0.0.8"
   dependencies:
     "@types/node" "*"
 
+"@types/scheduler@*":
+  "resolved" "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.1.tgz"
+  "version" "0.16.1"
+
 "@types/set-cookie-parser@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/set-cookie-parser/-/set-cookie-parser-2.4.0.tgz#10cc0446bad372827671a5195fbd14ebce4a9baf"
-  integrity sha512-w7BFUq81sy7H/0jN0K5cax8MwRN6NOSURpY4YuO4+mOgoicxCZ33BUYz+gyF/sUf7uDl2We2yGJfppxzEXoAXQ==
+  "resolved" "https://registry.npmjs.org/@types/set-cookie-parser/-/set-cookie-parser-2.4.0.tgz"
+  "version" "2.4.0"
   dependencies:
     "@types/node" "*"
 
 "@types/shallowequal@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/shallowequal/-/shallowequal-1.1.1.tgz#aad262bb3f2b1257d94c71d545268d592575c9b1"
+  "resolved" "https://registry.npmjs.org/@types/shallowequal/-/shallowequal-1.1.1.tgz"
+  "version" "1.1.1"
 
 "@types/sinonjs__fake-timers@^6.0.1":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz#3a84cf5ec3249439015e14049bd3161419bf9eae"
+  "resolved" "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz"
+  "version" "6.0.2"
 
 "@types/sizzle@^2.3.2":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
+  "resolved" "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz"
+  "version" "2.3.2"
 
 "@types/source-list-map@*":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  "resolved" "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz"
+  "version" "0.1.2"
 
 "@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+  "resolved" "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz"
+  "version" "1.0.1"
 
 "@types/stack-utils@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
+  "resolved" "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz"
+  "version" "2.0.0"
 
 "@types/styled-components@^5.1.3":
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.4.tgz#11f167dbde268635c66adc89b5a5db2e69d75384"
+  "resolved" "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
     "@types/hoist-non-react-statics" "*"
     "@types/react" "*"
     "@types/react-native" "*"
-    csstype "^3.0.2"
+    "csstype" "^3.0.2"
 
 "@types/styled-system@^5.1.9":
-  version "5.1.10"
-  resolved "https://registry.yarnpkg.com/@types/styled-system/-/styled-system-5.1.10.tgz#dcf5690dd837ca49b8de1f23cb99d510c7f4ecb3"
+  "resolved" "https://registry.npmjs.org/@types/styled-system/-/styled-system-5.1.10.tgz"
+  "version" "5.1.10"
   dependencies:
-    csstype "^3.0.2"
+    "csstype" "^3.0.2"
 
 "@types/tapable@*", "@types/tapable@^1.0.5":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
+  "resolved" "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz"
+  "version" "1.0.6"
 
 "@types/tern@*":
-  version "0.23.3"
-  resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.3.tgz#4b54538f04a88c9ff79de1f6f94f575a7f339460"
+  "resolved" "https://registry.npmjs.org/@types/tern/-/tern-0.23.3.tgz"
+  "version" "0.23.3"
   dependencies:
     "@types/estree" "*"
 
 "@types/tern@0.22.0":
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.22.0.tgz#3b893a2368ca7db3452f0ce84f3fec1e7091e418"
+  "resolved" "https://registry.npmjs.org/@types/tern/-/tern-0.22.0.tgz"
+  "version" "0.22.0"
   dependencies:
     "@types/estree" "*"
 
 "@types/testing-library__jest-dom@^5.9.1":
-  version "5.9.4"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.4.tgz#f5e009540bbea7b82745e352038c60db7320c327"
+  "resolved" "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.4.tgz"
+  "version" "5.9.4"
   dependencies:
     "@types/jest" "*"
 
 "@types/through@*":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.30.tgz#e0e42ce77e897bd6aead6f6ea62aeb135b8a3895"
-  integrity sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==
+  "resolved" "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz"
+  "version" "0.0.30"
   dependencies:
     "@types/node" "*"
 
 "@types/tinycolor2@^1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@types/tinycolor2/-/tinycolor2-1.4.2.tgz#721ca5c5d1a2988b4a886e35c2ffc5735b6afbdf"
+  "resolved" "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.2.tgz"
+  "version" "1.4.2"
 
 "@types/toposort@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/toposort/-/toposort-2.0.3.tgz#dc490842b77c3e910c8d727ff0bdb2fb124cb41b"
+  "resolved" "https://registry.npmjs.org/@types/toposort/-/toposort-2.0.3.tgz"
+  "version" "2.0.3"
 
 "@types/uglify-js@*":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.11.0.tgz#2868d405cc45cd9dc3069179052103032c33afbc"
+  "resolved" "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz"
+  "version" "3.11.0"
   dependencies:
-    source-map "^0.6.1"
+    "source-map" "^0.6.1"
 
 "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
+  "resolved" "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz"
+  "version" "2.0.3"
 
 "@types/webpack-env@^1.15.0":
-  version "1.15.3"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.3.tgz#fb602cd4c2f0b7c0fb857e922075fdf677d25d84"
+  "resolved" "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.15.3.tgz"
+  "version" "1.15.3"
 
 "@types/webpack-sources@*":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz#08216ab9be2be2e1499beaebc4d469cec81e82a7"
+  "resolved" "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
-    source-map "^0.7.3"
+    "source-map" "^0.7.3"
 
-"@types/webpack@^4.41.13", "@types/webpack@^4.41.8":
-  version "4.41.22"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.22.tgz#ff9758a17c6bd499e459b91e78539848c32d0731"
+"@types/webpack@^4.41.13", "@types/webpack@^4.41.8", "@types/webpack@4.x":
+  "resolved" "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz"
+  "version" "4.41.22"
   dependencies:
     "@types/anymatch" "*"
     "@types/node" "*"
     "@types/tapable" "*"
     "@types/uglify-js" "*"
     "@types/webpack-sources" "*"
-    source-map "^0.6.0"
+    "source-map" "^0.6.0"
 
 "@types/yargs-parser@*":
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
+  "resolved" "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"
+  "version" "15.0.0"
 
 "@types/yargs@^13.0.0":
-  version "13.0.11"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.11.tgz#def2f0c93e4bdf2c61d7e34899b17e34be28d3b1"
+  "resolved" "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz"
+  "version" "13.0.11"
   dependencies:
     "@types/yargs-parser" "*"
 
 "@types/yargs@^15.0.0":
-  version "15.0.8"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.8.tgz#7644904cad7427eb704331ea9bf1ee5499b82e23"
+  "resolved" "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.8.tgz"
+  "version" "15.0.8"
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^4.15.0":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.1.tgz#835f64aa0a403e5e9e64c10ceaf8d05c3f015180"
-  integrity sha512-yW2epMYZSpNJXZy22Biu+fLdTG8Mn6b22kR3TqblVk50HGNV8Zya15WAXuQCr8tKw4Qf1BL4QtI6kv6PCkLoJw==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "4.15.1"
-    "@typescript-eslint/scope-manager" "4.15.1"
-    debug "^4.1.1"
-    functional-red-black-tree "^1.0.1"
-    lodash "^4.17.15"
-    regexpp "^3.0.0"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+"@types/zipcelx@^1.5.0":
+  "resolved" "https://registry.npmjs.org/@types/zipcelx/-/zipcelx-1.5.0.tgz"
+  "version" "1.5.0"
 
-"@typescript-eslint/eslint-plugin@^4.5.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.0.tgz#210cd538bb703f883aff81d3996961f5dba31fdb"
+"@typescript-eslint/eslint-plugin@^4.0.0", "@typescript-eslint/eslint-plugin@^4.5.0":
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.0.tgz"
+  "version" "4.6.0"
   dependencies:
     "@typescript-eslint/experimental-utils" "4.6.0"
     "@typescript-eslint/scope-manager" "4.6.0"
-    debug "^4.1.1"
-    functional-red-black-tree "^1.0.1"
-    regexpp "^3.0.0"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    "debug" "^4.1.1"
+    "functional-red-black-tree" "^1.0.1"
+    "regexpp" "^3.0.0"
+    "semver" "^7.3.2"
+    "tsutils" "^3.17.1"
 
-"@typescript-eslint/experimental-utils@4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.1.tgz#d744d1ac40570a84b447f7aa1b526368afd17eec"
-  integrity sha512-9LQRmOzBRI1iOdJorr4jEnQhadxK4c9R2aEAsm7WE/7dq8wkKD1suaV0S/JucTL8QlYUPU1y2yjqg+aGC0IQBQ==
+"@typescript-eslint/eslint-plugin@^4.15.0":
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.1.tgz"
+  "version" "4.15.1"
   dependencies:
-    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/experimental-utils" "4.15.1"
     "@typescript-eslint/scope-manager" "4.15.1"
-    "@typescript-eslint/types" "4.15.1"
-    "@typescript-eslint/typescript-estree" "4.15.1"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
-
-"@typescript-eslint/experimental-utils@4.6.0", "@typescript-eslint/experimental-utils@^4.0.1":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.0.tgz#f750aef4dd8e5970b5c36084f0a5ca2f0db309a4"
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.6.0"
-    "@typescript-eslint/types" "4.6.0"
-    "@typescript-eslint/typescript-estree" "4.6.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
+    "debug" "^4.1.1"
+    "functional-red-black-tree" "^1.0.1"
+    "lodash" "^4.17.15"
+    "regexpp" "^3.0.0"
+    "semver" "^7.3.2"
+    "tsutils" "^3.17.1"
 
 "@typescript-eslint/experimental-utils@^3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz#e179ffc81a80ebcae2ea04e0332f8b251345a686"
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz"
+  "version" "3.10.1"
   dependencies:
     "@types/json-schema" "^7.0.3"
     "@typescript-eslint/types" "3.10.1"
     "@typescript-eslint/typescript-estree" "3.10.1"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
+    "eslint-scope" "^5.0.0"
+    "eslint-utils" "^2.0.0"
 
-"@typescript-eslint/parser@^4.15.0":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.15.1.tgz#4c91a0602733db63507e1dbf13187d6c71a153c4"
-  integrity sha512-V8eXYxNJ9QmXi5ETDguB7O9diAXlIyS+e3xzLoP/oVE4WCAjssxLIa0mqCLsCGXulYJUfT+GV70Jv1vHsdKwtA==
+"@typescript-eslint/experimental-utils@^4.0.1", "@typescript-eslint/experimental-utils@4.6.0":
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.0.tgz"
+  "version" "4.6.0"
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/scope-manager" "4.6.0"
+    "@typescript-eslint/types" "4.6.0"
+    "@typescript-eslint/typescript-estree" "4.6.0"
+    "eslint-scope" "^5.0.0"
+    "eslint-utils" "^2.0.0"
+
+"@typescript-eslint/experimental-utils@4.15.1":
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.1.tgz"
+  "version" "4.15.1"
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/scope-manager" "4.15.1"
+    "@typescript-eslint/types" "4.15.1"
+    "@typescript-eslint/typescript-estree" "4.15.1"
+    "eslint-scope" "^5.0.0"
+    "eslint-utils" "^2.0.0"
+
+"@typescript-eslint/parser@^4.0.0", "@typescript-eslint/parser@^4.15.0":
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.15.1.tgz"
+  "version" "4.15.1"
   dependencies:
     "@typescript-eslint/scope-manager" "4.15.1"
     "@typescript-eslint/types" "4.15.1"
     "@typescript-eslint/typescript-estree" "4.15.1"
-    debug "^4.1.1"
+    "debug" "^4.1.1"
 
 "@typescript-eslint/parser@^4.5.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.6.0.tgz#7e9ff7df2f21d5c8f65f17add3b99eeeec33199d"
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.6.0.tgz"
+  "version" "4.6.0"
   dependencies:
     "@typescript-eslint/scope-manager" "4.6.0"
     "@typescript-eslint/types" "4.6.0"
     "@typescript-eslint/typescript-estree" "4.6.0"
-    debug "^4.1.1"
+    "debug" "^4.1.1"
 
 "@typescript-eslint/scope-manager@4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.15.1.tgz#f6511eb38def2a8a6be600c530c243bbb56ac135"
-  integrity sha512-ibQrTFcAm7yG4C1iwpIYK7vDnFg+fKaZVfvyOm3sNsGAerKfwPVFtYft5EbjzByDJ4dj1WD8/34REJfw/9wdVA==
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.15.1.tgz"
+  "version" "4.15.1"
   dependencies:
     "@typescript-eslint/types" "4.15.1"
     "@typescript-eslint/visitor-keys" "4.15.1"
 
 "@typescript-eslint/scope-manager@4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.6.0.tgz#b7d8b57fe354047a72dfb31881d9643092838662"
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.6.0.tgz"
+  "version" "4.6.0"
   dependencies:
     "@typescript-eslint/types" "4.6.0"
     "@typescript-eslint/visitor-keys" "4.6.0"
 
 "@typescript-eslint/types@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz"
+  "version" "3.10.1"
 
 "@typescript-eslint/types@4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.15.1.tgz#da702f544ef1afae4bc98da699eaecd49cf31c8c"
-  integrity sha512-iGsaUyWFyLz0mHfXhX4zO6P7O3sExQpBJ2dgXB0G5g/8PRVfBBsmQIc3r83ranEQTALLR3Vko/fnCIVqmH+mPw==
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.15.1.tgz"
+  "version" "4.15.1"
 
 "@typescript-eslint/types@4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.6.0.tgz#157ca925637fd53c193c6bf226a6c02b752dde2f"
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.6.0.tgz"
+  "version" "4.6.0"
 
 "@typescript-eslint/typescript-estree@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz#fd0061cc38add4fad45136d654408569f365b853"
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz"
+  "version" "3.10.1"
   dependencies:
     "@typescript-eslint/types" "3.10.1"
     "@typescript-eslint/visitor-keys" "3.10.1"
-    debug "^4.1.1"
-    glob "^7.1.6"
-    is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    "debug" "^4.1.1"
+    "glob" "^7.1.6"
+    "is-glob" "^4.0.1"
+    "lodash" "^4.17.15"
+    "semver" "^7.3.2"
+    "tsutils" "^3.17.1"
 
 "@typescript-eslint/typescript-estree@4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.1.tgz#fa9a9ff88b4a04d901ddbe5b248bc0a00cd610be"
-  integrity sha512-z8MN3CicTEumrWAEB2e2CcoZa3KP9+SMYLIA2aM49XW3cWIaiVSOAGq30ffR5XHxRirqE90fgLw3e6WmNx5uNw==
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.1.tgz"
+  "version" "4.15.1"
   dependencies:
     "@typescript-eslint/types" "4.15.1"
     "@typescript-eslint/visitor-keys" "4.15.1"
-    debug "^4.1.1"
-    globby "^11.0.1"
-    is-glob "^4.0.1"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    "debug" "^4.1.1"
+    "globby" "^11.0.1"
+    "is-glob" "^4.0.1"
+    "semver" "^7.3.2"
+    "tsutils" "^3.17.1"
 
 "@typescript-eslint/typescript-estree@4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.0.tgz#85bd98dcc8280511cfc5b2ce7b03a9ffa1732b08"
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.0.tgz"
+  "version" "4.6.0"
   dependencies:
     "@typescript-eslint/types" "4.6.0"
     "@typescript-eslint/visitor-keys" "4.6.0"
-    debug "^4.1.1"
-    globby "^11.0.1"
-    is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    "debug" "^4.1.1"
+    "globby" "^11.0.1"
+    "is-glob" "^4.0.1"
+    "lodash" "^4.17.15"
+    "semver" "^7.3.2"
+    "tsutils" "^3.17.1"
 
 "@typescript-eslint/visitor-keys@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz#cd4274773e3eb63b2e870ac602274487ecd1e931"
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz"
+  "version" "3.10.1"
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    "eslint-visitor-keys" "^1.1.0"
 
 "@typescript-eslint/visitor-keys@4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.1.tgz#c76abbf2a3be8a70ed760f0e5756bf62de5865dd"
-  integrity sha512-tYzaTP9plooRJY8eNlpAewTOqtWW/4ff/5wBjNVaJ0S0wC4Gpq/zDVRTJa5bq2v1pCNQ08xxMCndcvR+h7lMww==
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.1.tgz"
+  "version" "4.15.1"
   dependencies:
     "@typescript-eslint/types" "4.15.1"
-    eslint-visitor-keys "^2.0.0"
+    "eslint-visitor-keys" "^2.0.0"
 
 "@typescript-eslint/visitor-keys@4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.0.tgz#fb05d6393891b0a089b243fc8f9fb8039383d5da"
+  "resolved" "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.0.tgz"
+  "version" "4.6.0"
   dependencies:
     "@typescript-eslint/types" "4.6.0"
-    eslint-visitor-keys "^2.0.0"
+    "eslint-visitor-keys" "^2.0.0"
 
 "@uppy/companion-client@^1.8.1":
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/@uppy/companion-client/-/companion-client-1.8.1.tgz#e8796ac5d2219663da1ef46367efd9cbcf629b17"
+  "resolved" "https://registry.npmjs.org/@uppy/companion-client/-/companion-client-1.8.1.tgz"
+  "version" "1.8.1"
   dependencies:
     "@uppy/utils" "^3.4.0"
-    namespace-emitter "^2.0.1"
-    qs-stringify "^1.1.0"
+    "namespace-emitter" "^2.0.1"
+    "qs-stringify" "^1.1.0"
 
-"@uppy/core@^1.16.0":
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/@uppy/core/-/core-1.16.0.tgz#a5058e4adb1c7e3d7b52d260eef48fe7283294d7"
+"@uppy/core@^1.0.0", "@uppy/core@^1.16.0":
+  "resolved" "https://registry.npmjs.org/@uppy/core/-/core-1.16.0.tgz"
+  "version" "1.16.0"
   dependencies:
     "@transloadit/prettier-bytes" "0.0.7"
     "@uppy/store-default" "^1.2.5"
     "@uppy/utils" "^3.4.0"
-    cuid "^2.1.1"
-    lodash.throttle "^4.1.1"
-    mime-match "^1.0.2"
-    namespace-emitter "^2.0.1"
-    preact "8.2.9"
+    "cuid" "^2.1.1"
+    "lodash.throttle" "^4.1.1"
+    "mime-match" "^1.0.2"
+    "namespace-emitter" "^2.0.1"
+    "preact" "8.2.9"
 
 "@uppy/dashboard@^1.16.0":
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/@uppy/dashboard/-/dashboard-1.16.0.tgz#5489dedae26cf4980894de3dd5147a5f62073343"
+  "resolved" "https://registry.npmjs.org/@uppy/dashboard/-/dashboard-1.16.0.tgz"
+  "version" "1.16.0"
   dependencies:
     "@transloadit/prettier-bytes" "0.0.7"
     "@uppy/informer" "^1.6.0"
@@ -4290,72 +4439,80 @@
     "@uppy/status-bar" "^1.9.0"
     "@uppy/thumbnail-generator" "^1.7.5"
     "@uppy/utils" "^3.4.0"
-    classnames "^2.2.6"
-    cuid "^2.1.1"
-    is-shallow-equal "^1.0.1"
-    lodash.debounce "^4.0.8"
-    lodash.throttle "^4.1.1"
-    memoize-one "^5.0.4"
-    preact "8.2.9"
-    resize-observer-polyfill "^1.5.0"
+    "classnames" "^2.2.6"
+    "cuid" "^2.1.1"
+    "is-shallow-equal" "^1.0.1"
+    "lodash.debounce" "^4.0.8"
+    "lodash.throttle" "^4.1.1"
+    "memoize-one" "^5.0.4"
+    "preact" "8.2.9"
+    "resize-observer-polyfill" "^1.5.0"
 
 "@uppy/drag-drop@^1.4.24":
-  version "1.4.24"
-  resolved "https://registry.yarnpkg.com/@uppy/drag-drop/-/drag-drop-1.4.24.tgz#02ee9df001a1074f45ddaeb93fc84f7f7c05d82f"
+  "resolved" "https://registry.npmjs.org/@uppy/drag-drop/-/drag-drop-1.4.24.tgz"
+  "version" "1.4.24"
   dependencies:
     "@uppy/utils" "^3.4.0"
-    preact "8.2.9"
+    "preact" "8.2.9"
 
 "@uppy/file-input@^1.4.22":
-  version "1.4.22"
-  resolved "https://registry.yarnpkg.com/@uppy/file-input/-/file-input-1.4.22.tgz#e8642542ceedce71a11494f08d41a5144605f814"
+  "resolved" "https://registry.npmjs.org/@uppy/file-input/-/file-input-1.4.22.tgz"
+  "version" "1.4.22"
   dependencies:
     "@uppy/utils" "^3.4.0"
-    preact "8.2.9"
+    "preact" "8.2.9"
 
 "@uppy/google-drive@^1.5.22":
-  version "1.5.22"
-  resolved "https://registry.yarnpkg.com/@uppy/google-drive/-/google-drive-1.5.22.tgz#d185e8da86ba2a42d1198544401a60c9092e4025"
+  "resolved" "https://registry.npmjs.org/@uppy/google-drive/-/google-drive-1.5.22.tgz"
+  "version" "1.5.22"
   dependencies:
     "@uppy/companion-client" "^1.8.1"
     "@uppy/provider-views" "^1.11.0"
     "@uppy/utils" "^3.4.0"
-    preact "8.2.9"
+    "preact" "8.2.9"
+
+"@uppy/image-editor@^0.2.4":
+  "resolved" "https://registry.npmjs.org/@uppy/image-editor/-/image-editor-0.2.4.tgz"
+  "version" "0.2.4"
+  dependencies:
+    "@uppy/utils" "^3.5.0"
+    "cropperjs" "1.5.7"
+    "preact" "8.2.9"
 
 "@uppy/informer@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@uppy/informer/-/informer-1.6.0.tgz#65e90c1f258c8fc54c71dcbf4a8d0c485400fc8e"
+  "resolved" "https://registry.npmjs.org/@uppy/informer/-/informer-1.6.0.tgz"
+  "version" "1.6.0"
   dependencies:
     "@uppy/utils" "^3.4.0"
-    preact "8.2.9"
+    "preact" "8.2.9"
 
 "@uppy/onedrive@^1.1.22":
-  version "1.1.22"
-  resolved "https://registry.yarnpkg.com/@uppy/onedrive/-/onedrive-1.1.22.tgz#16e983f299cd1afc12c5c8b7e6551417ebff20f8"
+  "resolved" "https://registry.npmjs.org/@uppy/onedrive/-/onedrive-1.1.22.tgz"
+  "version" "1.1.22"
   dependencies:
     "@uppy/companion-client" "^1.8.1"
     "@uppy/provider-views" "^1.11.0"
     "@uppy/utils" "^3.4.0"
-    preact "8.2.9"
+    "preact" "8.2.9"
 
 "@uppy/progress-bar@^1.3.24":
-  version "1.3.24"
-  resolved "https://registry.yarnpkg.com/@uppy/progress-bar/-/progress-bar-1.3.24.tgz#a4fa3ca88931b6333a1583ee9a2670f591206dca"
+  "resolved" "https://registry.npmjs.org/@uppy/progress-bar/-/progress-bar-1.3.24.tgz"
+  "version" "1.3.24"
   dependencies:
     "@uppy/utils" "^3.4.0"
-    preact "8.2.9"
+    "preact" "8.2.9"
 
 "@uppy/provider-views@^1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@uppy/provider-views/-/provider-views-1.11.0.tgz#efd6db4d77a539ad092f4b178a3480701bbc9f7e"
+  "resolved" "https://registry.npmjs.org/@uppy/provider-views/-/provider-views-1.11.0.tgz"
+  "version" "1.11.0"
   dependencies:
     "@uppy/utils" "^3.4.0"
-    classnames "^2.2.6"
-    preact "8.2.9"
+    "classnames" "^2.2.6"
+    "preact" "8.2.9"
 
 "@uppy/react@^1.11.2":
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/@uppy/react/-/react-1.11.2.tgz#9d1a1a4c0710e456654cdb4dc17735501036a54a"
+  "resolved" "https://registry.npmjs.org/@uppy/react/-/react-1.11.2.tgz"
+  "version" "1.11.2"
   dependencies:
     "@uppy/dashboard" "^1.16.0"
     "@uppy/drag-drop" "^1.4.24"
@@ -4363,72 +4520,89 @@
     "@uppy/progress-bar" "^1.3.24"
     "@uppy/status-bar" "^1.9.0"
     "@uppy/utils" "^3.4.0"
-    prop-types "^15.6.1"
+    "prop-types" "^15.6.1"
 
 "@uppy/status-bar@^1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@uppy/status-bar/-/status-bar-1.9.0.tgz#1db2859fd10b1dc7eb6045dbeb56bb3b4cbcb518"
+  "resolved" "https://registry.npmjs.org/@uppy/status-bar/-/status-bar-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@transloadit/prettier-bytes" "0.0.7"
     "@uppy/utils" "^3.4.0"
-    classnames "^2.2.6"
-    lodash.throttle "^4.1.1"
-    preact "8.2.9"
+    "classnames" "^2.2.6"
+    "lodash.throttle" "^4.1.1"
+    "preact" "8.2.9"
 
 "@uppy/store-default@^1.2.5":
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-1.2.5.tgz#52936331d6ac4911197d256d13974d5bae93b3a6"
+  "resolved" "https://registry.npmjs.org/@uppy/store-default/-/store-default-1.2.5.tgz"
+  "version" "1.2.5"
 
 "@uppy/thumbnail-generator@^1.7.5":
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/@uppy/thumbnail-generator/-/thumbnail-generator-1.7.5.tgz#ae2fa68c684463b41fa7b4a878c4e29974680c6f"
+  "resolved" "https://registry.npmjs.org/@uppy/thumbnail-generator/-/thumbnail-generator-1.7.5.tgz"
+  "version" "1.7.5"
   dependencies:
     "@uppy/utils" "^3.4.0"
-    exifr "^6.0.0"
-    math-log2 "^1.0.1"
+    "exifr" "^6.0.0"
+    "math-log2" "^1.0.1"
 
 "@uppy/url@^1.5.16":
-  version "1.5.16"
-  resolved "https://registry.yarnpkg.com/@uppy/url/-/url-1.5.16.tgz#636830aa01b13a3726abfe87c2e66006412ba867"
+  "resolved" "https://registry.npmjs.org/@uppy/url/-/url-1.5.16.tgz"
+  "version" "1.5.16"
   dependencies:
     "@uppy/companion-client" "^1.8.1"
     "@uppy/utils" "^3.4.0"
-    preact "8.2.9"
+    "preact" "8.2.9"
 
 "@uppy/utils@^3.4.0":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-3.4.0.tgz#4afcf8c26dec13ee54676bd1f7958fc1063b68df"
+  "resolved" "https://registry.npmjs.org/@uppy/utils/-/utils-3.4.0.tgz"
+  "version" "3.4.0"
   dependencies:
-    abortcontroller-polyfill "^1.4.0"
-    lodash.throttle "^4.1.1"
+    "abortcontroller-polyfill" "^1.4.0"
+    "lodash.throttle" "^4.1.1"
+
+"@uppy/utils@^3.5.0":
+  "resolved" "https://registry.npmjs.org/@uppy/utils/-/utils-3.5.0.tgz"
+  "version" "3.5.0"
+  dependencies:
+    "abortcontroller-polyfill" "^1.4.0"
+    "lodash.throttle" "^4.1.1"
 
 "@uppy/webcam@^1.8.4":
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/@uppy/webcam/-/webcam-1.8.4.tgz#7a4f7f9dc4def955e701560a59c22fdb08e5efe4"
+  "resolved" "https://registry.npmjs.org/@uppy/webcam/-/webcam-1.8.4.tgz"
+  "version" "1.8.4"
   dependencies:
     "@uppy/utils" "^3.4.0"
-    preact "8.2.9"
+    "preact" "8.2.9"
+
+"@virtuoso.dev/react-urx@^0.2.5":
+  "resolved" "https://registry.npmjs.org/@virtuoso.dev/react-urx/-/react-urx-0.2.6.tgz"
+  "version" "0.2.6"
+  dependencies:
+    "@virtuoso.dev/urx" "^0.2.6"
+
+"@virtuoso.dev/urx@^0.2.5", "@virtuoso.dev/urx@^0.2.6":
+  "resolved" "https://registry.npmjs.org/@virtuoso.dev/urx/-/urx-0.2.6.tgz"
+  "version" "0.2.6"
 
 "@vue/compiler-core@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0.tgz#25e4f079cf6c39f83bad23700f814c619105a0f2"
+  "resolved" "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
     "@babel/parser" "^7.11.5"
     "@babel/types" "^7.11.5"
     "@vue/shared" "3.0.0"
-    estree-walker "^2.0.1"
-    source-map "^0.6.1"
+    "estree-walker" "^2.0.1"
+    "source-map" "^0.6.1"
 
-"@vue/compiler-dom@3.0.0", "@vue/compiler-dom@^3.0.0-rc.6":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0.tgz#4cbb48fcf1f852daef2babcf9953b681ac463526"
+"@vue/compiler-dom@^3.0.0-rc.6", "@vue/compiler-dom@3.0.0":
+  "resolved" "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
     "@vue/compiler-core" "3.0.0"
     "@vue/shared" "3.0.0"
 
 "@vue/compiler-sfc@^3.0.0-rc.6":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0.tgz#efa38037984bd64aae315828aa5c1248c6eadca9"
+  "resolved" "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
     "@babel/parser" "^7.11.5"
     "@babel/types" "^7.11.5"
@@ -4436,71 +4610,71 @@
     "@vue/compiler-dom" "3.0.0"
     "@vue/compiler-ssr" "3.0.0"
     "@vue/shared" "3.0.0"
-    consolidate "^0.16.0"
-    estree-walker "^2.0.1"
-    hash-sum "^2.0.0"
-    lru-cache "^5.1.1"
-    magic-string "^0.25.7"
-    merge-source-map "^1.1.0"
-    postcss "^7.0.32"
-    postcss-modules "^3.2.2"
-    postcss-selector-parser "^6.0.2"
-    source-map "^0.6.1"
+    "consolidate" "^0.16.0"
+    "estree-walker" "^2.0.1"
+    "hash-sum" "^2.0.0"
+    "lru-cache" "^5.1.1"
+    "magic-string" "^0.25.7"
+    "merge-source-map" "^1.1.0"
+    "postcss" "^7.0.32"
+    "postcss-modules" "^3.2.2"
+    "postcss-selector-parser" "^6.0.2"
+    "source-map" "^0.6.1"
 
 "@vue/compiler-ssr@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0.tgz#d717abcd23a89fb38d1497228633a21bcf9a0e28"
+  "resolved" "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
     "@vue/compiler-dom" "3.0.0"
     "@vue/shared" "3.0.0"
 
 "@vue/shared@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0.tgz#ec089236629ecc0f10346b92f101ff4339169f1a"
+  "resolved" "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0.tgz"
+  "version" "3.0.0"
 
 "@webassemblyjs/ast@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@webassemblyjs/helper-module-context" "1.9.0"
     "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
     "@webassemblyjs/wast-parser" "1.9.0"
 
 "@webassemblyjs/floating-point-hex-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"
+  "version" "1.9.0"
 
 "@webassemblyjs/helper-api-error@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"
+  "version" "1.9.0"
 
 "@webassemblyjs/helper-buffer@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"
+  "version" "1.9.0"
 
 "@webassemblyjs/helper-code-frame@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@webassemblyjs/wast-printer" "1.9.0"
 
 "@webassemblyjs/helper-fsm@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"
+  "version" "1.9.0"
 
 "@webassemblyjs/helper-module-context@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
 
 "@webassemblyjs/helper-wasm-bytecode@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"
+  "version" "1.9.0"
 
 "@webassemblyjs/helper-wasm-section@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-buffer" "1.9.0"
@@ -4508,24 +4682,24 @@
     "@webassemblyjs/wasm-gen" "1.9.0"
 
 "@webassemblyjs/ieee754@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
 "@webassemblyjs/leb128@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@xtuc/long" "4.2.2"
 
 "@webassemblyjs/utf8@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"
+  "version" "1.9.0"
 
 "@webassemblyjs/wasm-edit@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-buffer" "1.9.0"
@@ -4537,8 +4711,8 @@
     "@webassemblyjs/wast-printer" "1.9.0"
 
 "@webassemblyjs/wasm-gen@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
@@ -4547,8 +4721,8 @@
     "@webassemblyjs/utf8" "1.9.0"
 
 "@webassemblyjs/wasm-opt@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-buffer" "1.9.0"
@@ -4556,8 +4730,8 @@
     "@webassemblyjs/wasm-parser" "1.9.0"
 
 "@webassemblyjs/wasm-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-api-error" "1.9.0"
@@ -4567,8 +4741,8 @@
     "@webassemblyjs/utf8" "1.9.0"
 
 "@webassemblyjs/wast-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/floating-point-hex-parser" "1.9.0"
@@ -4578,160 +4752,164 @@
     "@xtuc/long" "4.2.2"
 
 "@webassemblyjs/wast-printer@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
 "@webpack-contrib/schema-utils@^1.0.0-beta.0":
-  version "1.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/@webpack-contrib/schema-utils/-/schema-utils-1.0.0-beta.0.tgz#bf9638c9464d177b48209e84209e23bee2eb4f65"
+  "resolved" "https://registry.npmjs.org/@webpack-contrib/schema-utils/-/schema-utils-1.0.0-beta.0.tgz"
+  "version" "1.0.0-beta.0"
   dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-    chalk "^2.3.2"
-    strip-ansi "^4.0.0"
-    text-table "^0.2.0"
-    webpack-log "^1.1.2"
+    "ajv" "^6.1.0"
+    "ajv-keywords" "^3.1.0"
+    "chalk" "^2.3.2"
+    "strip-ansi" "^4.0.0"
+    "text-table" "^0.2.0"
+    "webpack-log" "^1.1.2"
 
 "@welldone-software/why-did-you-render@^4.2.5":
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/@welldone-software/why-did-you-render/-/why-did-you-render-4.3.2.tgz#db1c700df1729402f2ceacf05cebd72dca30f1af"
+  "resolved" "https://registry.npmjs.org/@welldone-software/why-did-you-render/-/why-did-you-render-4.3.2.tgz"
+  "version" "4.3.2"
   dependencies:
-    lodash "^4"
+    "lodash" "^4"
 
 "@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  "resolved" "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"
+  "version" "1.2.0"
 
 "@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  "resolved" "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
+  "version" "4.2.2"
 
-abab@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+"@yarnpkg/lockfile@^1.1.0":
+  "resolved" "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz"
+  "version" "1.1.0"
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+"abab@^2.0.3":
+  "resolved" "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"
+  "version" "2.0.5"
 
-abortcontroller-polyfill@^1.4.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.1.tgz#27084bac87d78a7224c8ee78135d05df430c2d2f"
+"abbrev@1":
+  "resolved" "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
+  "version" "1.1.1"
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+"abortcontroller-polyfill@^1.4.0":
+  "resolved" "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.1.tgz"
+  "version" "1.7.1"
+
+"accepts@~1.3.4", "accepts@~1.3.5", "accepts@~1.3.7":
+  "resolved" "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"
+  "version" "1.3.7"
   dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
+    "mime-types" "~2.1.24"
+    "negotiator" "0.6.2"
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
+"acorn-globals@^6.0.0":
+  "resolved" "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
+    "acorn" "^7.1.1"
+    "acorn-walk" "^7.1.1"
 
-acorn-jsx@^5.1.0, acorn-jsx@^5.2.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+"acorn-jsx@^5.1.0", "acorn-jsx@^5.2.0":
+  "resolved" "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"
+  "version" "5.3.1"
 
-acorn-walk@^7.0.0, acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+"acorn-walk@^7.0.0", "acorn-walk@^7.1.1":
+  "resolved" "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"
+  "version" "7.2.0"
 
-acorn@^4.0.9:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+"acorn@^4.0.9":
+  "resolved" "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"
+  "version" "4.0.13"
 
-acorn@^6.4.1:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^7.1.0", "acorn@^7.1.1", "acorn@^7.4.0":
+  "resolved" "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
+  "version" "7.4.1"
 
-acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+"acorn@^6.4.1":
+  "resolved" "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz"
+  "version" "6.4.2"
 
-add-px-to-style@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/add-px-to-style/-/add-px-to-style-1.0.0.tgz#d0c135441fa8014a8137904531096f67f28f263a"
+"add-px-to-style@1.0.0":
+  "resolved" "https://registry.npmjs.org/add-px-to-style/-/add-px-to-style-1.0.0.tgz"
+  "version" "1.0.0"
 
-address@1.1.2, address@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
+"address@^1.0.1", "address@1.1.2":
+  "resolved" "https://registry.npmjs.org/address/-/address-1.1.2.tgz"
+  "version" "1.1.2"
 
-adjust-sourcemap-loader@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz#5ae12fb5b7b1c585e80bbb5a63ec163a1a45e61e"
+"adjust-sourcemap-loader@3.0.0":
+  "resolved" "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    loader-utils "^2.0.0"
-    regex-parser "^2.2.11"
+    "loader-utils" "^2.0.0"
+    "regex-parser" "^2.2.11"
 
-agent-base@6:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.1.tgz#808007e4e5867decb0ab6ab2f928fbdb5a596db4"
+"agent-base@6":
+  "resolved" "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz"
+  "version" "6.0.1"
   dependencies:
-    debug "4"
+    "debug" "4"
 
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+"aggregate-error@^3.0.0":
+  "resolved" "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
+    "clean-stack" "^2.0.0"
+    "indent-string" "^4.0.0"
 
-airbnb-js-shims@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-2.2.1.tgz#db481102d682b98ed1daa4c5baa697a05ce5c040"
+"airbnb-js-shims@^2.2.1":
+  "resolved" "https://registry.npmjs.org/airbnb-js-shims/-/airbnb-js-shims-2.2.1.tgz"
+  "version" "2.2.1"
   dependencies:
-    array-includes "^3.0.3"
-    array.prototype.flat "^1.2.1"
-    array.prototype.flatmap "^1.2.1"
-    es5-shim "^4.5.13"
-    es6-shim "^0.35.5"
-    function.prototype.name "^1.1.0"
-    globalthis "^1.0.0"
-    object.entries "^1.1.0"
-    object.fromentries "^2.0.0 || ^1.0.0"
-    object.getownpropertydescriptors "^2.0.3"
-    object.values "^1.1.0"
-    promise.allsettled "^1.0.0"
-    promise.prototype.finally "^3.1.0"
-    string.prototype.matchall "^4.0.0 || ^3.0.1"
-    string.prototype.padend "^3.0.0"
-    string.prototype.padstart "^3.0.0"
-    symbol.prototype.description "^1.0.0"
+    "array-includes" "^3.0.3"
+    "array.prototype.flat" "^1.2.1"
+    "array.prototype.flatmap" "^1.2.1"
+    "es5-shim" "^4.5.13"
+    "es6-shim" "^0.35.5"
+    "function.prototype.name" "^1.1.0"
+    "globalthis" "^1.0.0"
+    "object.entries" "^1.1.0"
+    "object.fromentries" "^2.0.0 || ^1.0.0"
+    "object.getownpropertydescriptors" "^2.0.3"
+    "object.values" "^1.1.0"
+    "promise.allsettled" "^1.0.0"
+    "promise.prototype.finally" "^3.1.0"
+    "string.prototype.matchall" "^4.0.0 || ^3.0.1"
+    "string.prototype.padend" "^3.0.0"
+    "string.prototype.padstart" "^3.0.0"
+    "symbol.prototype.description" "^1.0.0"
 
-ajv-errors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+"ajv-errors@^1.0.0":
+  "resolved" "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz"
+  "version" "1.0.1"
 
-ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+"ajv-keywords@^3.1.0", "ajv-keywords@^3.4.1", "ajv-keywords@^3.5.2":
+  "resolved" "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
+  "version" "3.5.2"
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+"ajv@^6.1.0", "ajv@^6.10.0", "ajv@^6.10.2", "ajv@^6.12.3", "ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.9.1", "ajv@>=5.0.0":
+  "resolved" "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
+  "version" "6.12.6"
   dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
+    "fast-deep-equal" "^3.1.1"
+    "fast-json-stable-stringify" "^2.0.0"
+    "json-schema-traverse" "^0.4.1"
+    "uri-js" "^4.2.2"
 
-algoliasearch-helper@^3.1.0, algoliasearch-helper@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.2.2.tgz#12451c8e368935348453c8879785b20e1788c33c"
+"algoliasearch-helper@^3.1.0", "algoliasearch-helper@^3.2.2":
+  "resolved" "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.2.2.tgz"
+  "version" "3.2.2"
   dependencies:
-    events "^1.1.1"
+    "events" "^1.1.1"
 
-algoliasearch@^4.2.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.5.1.tgz#fd20cd76f6ba3fbecdd4e11bdaefefb44abc0b38"
+"algoliasearch@^4.2.0", "algoliasearch@>= 3.1 < 5":
+  "resolved" "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.5.1.tgz"
+  "version" "4.5.1"
   dependencies:
     "@algolia/cache-browser-local-storage" "4.5.1"
     "@algolia/cache-common" "4.5.1"
@@ -4748,668 +4926,685 @@ algoliasearch@^4.2.0:
     "@algolia/requester-node-http" "4.5.1"
     "@algolia/transporter" "4.5.1"
 
-alphanum-sort@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+"alphanum-sort@^1.0.0":
+  "resolved" "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"
+  "version" "1.0.2"
 
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+"amdefine@>=0.0.4":
+  "resolved" "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"
+  "version" "1.0.1"
 
-ansi-align@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
+"ansi-align@^3.0.0":
+  "resolved" "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    string-width "^3.0.0"
+    "string-width" "^3.0.0"
 
-ansi-colors@3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
+"ansi-colors@^3.0.0":
+  "resolved" "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz"
+  "version" "3.2.4"
 
-ansi-colors@^3.0.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+"ansi-colors@^4.1.1":
+  "resolved" "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"
+  "version" "4.1.1"
 
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+"ansi-colors@3.2.3":
+  "resolved" "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"
+  "version" "3.2.3"
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+"ansi-escapes@^3.0.0":
+  "resolved" "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"
+  "version" "3.2.0"
 
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+"ansi-escapes@^3.2.0":
+  "resolved" "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"
+  "version" "3.2.0"
+
+"ansi-escapes@^4.2.1", "ansi-escapes@^4.3.1":
+  "resolved" "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz"
+  "version" "4.3.1"
   dependencies:
-    type-fest "^0.11.0"
+    "type-fest" "^0.11.0"
 
-ansi-html@0.0.7, ansi-html@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+"ansi-html@^0.0.7", "ansi-html@0.0.7":
+  "resolved" "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz"
+  "version" "0.0.7"
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+"ansi-regex@^2.0.0":
+  "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+  "version" "2.1.1"
 
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+"ansi-regex@^3.0.0":
+  "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"
+  "version" "3.0.0"
 
-ansi-regex@^4.0.0, ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+"ansi-regex@^4.0.0":
+  "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"
+  "version" "4.1.0"
 
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+"ansi-regex@^4.1.0":
+  "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"
+  "version" "4.1.0"
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+"ansi-regex@^5.0.0":
+  "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"
+  "version" "5.0.0"
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+"ansi-styles@^2.2.1":
+  "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
+  "version" "2.2.1"
+
+"ansi-styles@^3.2.0", "ansi-styles@^3.2.1":
+  "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  "version" "3.2.1"
   dependencies:
-    color-convert "^1.9.0"
+    "color-convert" "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+"ansi-styles@^4.0.0", "ansi-styles@^4.1.0":
+  "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  "version" "4.3.0"
   dependencies:
-    color-convert "^2.0.1"
+    "color-convert" "^2.0.1"
 
-ansi-to-html@^0.6.11:
-  version "0.6.14"
-  resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.14.tgz#65fe6d08bba5dd9db33f44a20aec331e0010dad8"
+"ansi-to-html@^0.6.11":
+  "resolved" "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.14.tgz"
+  "version" "0.6.14"
   dependencies:
-    entities "^1.1.2"
+    "entities" "^1.1.2"
 
-any-observable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
+"any-observable@^0.3.0":
+  "resolved" "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz"
+  "version" "0.3.0"
 
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+"anymatch@^2.0.0":
+  "resolved" "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
+    "micromatch" "^3.1.4"
+    "normalize-path" "^2.1.1"
 
-anymatch@^3.0.3, anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+"anymatch@^3.0.3", "anymatch@~3.1.1":
+  "resolved" "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"
+  "version" "3.1.1"
   dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
+    "normalize-path" "^3.0.0"
+    "picomatch" "^2.0.4"
 
-app-root-dir@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/app-root-dir/-/app-root-dir-1.0.2.tgz#38187ec2dea7577fff033ffcb12172692ff6e118"
+"app-root-dir@^1.0.2":
+  "resolved" "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz"
+  "version" "1.0.2"
 
-aproba@^1.0.3, aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+"aproba@^1.0.3", "aproba@^1.1.1":
+  "resolved" "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"
+  "version" "1.2.0"
 
-arch@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.2.tgz#0c52bbe7344bb4fa260c443d2cbad9c00ff2f0bf"
+"arch@^2.1.2":
+  "resolved" "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz"
+  "version" "2.1.2"
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+"are-we-there-yet@~1.1.2":
+  "resolved" "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"
+  "version" "1.1.5"
   dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
+    "delegates" "^1.0.0"
+    "readable-stream" "^2.0.6"
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+"argparse@^1.0.7":
+  "resolved" "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
+  "version" "1.0.10"
   dependencies:
-    sprintf-js "~1.0.2"
+    "sprintf-js" "~1.0.2"
 
-aria-query@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
+"aria-query@^4.2.2":
+  "resolved" "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz"
+  "version" "4.2.2"
   dependencies:
     "@babel/runtime" "^7.10.2"
     "@babel/runtime-corejs3" "^7.10.2"
 
-arity-n@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/arity-n/-/arity-n-1.0.4.tgz#d9e76b11733e08569c0847ae7b39b2860b30b745"
+"arity-n@^1.0.4":
+  "resolved" "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz"
+  "version" "1.0.4"
 
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+"arr-diff@^4.0.0":
+  "resolved" "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"
+  "version" "4.0.0"
 
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+"arr-flatten@^1.1.0":
+  "resolved" "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"
+  "version" "1.1.0"
 
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+"arr-union@^3.1.0":
+  "resolved" "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"
+  "version" "3.1.0"
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+"array-flatten@^2.1.0":
+  "resolved" "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"
+  "version" "2.1.2"
 
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+"array-flatten@1.1.1":
+  "resolved" "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
+  "version" "1.1.1"
 
-array-flatten@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
-
-array-includes@^3.0.3, array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
+"array-includes@^3.0.3", "array-includes@^3.1.1":
+  "resolved" "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz"
+  "version" "3.1.1"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    is-string "^1.0.5"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0"
+    "is-string" "^1.0.5"
 
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+"array-union@^1.0.1":
+  "resolved" "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    array-uniq "^1.0.1"
+    "array-uniq" "^1.0.1"
 
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+"array-union@^2.1.0":
+  "resolved" "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
+  "version" "2.1.0"
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+"array-uniq@^1.0.1":
+  "resolved" "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"
+  "version" "1.0.3"
 
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+"array-unique@^0.3.2":
+  "resolved" "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"
+  "version" "0.3.2"
 
-array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
+"array.prototype.flat@^1.2.1", "array.prototype.flat@^1.2.3":
+  "resolved" "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"
+  "version" "1.2.3"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
 
-array.prototype.flatmap@^1.2.1, array.prototype.flatmap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz#1c13f84a178566042dd63de4414440db9222e443"
+"array.prototype.flatmap@^1.2.1", "array.prototype.flatmap@^1.2.3":
+  "resolved" "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"
+  "version" "1.2.3"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
+    "function-bind" "^1.1.1"
 
-array.prototype.map@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.2.tgz#9a4159f416458a23e9483078de1106b2ef68f8ec"
+"array.prototype.map@^1.0.1":
+  "resolved" "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    es-array-method-boxes-properly "^1.0.0"
-    is-string "^1.0.4"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
+    "es-array-method-boxes-properly" "^1.0.0"
+    "is-string" "^1.0.4"
 
-arrify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+"arrify@^1.0.1":
+  "resolved" "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
+  "version" "1.0.1"
 
-arrify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+"arrify@^2.0.1":
+  "resolved" "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"
+  "version" "2.0.1"
 
-asap@^2.0.6, asap@~2.0.3, asap@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+"asap@^2.0.6", "asap@~2.0.3", "asap@~2.0.6":
+  "resolved" "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"
+  "version" "2.0.6"
 
-asn1.js@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+"asn1.js@^5.2.0":
+  "resolved" "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"
+  "version" "5.4.1"
   dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    safer-buffer "^2.1.0"
+    "bn.js" "^4.0.0"
+    "inherits" "^2.0.1"
+    "minimalistic-assert" "^1.0.0"
+    "safer-buffer" "^2.1.0"
 
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+"asn1@~0.2.3":
+  "resolved" "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"
+  "version" "0.2.4"
   dependencies:
-    safer-buffer "~2.1.0"
+    "safer-buffer" "~2.1.0"
 
-assert-never@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+"assert-never@^1.2.1":
+  "resolved" "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz"
+  "version" "1.2.1"
 
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+"assert-plus@^1.0.0", "assert-plus@1.0.0":
+  "resolved" "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+  "version" "1.0.0"
 
-assert@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+"assert@^1.1.1":
+  "resolved" "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"
+  "version" "1.5.0"
   dependencies:
-    object-assign "^4.1.1"
-    util "0.10.3"
+    "object-assign" "^4.1.1"
+    "util" "0.10.3"
 
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+"assign-symbols@^1.0.0":
+  "resolved" "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"
+  "version" "1.0.0"
 
-ast-types-flow@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+"ast-types-flow@^0.0.7":
+  "resolved" "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"
+  "version" "0.0.7"
 
-ast-types@0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
-
-ast-types@^0.13.2:
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782"
+"ast-types@^0.13.2":
+  "resolved" "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz"
+  "version" "0.13.4"
   dependencies:
-    tslib "^2.0.1"
+    "tslib" "^2.0.1"
 
-ast-types@^0.14.2:
-  version "0.14.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
+"ast-types@^0.14.2":
+  "resolved" "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz"
+  "version" "0.14.2"
   dependencies:
-    tslib "^2.0.1"
+    "tslib" "^2.0.1"
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+"ast-types@0.13.3":
+  "resolved" "https://registry.npmjs.org/ast-types/-/ast-types-0.13.3.tgz"
+  "version" "0.13.3"
 
-async-each@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+"astral-regex@^1.0.0":
+  "resolved" "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"
+  "version" "1.0.0"
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+"async-each@^1.0.1":
+  "resolved" "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"
+  "version" "1.0.3"
 
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+"async-foreach@^0.1.3":
+  "resolved" "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"
+  "version" "0.1.3"
 
-async@0.9.x:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+"async-limiter@~1.0.0":
+  "resolved" "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"
+  "version" "1.0.1"
 
-async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+"async@^2.6.2":
+  "resolved" "https://registry.npmjs.org/async/-/async-2.6.3.tgz"
+  "version" "2.6.3"
   dependencies:
-    lodash "^4.17.14"
+    "lodash" "^4.17.14"
 
-async@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+"async@^3.2.0":
+  "resolved" "https://registry.npmjs.org/async/-/async-3.2.0.tgz"
+  "version" "3.2.0"
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+"async@0.9.x":
+  "resolved" "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+  "version" "0.9.2"
 
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+"asynckit@^0.4.0":
+  "resolved" "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+  "version" "0.4.0"
 
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+"at-least-node@^1.0.0":
+  "resolved" "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"
+  "version" "1.0.0"
 
-autoprefixer@^9.6.1, autoprefixer@^9.7.2:
-  version "9.8.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
+"atob@^2.1.2":
+  "resolved" "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"
+  "version" "2.1.2"
+
+"autoprefixer@^9.6.1", "autoprefixer@^9.7.2":
+  "resolved" "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz"
+  "version" "9.8.6"
   dependencies:
-    browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001109"
-    colorette "^1.2.1"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.32"
-    postcss-value-parser "^4.1.0"
+    "browserslist" "^4.12.0"
+    "caniuse-lite" "^1.0.30001109"
+    "colorette" "^1.2.1"
+    "normalize-range" "^0.1.2"
+    "num2fraction" "^1.2.2"
+    "postcss" "^7.0.32"
+    "postcss-value-parser" "^4.1.0"
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+"aws-sign2@~0.7.0":
+  "resolved" "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
+  "version" "0.7.0"
 
-aws4@^1.8.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
+"aws4@^1.8.0":
+  "resolved" "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz"
+  "version" "1.10.1"
 
-axe-core@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.0.2.tgz#c7cf7378378a51fcd272d3c09668002a4990b1cb"
+"axe-core@^4.0.2":
+  "resolved" "https://registry.npmjs.org/axe-core/-/axe-core-4.0.2.tgz"
+  "version" "4.0.2"
 
-axios@^0.21.1:
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+"axios@^0.21.1":
+  "resolved" "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"
+  "version" "0.21.1"
   dependencies:
-    follow-redirects "^1.10.0"
+    "follow-redirects" "^1.10.0"
 
-axobject-query@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
+"axobject-query@^2.2.0":
+  "resolved" "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz"
+  "version" "2.2.0"
 
-babel-code-frame@^6.22.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+"babel-code-frame@^6.22.0":
+  "resolved" "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"
+  "version" "6.26.0"
   dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
+    "chalk" "^1.1.3"
+    "esutils" "^2.0.2"
+    "js-tokens" "^3.0.2"
 
-babel-core@^7.0.0-bridge.0:
-  version "7.0.0-bridge.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
+"babel-core@^7.0.0-bridge.0":
+  "resolved" "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz"
+  "version" "7.0.0-bridge.0"
 
-babel-eslint@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
+"babel-eslint@^10.0.0", "babel-eslint@^10.1.0":
+  "resolved" "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz"
+  "version" "10.1.0"
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.7.0"
     "@babel/traverse" "^7.7.0"
     "@babel/types" "^7.7.0"
-    eslint-visitor-keys "^1.0.0"
-    resolve "^1.12.0"
+    "eslint-visitor-keys" "^1.0.0"
+    "resolve" "^1.12.0"
 
-babel-extract-comments@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz#0a2aedf81417ed391b85e18b4614e693a0351a21"
+"babel-extract-comments@^1.0.0":
+  "resolved" "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    babylon "^6.18.0"
+    "babylon" "^6.18.0"
 
-babel-helper-evaluate-path@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.5.0.tgz#a62fa9c4e64ff7ea5cea9353174ef023a900a67c"
+"babel-helper-evaluate-path@^0.5.0":
+  "resolved" "https://registry.npmjs.org/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.5.0.tgz"
+  "version" "0.5.0"
 
-babel-helper-flip-expressions@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz#3696736a128ac18bc25254b5f40a22ceb3c1d3fd"
+"babel-helper-flip-expressions@^0.4.3":
+  "resolved" "https://registry.npmjs.org/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz"
+  "version" "0.4.3"
 
-babel-helper-is-nodes-equiv@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
+"babel-helper-is-nodes-equiv@^0.0.1":
+  "resolved" "https://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz"
+  "version" "0.0.1"
 
-babel-helper-is-void-0@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz#7d9c01b4561e7b95dbda0f6eee48f5b60e67313e"
+"babel-helper-is-void-0@^0.4.3":
+  "resolved" "https://registry.npmjs.org/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz"
+  "version" "0.4.3"
 
-babel-helper-mark-eval-scopes@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz#d244a3bef9844872603ffb46e22ce8acdf551562"
+"babel-helper-mark-eval-scopes@^0.4.3":
+  "resolved" "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz"
+  "version" "0.4.3"
 
-babel-helper-remove-or-void@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz#a4f03b40077a0ffe88e45d07010dee241ff5ae60"
+"babel-helper-remove-or-void@^0.4.3":
+  "resolved" "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz"
+  "version" "0.4.3"
 
-babel-helper-to-multiple-sequence-expressions@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz#a3f924e3561882d42fcf48907aa98f7979a4588d"
+"babel-helper-to-multiple-sequence-expressions@^0.5.0":
+  "resolved" "https://registry.npmjs.org/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz"
+  "version" "0.5.0"
 
-babel-jest@^26.6.0, babel-jest@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.1.tgz#07bd7bec14de47fe0f2c9a139741329f1f41788b"
+"babel-jest@^26.6.0":
+  "resolved" "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/transform" "^26.6.1"
     "@jest/types" "^26.6.1"
     "@types/babel__core" "^7.1.7"
-    babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.5.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    slash "^3.0.0"
+    "babel-plugin-istanbul" "^6.0.0"
+    "babel-preset-jest" "^26.5.0"
+    "chalk" "^4.0.0"
+    "graceful-fs" "^4.2.4"
+    "slash" "^3.0.0"
 
-babel-loader@8.1.0, babel-loader@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
+"babel-jest@^26.6.1":
+  "resolved" "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
-    find-cache-dir "^2.1.0"
-    loader-utils "^1.4.0"
-    mkdirp "^0.5.3"
-    pify "^4.0.1"
-    schema-utils "^2.6.5"
+    "@jest/transform" "^26.6.1"
+    "@jest/types" "^26.6.1"
+    "@types/babel__core" "^7.1.7"
+    "babel-plugin-istanbul" "^6.0.0"
+    "babel-preset-jest" "^26.5.0"
+    "chalk" "^4.0.0"
+    "graceful-fs" "^4.2.4"
+    "slash" "^3.0.0"
 
-babel-plugin-add-react-displayname@^0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5"
+"babel-loader@^7.0.0 || ^8.0.0", "babel-loader@^8.0.0", "babel-loader@^8.1.0", "babel-loader@8.1.0":
+  "resolved" "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"
+  "version" "8.1.0"
+  dependencies:
+    "find-cache-dir" "^2.1.0"
+    "loader-utils" "^1.4.0"
+    "mkdirp" "^0.5.3"
+    "pify" "^4.0.1"
+    "schema-utils" "^2.6.5"
 
-babel-plugin-apply-mdx-type-prop@1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.18.tgz#81f31b472f3b28289d4cea0f76c0315e6b85394f"
+"babel-plugin-add-react-displayname@^0.0.5":
+  "resolved" "https://registry.npmjs.org/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz"
+  "version" "0.0.5"
+
+"babel-plugin-apply-mdx-type-prop@1.6.18":
+  "resolved" "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.18.tgz"
+  "version" "1.6.18"
   dependencies:
     "@babel/helper-plugin-utils" "7.10.4"
     "@mdx-js/util" "1.6.18"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+"babel-plugin-dynamic-import-node@^2.3.3":
+  "resolved" "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"
+  "version" "2.3.3"
   dependencies:
-    object.assign "^4.1.0"
+    "object.assign" "^4.1.0"
 
-babel-plugin-emotion@^10.0.20, babel-plugin-emotion@^10.0.27:
-  version "10.0.33"
-  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz#ce1155dcd1783bbb9286051efee53f4e2be63e03"
+"babel-plugin-emotion@^10.0.20", "babel-plugin-emotion@^10.0.27":
+  "resolved" "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz"
+  "version" "10.0.33"
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@emotion/hash" "0.8.0"
     "@emotion/memoize" "0.7.4"
     "@emotion/serialize" "^0.11.16"
-    babel-plugin-macros "^2.0.0"
-    babel-plugin-syntax-jsx "^6.18.0"
-    convert-source-map "^1.5.0"
-    escape-string-regexp "^1.0.5"
-    find-root "^1.1.0"
-    source-map "^0.5.7"
+    "babel-plugin-macros" "^2.0.0"
+    "babel-plugin-syntax-jsx" "^6.18.0"
+    "convert-source-map" "^1.5.0"
+    "escape-string-regexp" "^1.0.5"
+    "find-root" "^1.1.0"
+    "source-map" "^0.5.7"
 
-babel-plugin-extract-import-names@1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.18.tgz#be74a5e12e1b5a5db5af53015a6a62ad16ac18f5"
+"babel-plugin-extract-import-names@1.6.18":
+  "resolved" "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.18.tgz"
+  "version" "1.6.18"
   dependencies:
     "@babel/helper-plugin-utils" "7.10.4"
 
-babel-plugin-istanbul@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"
+"babel-plugin-istanbul@^5.1.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz"
+  "version" "5.2.0"
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    find-up "^3.0.0"
-    istanbul-lib-instrument "^3.3.0"
-    test-exclude "^5.2.3"
+    "find-up" "^3.0.0"
+    "istanbul-lib-instrument" "^3.3.0"
+    "test-exclude" "^5.2.3"
 
-babel-plugin-istanbul@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
+"babel-plugin-istanbul@^6.0.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^4.0.0"
-    test-exclude "^6.0.0"
+    "istanbul-lib-instrument" "^4.0.0"
+    "test-exclude" "^6.0.0"
 
-babel-plugin-jest-hoist@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz#3916b3a28129c29528de91e5784a44680db46385"
+"babel-plugin-jest-hoist@^26.5.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz"
+  "version" "26.5.0"
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-macros@2.8.0, babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.7.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
+"babel-plugin-macros@^2.0.0", "babel-plugin-macros@^2.7.0", "babel-plugin-macros@2.8.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"
+  "version" "2.8.0"
   dependencies:
     "@babel/runtime" "^7.7.2"
-    cosmiconfig "^6.0.0"
-    resolve "^1.12.0"
+    "cosmiconfig" "^6.0.0"
+    "resolve" "^1.12.0"
 
-babel-plugin-minify-builtins@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz#31eb82ed1a0d0efdc31312f93b6e4741ce82c36b"
+"babel-plugin-minify-builtins@^0.5.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz"
+  "version" "0.5.0"
 
-babel-plugin-minify-constant-folding@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.5.0.tgz#f84bc8dbf6a561e5e350ff95ae216b0ad5515b6e"
+"babel-plugin-minify-constant-folding@^0.5.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.5.0.tgz"
+  "version" "0.5.0"
   dependencies:
-    babel-helper-evaluate-path "^0.5.0"
+    "babel-helper-evaluate-path" "^0.5.0"
 
-babel-plugin-minify-dead-code-elimination@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.1.tgz#1a0c68e44be30de4976ca69ffc535e08be13683f"
+"babel-plugin-minify-dead-code-elimination@^0.5.1":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.1.tgz"
+  "version" "0.5.1"
   dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-mark-eval-scopes "^0.4.3"
-    babel-helper-remove-or-void "^0.4.3"
-    lodash "^4.17.11"
+    "babel-helper-evaluate-path" "^0.5.0"
+    "babel-helper-mark-eval-scopes" "^0.4.3"
+    "babel-helper-remove-or-void" "^0.4.3"
+    "lodash" "^4.17.11"
 
-babel-plugin-minify-flip-comparisons@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz#00ca870cb8f13b45c038b3c1ebc0f227293c965a"
+"babel-plugin-minify-flip-comparisons@^0.4.3":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz"
+  "version" "0.4.3"
   dependencies:
-    babel-helper-is-void-0 "^0.4.3"
+    "babel-helper-is-void-0" "^0.4.3"
 
-babel-plugin-minify-guarded-expressions@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.4.tgz#818960f64cc08aee9d6c75bec6da974c4d621135"
+"babel-plugin-minify-guarded-expressions@^0.4.4":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.4.tgz"
+  "version" "0.4.4"
   dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-flip-expressions "^0.4.3"
+    "babel-helper-evaluate-path" "^0.5.0"
+    "babel-helper-flip-expressions" "^0.4.3"
 
-babel-plugin-minify-infinity@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz#dfb876a1b08a06576384ef3f92e653ba607b39ca"
+"babel-plugin-minify-infinity@^0.4.3":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz"
+  "version" "0.4.3"
 
-babel-plugin-minify-mangle-names@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.0.tgz#bcddb507c91d2c99e138bd6b17a19c3c271e3fd3"
+"babel-plugin-minify-mangle-names@^0.5.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.0.tgz"
+  "version" "0.5.0"
   dependencies:
-    babel-helper-mark-eval-scopes "^0.4.3"
+    "babel-helper-mark-eval-scopes" "^0.4.3"
 
-babel-plugin-minify-numeric-literals@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz#8e4fd561c79f7801286ff60e8c5fd9deee93c0bc"
+"babel-plugin-minify-numeric-literals@^0.4.3":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz"
+  "version" "0.4.3"
 
-babel-plugin-minify-replace@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz#d3e2c9946c9096c070efc96761ce288ec5c3f71c"
+"babel-plugin-minify-replace@^0.5.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz"
+  "version" "0.5.0"
 
-babel-plugin-minify-simplify@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.1.tgz#f21613c8b95af3450a2ca71502fdbd91793c8d6a"
+"babel-plugin-minify-simplify@^0.5.1":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.1.tgz"
+  "version" "0.5.1"
   dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-flip-expressions "^0.4.3"
-    babel-helper-is-nodes-equiv "^0.0.1"
-    babel-helper-to-multiple-sequence-expressions "^0.5.0"
+    "babel-helper-evaluate-path" "^0.5.0"
+    "babel-helper-flip-expressions" "^0.4.3"
+    "babel-helper-is-nodes-equiv" "^0.0.1"
+    "babel-helper-to-multiple-sequence-expressions" "^0.5.0"
 
-babel-plugin-minify-type-constructors@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz#1bc6f15b87f7ab1085d42b330b717657a2156500"
+"babel-plugin-minify-type-constructors@^0.4.3":
+  "resolved" "https://registry.npmjs.org/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz"
+  "version" "0.4.3"
   dependencies:
-    babel-helper-is-void-0 "^0.4.3"
+    "babel-helper-is-void-0" "^0.4.3"
 
-babel-plugin-named-asset-import@^0.3.1:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz#c9750a1b38d85112c9e166bf3ef7c5dbc605f4be"
+"babel-plugin-named-asset-import@^0.3.1":
+  "resolved" "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz"
+  "version" "0.3.6"
 
-babel-plugin-named-asset-import@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd"
+"babel-plugin-named-asset-import@^0.3.7":
+  "resolved" "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz"
+  "version" "0.3.7"
 
-babel-plugin-react-docgen@^4.0.0, babel-plugin-react-docgen@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.2.1.tgz#7cc8e2f94e8dc057a06e953162f0810e4e72257b"
+"babel-plugin-react-docgen@^4.0.0", "babel-plugin-react-docgen@^4.1.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.2.1.tgz"
+  "version" "4.2.1"
   dependencies:
-    ast-types "^0.14.2"
-    lodash "^4.17.15"
-    react-docgen "^5.0.0"
+    "ast-types" "^0.14.2"
+    "lodash" "^4.17.15"
+    "react-docgen" "^5.0.0"
 
-"babel-plugin-styled-components@>= 1", babel-plugin-styled-components@^1.10.7:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz#5296a9e557d736c3186be079fff27c6665d63d76"
+"babel-plugin-styled-components@^1.10.7", "babel-plugin-styled-components@>= 1":
+  "resolved" "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz"
+  "version" "1.11.1"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-module-imports" "^7.0.0"
-    babel-plugin-syntax-jsx "^6.18.0"
-    lodash "^4.17.11"
+    "babel-plugin-syntax-jsx" "^6.18.0"
+    "lodash" "^4.17.11"
 
-babel-plugin-syntax-jsx@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+"babel-plugin-syntax-jsx@^6.18.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"
+  "version" "6.18.0"
 
-babel-plugin-syntax-object-rest-spread@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+"babel-plugin-syntax-object-rest-spread@^6.8.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"
+  "version" "6.13.0"
 
-babel-plugin-transform-inline-consecutive-adds@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz#323d47a3ea63a83a7ac3c811ae8e6941faf2b0d1"
+"babel-plugin-transform-inline-consecutive-adds@^0.4.3":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz"
+  "version" "0.4.3"
 
-babel-plugin-transform-member-expression-literals@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz#37039c9a0c3313a39495faac2ff3a6b5b9d038bf"
+"babel-plugin-transform-member-expression-literals@^6.9.4":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz"
+  "version" "6.9.4"
 
-babel-plugin-transform-merge-sibling-variables@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz#85b422fc3377b449c9d1cde44087203532401dae"
+"babel-plugin-transform-merge-sibling-variables@^6.9.4":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz"
+  "version" "6.9.4"
 
-babel-plugin-transform-minify-booleans@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz#acbb3e56a3555dd23928e4b582d285162dd2b198"
+"babel-plugin-transform-minify-booleans@^6.9.4":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz"
+  "version" "6.9.4"
 
-babel-plugin-transform-object-rest-spread@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+"babel-plugin-transform-object-rest-spread@^6.26.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"
+  "version" "6.26.0"
   dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.26.0"
+    "babel-plugin-syntax-object-rest-spread" "^6.8.0"
+    "babel-runtime" "^6.26.0"
 
-babel-plugin-transform-property-literals@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz#98c1d21e255736573f93ece54459f6ce24985d39"
+"babel-plugin-transform-property-literals@^6.9.4":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz"
+  "version" "6.9.4"
   dependencies:
-    esutils "^2.0.2"
+    "esutils" "^2.0.2"
 
-babel-plugin-transform-react-remove-prop-types@0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
+"babel-plugin-transform-react-remove-prop-types@0.4.24":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz"
+  "version" "0.4.24"
 
-babel-plugin-transform-regexp-constructors@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz#58b7775b63afcf33328fae9a5f88fbd4fb0b4965"
+"babel-plugin-transform-regexp-constructors@^0.4.3":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz"
+  "version" "0.4.3"
 
-babel-plugin-transform-remove-console@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
+"babel-plugin-transform-remove-console@^6.9.4":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz"
+  "version" "6.9.4"
 
-babel-plugin-transform-remove-debugger@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz#42b727631c97978e1eb2d199a7aec84a18339ef2"
+"babel-plugin-transform-remove-debugger@^6.9.4":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz"
+  "version" "6.9.4"
 
-babel-plugin-transform-remove-undefined@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.5.0.tgz#80208b31225766c630c97fa2d288952056ea22dd"
+"babel-plugin-transform-remove-undefined@^0.5.0":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.5.0.tgz"
+  "version" "0.5.0"
   dependencies:
-    babel-helper-evaluate-path "^0.5.0"
+    "babel-helper-evaluate-path" "^0.5.0"
 
-babel-plugin-transform-simplify-comparison-operators@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz#f62afe096cab0e1f68a2d753fdf283888471ceb9"
+"babel-plugin-transform-simplify-comparison-operators@^6.9.4":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz"
+  "version" "6.9.4"
 
-babel-plugin-transform-undefined-to-void@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
+"babel-plugin-transform-undefined-to-void@^6.9.4":
+  "resolved" "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz"
+  "version" "6.9.4"
 
-babel-preset-current-node-syntax@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz#826f1f8e7245ad534714ba001f84f7e906c3b615"
+"babel-preset-current-node-syntax@^0.1.3":
+  "resolved" "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz"
+  "version" "0.1.4"
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
@@ -5423,44 +5618,44 @@ babel-preset-current-node-syntax@^0.1.3:
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-babel-preset-jest@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz#f1b166045cd21437d1188d29f7fba470d5bdb0e7"
+"babel-preset-jest@^26.5.0":
+  "resolved" "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz"
+  "version" "26.5.0"
   dependencies:
-    babel-plugin-jest-hoist "^26.5.0"
-    babel-preset-current-node-syntax "^0.1.3"
+    "babel-plugin-jest-hoist" "^26.5.0"
+    "babel-preset-current-node-syntax" "^0.1.3"
 
 "babel-preset-minify@^0.5.0 || 0.6.0-alpha.5":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.5.1.tgz#25f5d0bce36ec818be80338d0e594106e21eaa9f"
+  "resolved" "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.5.1.tgz"
+  "version" "0.5.1"
   dependencies:
-    babel-plugin-minify-builtins "^0.5.0"
-    babel-plugin-minify-constant-folding "^0.5.0"
-    babel-plugin-minify-dead-code-elimination "^0.5.1"
-    babel-plugin-minify-flip-comparisons "^0.4.3"
-    babel-plugin-minify-guarded-expressions "^0.4.4"
-    babel-plugin-minify-infinity "^0.4.3"
-    babel-plugin-minify-mangle-names "^0.5.0"
-    babel-plugin-minify-numeric-literals "^0.4.3"
-    babel-plugin-minify-replace "^0.5.0"
-    babel-plugin-minify-simplify "^0.5.1"
-    babel-plugin-minify-type-constructors "^0.4.3"
-    babel-plugin-transform-inline-consecutive-adds "^0.4.3"
-    babel-plugin-transform-member-expression-literals "^6.9.4"
-    babel-plugin-transform-merge-sibling-variables "^6.9.4"
-    babel-plugin-transform-minify-booleans "^6.9.4"
-    babel-plugin-transform-property-literals "^6.9.4"
-    babel-plugin-transform-regexp-constructors "^0.4.3"
-    babel-plugin-transform-remove-console "^6.9.4"
-    babel-plugin-transform-remove-debugger "^6.9.4"
-    babel-plugin-transform-remove-undefined "^0.5.0"
-    babel-plugin-transform-simplify-comparison-operators "^6.9.4"
-    babel-plugin-transform-undefined-to-void "^6.9.4"
-    lodash "^4.17.11"
+    "babel-plugin-minify-builtins" "^0.5.0"
+    "babel-plugin-minify-constant-folding" "^0.5.0"
+    "babel-plugin-minify-dead-code-elimination" "^0.5.1"
+    "babel-plugin-minify-flip-comparisons" "^0.4.3"
+    "babel-plugin-minify-guarded-expressions" "^0.4.4"
+    "babel-plugin-minify-infinity" "^0.4.3"
+    "babel-plugin-minify-mangle-names" "^0.5.0"
+    "babel-plugin-minify-numeric-literals" "^0.4.3"
+    "babel-plugin-minify-replace" "^0.5.0"
+    "babel-plugin-minify-simplify" "^0.5.1"
+    "babel-plugin-minify-type-constructors" "^0.4.3"
+    "babel-plugin-transform-inline-consecutive-adds" "^0.4.3"
+    "babel-plugin-transform-member-expression-literals" "^6.9.4"
+    "babel-plugin-transform-merge-sibling-variables" "^6.9.4"
+    "babel-plugin-transform-minify-booleans" "^6.9.4"
+    "babel-plugin-transform-property-literals" "^6.9.4"
+    "babel-plugin-transform-regexp-constructors" "^0.4.3"
+    "babel-plugin-transform-remove-console" "^6.9.4"
+    "babel-plugin-transform-remove-debugger" "^6.9.4"
+    "babel-plugin-transform-remove-undefined" "^0.5.0"
+    "babel-plugin-transform-simplify-comparison-operators" "^6.9.4"
+    "babel-plugin-transform-undefined-to-void" "^6.9.4"
+    "lodash" "^4.17.11"
 
-babel-preset-react-app@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-10.0.0.tgz#689b60edc705f8a70ce87f47ab0e560a317d7045"
+"babel-preset-react-app@^10.0.0":
+  "resolved" "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.0.tgz"
+  "version" "10.0.0"
   dependencies:
     "@babel/core" "7.12.3"
     "@babel/plugin-proposal-class-properties" "7.12.1"
@@ -5475,3370 +5670,3595 @@ babel-preset-react-app@^10.0.0:
     "@babel/preset-react" "7.12.1"
     "@babel/preset-typescript" "7.12.1"
     "@babel/runtime" "7.12.1"
-    babel-plugin-macros "2.8.0"
-    babel-plugin-transform-react-remove-prop-types "0.4.24"
+    "babel-plugin-macros" "2.8.0"
+    "babel-plugin-transform-react-remove-prop-types" "0.4.24"
 
-babel-runtime@^6.11.6, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+"babel-runtime@^6.11.6", "babel-runtime@^6.26.0":
+  "resolved" "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
+  "version" "6.26.0"
   dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
+    "core-js" "^2.4.0"
+    "regenerator-runtime" "^0.11.0"
 
-babel-walk@3.0.0-canary-5:
-  version "3.0.0-canary-5"
-  resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11"
+"babel-walk@3.0.0-canary-5":
+  "resolved" "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz"
+  "version" "3.0.0-canary-5"
   dependencies:
     "@babel/types" "^7.9.6"
 
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+"babylon@^6.18.0":
+  "resolved" "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"
+  "version" "6.18.0"
 
-backo2@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+"backo2@~1.0.2":
+  "resolved" "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"
+  "version" "1.0.2"
 
-bail@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
+"bail@^1.0.0":
+  "resolved" "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz"
+  "version" "1.0.5"
 
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+"balanced-match@^1.0.0":
+  "resolved" "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
+  "version" "1.0.0"
 
-base16@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70"
-
-base64-arraybuffer@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
-  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
-
-base64-js@^1.0.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+"base@^0.11.1":
+  "resolved" "https://registry.npmjs.org/base/-/base-0.11.2.tgz"
+  "version" "0.11.2"
   dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
+    "cache-base" "^1.0.1"
+    "class-utils" "^0.3.5"
+    "component-emitter" "^1.2.1"
+    "define-property" "^1.0.0"
+    "isobject" "^3.0.1"
+    "mixin-deep" "^1.2.0"
+    "pascalcase" "^0.1.1"
 
-batch-processor@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
+"base16@^1.0.0":
+  "resolved" "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz"
+  "version" "1.0.0"
 
-batch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+"base64-arraybuffer@0.1.4":
+  "resolved" "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz"
+  "version" "0.1.4"
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+"base64-js@^1.0.2":
+  "resolved" "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"
+  "version" "1.3.1"
+
+"batch-processor@1.0.0":
+  "resolved" "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz"
+  "version" "1.0.0"
+
+"batch@0.6.1":
+  "resolved" "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"
+  "version" "0.6.1"
+
+"bcrypt-pbkdf@^1.0.0":
+  "resolved" "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    tweetnacl "^0.14.3"
+    "tweetnacl" "^0.14.3"
 
-bfj@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2"
+"bfj@^7.0.2":
+  "resolved" "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz"
+  "version" "7.0.2"
   dependencies:
-    bluebird "^3.5.5"
-    check-types "^11.1.1"
-    hoopy "^0.1.4"
-    tryer "^1.0.1"
+    "bluebird" "^3.5.5"
+    "check-types" "^11.1.1"
+    "hoopy" "^0.1.4"
+    "tryer" "^1.0.1"
 
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+"big.js@^5.2.2":
+  "resolved" "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"
+  "version" "5.2.2"
 
-binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+"binary-extensions@^1.0.0":
+  "resolved" "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"
+  "version" "1.13.1"
 
-binary-extensions@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
+"binary-extensions@^2.0.0":
+  "resolved" "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"
+  "version" "2.1.0"
 
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+"bindings@^1.5.0":
+  "resolved" "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"
+  "version" "1.5.0"
   dependencies:
-    file-uri-to-path "1.0.0"
+    "file-uri-to-path" "1.0.0"
 
-blob-util@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
+"blob-util@2.0.2":
+  "resolved" "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz"
+  "version" "2.0.2"
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+"bluebird@^3.3.5", "bluebird@^3.5.5", "bluebird@^3.7.2":
+  "resolved" "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"
+  "version" "3.7.2"
+
+"bn.js@^4.0.0", "bn.js@^4.1.0", "bn.js@^4.11.9":
+  "resolved" "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"
+  "version" "4.12.0"
+
+"bn.js@^5.1.1":
+  "resolved" "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz"
+  "version" "5.1.3"
+
+"body-parser@1.19.0":
+  "resolved" "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"
+  "version" "1.19.0"
   dependencies:
-    inherits "~2.0.0"
+    "bytes" "3.1.0"
+    "content-type" "~1.0.4"
+    "debug" "2.6.9"
+    "depd" "~1.1.2"
+    "http-errors" "1.7.2"
+    "iconv-lite" "0.4.24"
+    "on-finished" "~2.3.0"
+    "qs" "6.7.0"
+    "raw-body" "2.4.0"
+    "type-is" "~1.6.17"
 
-bluebird@^3.3.5, bluebird@^3.5.5, bluebird@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
-
-bn.js@^5.1.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
-
-body-parser@1.19.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+"bonjour@^3.5.0":
+  "resolved" "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz"
+  "version" "3.5.0"
   dependencies:
-    bytes "3.1.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
+    "array-flatten" "^2.1.0"
+    "deep-equal" "^1.0.1"
+    "dns-equal" "^1.0.0"
+    "dns-txt" "^2.0.2"
+    "multicast-dns" "^6.0.1"
+    "multicast-dns-service-types" "^1.1.0"
 
-bonjour@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+"boolbase@^1.0.0", "boolbase@~1.0.0":
+  "resolved" "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
+  "version" "1.0.0"
+
+"boxen@^4.1.0":
+  "resolved" "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz"
+  "version" "4.2.0"
   dependencies:
-    array-flatten "^2.1.0"
-    deep-equal "^1.0.1"
-    dns-equal "^1.0.0"
-    dns-txt "^2.0.2"
-    multicast-dns "^6.0.1"
-    multicast-dns-service-types "^1.1.0"
+    "ansi-align" "^3.0.0"
+    "camelcase" "^5.3.1"
+    "chalk" "^3.0.0"
+    "cli-boxes" "^2.2.0"
+    "string-width" "^4.1.0"
+    "term-size" "^2.1.0"
+    "type-fest" "^0.8.1"
+    "widest-line" "^3.1.0"
 
-boolbase@^1.0.0, boolbase@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-
-boxen@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
+"brace-expansion@^1.1.7":
+  "resolved" "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+  "version" "1.1.11"
   dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^5.3.1"
-    chalk "^3.0.0"
-    cli-boxes "^2.2.0"
-    string-width "^4.1.0"
-    term-size "^2.1.0"
-    type-fest "^0.8.1"
-    widest-line "^3.1.0"
+    "balanced-match" "^1.0.0"
+    "concat-map" "0.0.1"
 
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+"braces@^2.3.1", "braces@^2.3.2":
+  "resolved" "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"
+  "version" "2.3.2"
   dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
+    "arr-flatten" "^1.1.0"
+    "array-unique" "^0.3.2"
+    "extend-shallow" "^2.0.1"
+    "fill-range" "^4.0.0"
+    "isobject" "^3.0.1"
+    "repeat-element" "^1.1.2"
+    "snapdragon" "^0.8.1"
+    "snapdragon-node" "^2.0.1"
+    "split-string" "^3.0.2"
+    "to-regex" "^3.0.1"
 
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+"braces@^3.0.1", "braces@~3.0.2":
+  "resolved" "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
+    "fill-range" "^7.0.1"
 
-braces@^3.0.1, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+"brorand@^1.0.1", "brorand@^1.1.0":
+  "resolved" "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"
+  "version" "1.1.0"
+
+"browser-process-hrtime@^1.0.0":
+  "resolved" "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"
+  "version" "1.0.0"
+
+"browser-stdout@1.3.1":
+  "resolved" "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"
+  "version" "1.3.1"
+
+"browserify-aes@^1.0.0", "browserify-aes@^1.0.4":
+  "resolved" "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
-    fill-range "^7.0.1"
+    "buffer-xor" "^1.0.3"
+    "cipher-base" "^1.0.0"
+    "create-hash" "^1.1.0"
+    "evp_bytestokey" "^1.0.3"
+    "inherits" "^2.0.1"
+    "safe-buffer" "^5.0.1"
 
-brorand@^1.0.1, brorand@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+"browserify-cipher@^1.0.0":
+  "resolved" "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    "browserify-aes" "^1.0.4"
+    "browserify-des" "^1.0.0"
+    "evp_bytestokey" "^1.0.0"
 
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+"browserify-des@^1.0.0":
+  "resolved" "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
+    "cipher-base" "^1.0.1"
+    "des.js" "^1.0.0"
+    "inherits" "^2.0.1"
+    "safe-buffer" "^5.1.2"
 
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+"browserify-rsa@^4.0.0", "browserify-rsa@^4.0.1":
+  "resolved" "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
+    "bn.js" "^4.1.0"
+    "randombytes" "^2.0.1"
 
-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+"browserify-sign@^4.0.0":
+  "resolved" "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz"
+  "version" "4.2.1"
   dependencies:
-    bn.js "^4.1.0"
-    randombytes "^2.0.1"
+    "bn.js" "^5.1.1"
+    "browserify-rsa" "^4.0.1"
+    "create-hash" "^1.2.0"
+    "create-hmac" "^1.1.7"
+    "elliptic" "^6.5.3"
+    "inherits" "^2.0.4"
+    "parse-asn1" "^5.1.5"
+    "readable-stream" "^3.6.0"
+    "safe-buffer" "^5.2.0"
 
-browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+"browserify-zlib@^0.2.0":
+  "resolved" "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"
+  "version" "0.2.0"
   dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
-    create-hash "^1.2.0"
-    create-hmac "^1.1.7"
-    elliptic "^6.5.3"
-    inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
+    "pako" "~1.0.5"
 
-browserify-zlib@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+"browserslist@^4", "browserslist@^4.0.0", "browserslist@^4.12.0", "browserslist@^4.6.2", "browserslist@^4.6.4", "browserslist@^4.8.5":
+  "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz"
+  "version" "4.14.5"
   dependencies:
-    pako "~1.0.5"
+    "caniuse-lite" "^1.0.30001135"
+    "electron-to-chromium" "^1.3.571"
+    "escalade" "^3.1.0"
+    "node-releases" "^1.1.61"
 
-browserslist@4.14.2:
-  version "4.14.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.2.tgz#1b3cec458a1ba87588cc5e9be62f19b6d48813ce"
+"browserslist@4.14.2":
+  "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz"
+  "version" "4.14.2"
   dependencies:
-    caniuse-lite "^1.0.30001125"
-    electron-to-chromium "^1.3.564"
-    escalade "^3.0.2"
-    node-releases "^1.1.61"
+    "caniuse-lite" "^1.0.30001125"
+    "electron-to-chromium" "^1.3.564"
+    "escalade" "^3.0.2"
+    "node-releases" "^1.1.61"
 
-browserslist@4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17"
+"browserslist@4.7.0":
+  "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz"
+  "version" "4.7.0"
   dependencies:
-    caniuse-lite "^1.0.30000989"
-    electron-to-chromium "^1.3.247"
-    node-releases "^1.1.29"
+    "caniuse-lite" "^1.0.30000989"
+    "electron-to-chromium" "^1.3.247"
+    "node-releases" "^1.1.29"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.8.5:
-  version "4.14.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
+"bs-logger@0.x":
+  "resolved" "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz"
+  "version" "0.2.6"
   dependencies:
-    caniuse-lite "^1.0.30001135"
-    electron-to-chromium "^1.3.571"
-    escalade "^3.1.0"
-    node-releases "^1.1.61"
+    "fast-json-stable-stringify" "2.x"
 
-bs-logger@0.x:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
+"bser@2.1.1":
+  "resolved" "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"
+  "version" "2.1.1"
   dependencies:
-    fast-json-stable-stringify "2.x"
+    "node-int64" "^0.4.0"
 
-bser@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+"btoa@^1.2.1":
+  "resolved" "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz"
+  "version" "1.2.1"
+
+"buffer-crc32@~0.2.3":
+  "resolved" "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
+  "version" "0.2.13"
+
+"buffer-from@^1.0.0", "buffer-from@1.x":
+  "resolved" "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"
+  "version" "1.1.1"
+
+"buffer-indexof@^1.0.0":
+  "resolved" "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"
+  "version" "1.1.1"
+
+"buffer-xor@^1.0.3":
+  "resolved" "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+  "version" "1.0.3"
+
+"buffer@^4.3.0":
+  "resolved" "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"
+  "version" "4.9.2"
   dependencies:
-    node-int64 "^0.4.0"
+    "base64-js" "^1.0.2"
+    "ieee754" "^1.1.4"
+    "isarray" "^1.0.0"
 
-btoa@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73"
+"builtin-modules@^3.1.0":
+  "resolved" "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz"
+  "version" "3.1.0"
 
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+"builtin-status-codes@^3.0.0":
+  "resolved" "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"
+  "version" "3.0.0"
 
-buffer-from@1.x, buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+"bytes@3.0.0":
+  "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"
+  "version" "3.0.0"
 
-buffer-indexof@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+"bytes@3.1.0":
+  "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"
+  "version" "3.1.0"
 
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-
-buffer@^4.3.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+"cacache@^12.0.2":
+  "resolved" "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz"
+  "version" "12.0.4"
   dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
+    "bluebird" "^3.5.5"
+    "chownr" "^1.1.1"
+    "figgy-pudding" "^3.5.1"
+    "glob" "^7.1.4"
+    "graceful-fs" "^4.1.15"
+    "infer-owner" "^1.0.3"
+    "lru-cache" "^5.1.1"
+    "mississippi" "^3.0.0"
+    "mkdirp" "^0.5.1"
+    "move-concurrently" "^1.0.1"
+    "promise-inflight" "^1.0.1"
+    "rimraf" "^2.6.3"
+    "ssri" "^6.0.1"
+    "unique-filename" "^1.1.1"
+    "y18n" "^4.0.0"
 
-builtin-modules@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-
-bytes@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-
-cacache@^12.0.2:
-  version "12.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+"cacache@^13.0.1":
+  "resolved" "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz"
+  "version" "13.0.1"
   dependencies:
-    bluebird "^3.5.5"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.4"
-    graceful-fs "^4.1.15"
-    infer-owner "^1.0.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.3"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
+    "chownr" "^1.1.2"
+    "figgy-pudding" "^3.5.1"
+    "fs-minipass" "^2.0.0"
+    "glob" "^7.1.4"
+    "graceful-fs" "^4.2.2"
+    "infer-owner" "^1.0.4"
+    "lru-cache" "^5.1.1"
+    "minipass" "^3.0.0"
+    "minipass-collect" "^1.0.2"
+    "minipass-flush" "^1.0.5"
+    "minipass-pipeline" "^1.2.2"
+    "mkdirp" "^0.5.1"
+    "move-concurrently" "^1.0.1"
+    "p-map" "^3.0.0"
+    "promise-inflight" "^1.0.1"
+    "rimraf" "^2.7.1"
+    "ssri" "^7.0.0"
+    "unique-filename" "^1.1.1"
 
-cacache@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
-  dependencies:
-    chownr "^1.1.2"
-    figgy-pudding "^3.5.1"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.2"
-    infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    minipass "^3.0.0"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    p-map "^3.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^2.7.1"
-    ssri "^7.0.0"
-    unique-filename "^1.1.1"
-
-cacache@^15.0.5:
-  version "15.0.5"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
+"cacache@^15.0.5":
+  "resolved" "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz"
+  "version" "15.0.5"
   dependencies:
     "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.0"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
+    "chownr" "^2.0.0"
+    "fs-minipass" "^2.0.0"
+    "glob" "^7.1.4"
+    "infer-owner" "^1.0.4"
+    "lru-cache" "^6.0.0"
+    "minipass" "^3.1.1"
+    "minipass-collect" "^1.0.2"
+    "minipass-flush" "^1.0.5"
+    "minipass-pipeline" "^1.2.2"
+    "mkdirp" "^1.0.3"
+    "p-map" "^4.0.0"
+    "promise-inflight" "^1.0.1"
+    "rimraf" "^3.0.2"
+    "ssri" "^8.0.0"
+    "tar" "^6.0.2"
+    "unique-filename" "^1.1.1"
 
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+"cache-base@^1.0.1":
+  "resolved" "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
+    "collection-visit" "^1.0.0"
+    "component-emitter" "^1.2.1"
+    "get-value" "^2.0.6"
+    "has-value" "^1.0.0"
+    "isobject" "^3.0.1"
+    "set-value" "^2.0.0"
+    "to-object-path" "^0.3.0"
+    "union-value" "^1.0.0"
+    "unset-value" "^1.0.0"
 
-cachedir@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
+"cachedir@^2.3.0":
+  "resolved" "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz"
+  "version" "2.3.0"
 
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+"call-me-maybe@^1.0.1":
+  "resolved" "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"
+  "version" "1.0.1"
 
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+"caller-callsite@^2.0.0":
+  "resolved" "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    callsites "^2.0.0"
+    "callsites" "^2.0.0"
 
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+"caller-path@^2.0.0":
+  "resolved" "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    caller-callsite "^2.0.0"
+    "caller-callsite" "^2.0.0"
 
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+"callsites@^2.0.0":
+  "resolved" "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"
+  "version" "2.0.0"
 
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+"callsites@^3.0.0":
+  "resolved" "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
+  "version" "3.1.0"
 
-camel-case@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547"
+"camel-case@^4.1.1":
+  "resolved" "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz"
+  "version" "4.1.1"
   dependencies:
-    pascal-case "^3.1.1"
-    tslib "^1.10.0"
+    "pascal-case" "^3.1.1"
+    "tslib" "^1.10.0"
 
-camelcase-css@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
+"camelcase-css@2.0.1":
+  "resolved" "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz"
+  "version" "2.0.1"
 
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+"camelcase-keys@^6.2.2":
+  "resolved" "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"
+  "version" "6.2.2"
   dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
+    "camelcase" "^5.3.1"
+    "map-obj" "^4.0.0"
+    "quick-lru" "^4.0.1"
 
-camelcase@5.3.1, camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+"camelcase@^5.0.0", "camelcase@^5.3.1", "camelcase@5.3.1":
+  "resolved" "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
+  "version" "5.3.1"
 
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+"camelcase@^6.0.0":
+  "resolved" "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"
+  "version" "6.2.0"
 
-camelcase@^6.0.0, camelcase@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+"camelcase@^6.1.0":
+  "resolved" "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"
+  "version" "6.2.0"
 
-camelize@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
+"camelize@^1.0.0":
+  "resolved" "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"
+  "version" "1.0.0"
 
-can-use-dom@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a"
+"can-use-dom@^0.1.0":
+  "resolved" "https://registry.npmjs.org/can-use-dom/-/can-use-dom-0.1.0.tgz"
+  "version" "0.1.0"
 
-caniuse-api@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+"caniuse-api@^3.0.0":
+  "resolved" "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    browserslist "^4.0.0"
-    caniuse-lite "^1.0.0"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
+    "browserslist" "^4.0.0"
+    "caniuse-lite" "^1.0.0"
+    "lodash.memoize" "^4.1.2"
+    "lodash.uniq" "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
-  version "1.0.30001148"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz#dc97c7ed918ab33bf8706ddd5e387287e015d637"
+"caniuse-lite@^1.0.0":
+  "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz"
+  "version" "1.0.30001148"
 
-caniuse-lite@^1.0.30001125:
-  version "1.0.30001153"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001153.tgz#9a0942fe777cd7178fb084693b79415ff747ecd9"
+"caniuse-lite@^1.0.30000981":
+  "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz"
+  "version" "1.0.30001148"
 
-caniuse-lite@^1.0.30001208:
-  version "1.0.30001208"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz#a999014a35cebd4f98c405930a057a0d75352eb9"
-  integrity sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==
+"caniuse-lite@^1.0.30000989":
+  "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz"
+  "version" "1.0.30001148"
 
-capture-exit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+"caniuse-lite@^1.0.30001109":
+  "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz"
+  "version" "1.0.30001148"
+
+"caniuse-lite@^1.0.30001125":
+  "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001153.tgz"
+  "version" "1.0.30001153"
+
+"caniuse-lite@^1.0.30001135":
+  "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz"
+  "version" "1.0.30001148"
+
+"caniuse-lite@^1.0.30001208":
+  "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz"
+  "version" "1.0.30001208"
+
+"capture-exit@^2.0.0":
+  "resolved" "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    rsvp "^4.8.4"
+    "rsvp" "^4.8.4"
 
-case-sensitive-paths-webpack-plugin@2.3.0, case-sensitive-paths-webpack-plugin@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz#23ac613cc9a856e4f88ff8bb73bbb5e989825cf7"
+"case-sensitive-paths-webpack-plugin@^2.2.0", "case-sensitive-paths-webpack-plugin@2.3.0":
+  "resolved" "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz"
+  "version" "2.3.0"
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+"caseless@~0.12.0":
+  "resolved" "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"
+  "version" "0.12.0"
 
-ccount@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
+"ccount@^1.0.0":
+  "resolved" "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz"
+  "version" "1.0.5"
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+"chalk@^1.0.0", "chalk@^1.1.3":
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
+  "version" "1.1.3"
   dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
+    "ansi-styles" "^2.2.1"
+    "escape-string-regexp" "^1.0.2"
+    "has-ansi" "^2.0.0"
+    "strip-ansi" "^3.0.0"
+    "supports-color" "^2.0.0"
 
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+"chalk@^1.1.1":
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
+  "version" "1.1.3"
   dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
+    "ansi-styles" "^2.2.1"
+    "escape-string-regexp" "^1.0.2"
+    "has-ansi" "^2.0.0"
+    "strip-ansi" "^3.0.0"
+    "supports-color" "^2.0.0"
 
-chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+"chalk@^2.0.0":
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  "version" "2.4.2"
   dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
+    "ansi-styles" "^3.2.1"
+    "escape-string-regexp" "^1.0.5"
+    "supports-color" "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+"chalk@^2.0.1", "chalk@^2.1.0", "chalk@^2.3.2":
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  "version" "2.4.2"
   dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
+    "ansi-styles" "^3.2.1"
+    "escape-string-regexp" "^1.0.5"
+    "supports-color" "^5.3.0"
 
-chance@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.7.tgz#e99dde5ac16681af787b5ba94c8277c090d6cfe8"
-
-change-emitter@^0.1.2:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
-
-char-regex@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
-
-character-entities-legacy@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
-
-character-entities@^1.0.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
-
-character-parser@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+"chalk@^2.3.0":
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  "version" "2.4.2"
   dependencies:
-    is-regex "^1.0.3"
+    "ansi-styles" "^3.2.1"
+    "escape-string-regexp" "^1.0.5"
+    "supports-color" "^5.3.0"
 
-character-reference-invalid@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-
-charenc@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-
-check-more-types@^2.24.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
-
-check-types@^11.1.1:
-  version "11.1.2"
-  resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.1.2.tgz#86a7c12bf5539f6324eb0e70ca8896c0e38f3e2f"
-
-chokidar@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
+"chalk@^2.4.1", "chalk@2.4.2":
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  "version" "2.4.2"
   dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.2.0"
+    "ansi-styles" "^3.2.1"
+    "escape-string-regexp" "^1.0.5"
+    "supports-color" "^5.3.0"
+
+"chalk@^2.4.2", "chalk@2.4.2":
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  "version" "2.4.2"
+  dependencies:
+    "ansi-styles" "^3.2.1"
+    "escape-string-regexp" "^1.0.5"
+    "supports-color" "^5.3.0"
+
+"chalk@^3.0.0":
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"
+  "version" "3.0.0"
+  dependencies:
+    "ansi-styles" "^4.1.0"
+    "supports-color" "^7.1.0"
+
+"chalk@^4.0.0", "chalk@^4.1.0":
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"
+  "version" "4.1.0"
+  dependencies:
+    "ansi-styles" "^4.1.0"
+    "supports-color" "^7.1.0"
+
+"chance@^1.1.3":
+  "resolved" "https://registry.npmjs.org/chance/-/chance-1.1.7.tgz"
+  "version" "1.1.7"
+
+"change-emitter@^0.1.2":
+  "resolved" "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz"
+  "version" "0.1.6"
+
+"char-regex@^1.0.2":
+  "resolved" "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"
+  "version" "1.0.2"
+
+"character-entities-legacy@^1.0.0":
+  "resolved" "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"
+  "version" "1.1.4"
+
+"character-entities@^1.0.0":
+  "resolved" "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz"
+  "version" "1.2.4"
+
+"character-parser@^2.2.0":
+  "resolved" "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz"
+  "version" "2.2.0"
+  dependencies:
+    "is-regex" "^1.0.3"
+
+"character-reference-invalid@^1.0.0":
+  "resolved" "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"
+  "version" "1.1.4"
+
+"chardet@^0.7.0":
+  "resolved" "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"
+  "version" "0.7.0"
+
+"charenc@0.0.2":
+  "resolved" "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"
+  "version" "0.0.2"
+
+"check-more-types@^2.24.0":
+  "resolved" "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz"
+  "version" "2.24.0"
+
+"check-types@^11.1.1":
+  "resolved" "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz"
+  "version" "11.1.2"
+
+"chokidar@^2.0.4", "chokidar@^2.1.8":
+  "resolved" "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"
+  "version" "2.1.8"
+  dependencies:
+    "anymatch" "^2.0.0"
+    "async-each" "^1.0.1"
+    "braces" "^2.3.2"
+    "glob-parent" "^3.1.0"
+    "inherits" "^2.0.3"
+    "is-binary-path" "^1.0.0"
+    "is-glob" "^4.0.0"
+    "normalize-path" "^3.0.0"
+    "path-is-absolute" "^1.0.0"
+    "readdirp" "^2.2.1"
+    "upath" "^1.1.1"
   optionalDependencies:
-    fsevents "~2.1.1"
+    "fsevents" "^1.2.7"
 
-chokidar@^2.0.4, chokidar@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+"chokidar@^3.4.1":
+  "resolved" "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"
+  "version" "3.4.3"
   dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
+    "anymatch" "~3.1.1"
+    "braces" "~3.0.2"
+    "glob-parent" "~5.1.0"
+    "is-binary-path" "~2.1.0"
+    "is-glob" "~4.0.1"
+    "normalize-path" "~3.0.0"
+    "readdirp" "~3.5.0"
   optionalDependencies:
-    fsevents "^1.2.7"
+    "fsevents" "~2.1.2"
 
-chokidar@^3.4.1:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
+"chokidar@^3.4.2":
+  "resolved" "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"
+  "version" "3.5.1"
   dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.5.0"
+    "anymatch" "~3.1.1"
+    "braces" "~3.0.2"
+    "glob-parent" "~5.1.0"
+    "is-binary-path" "~2.1.0"
+    "is-glob" "~4.0.1"
+    "normalize-path" "~3.0.0"
+    "readdirp" "~3.5.0"
   optionalDependencies:
-    fsevents "~2.1.2"
+    "fsevents" "~2.3.1"
 
-chokidar@^3.4.2:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+"chokidar@3.3.0":
+  "resolved" "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"
+  "version" "3.3.0"
   dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.5.0"
+    "anymatch" "~3.1.1"
+    "braces" "~3.0.2"
+    "glob-parent" "~5.1.0"
+    "is-binary-path" "~2.1.0"
+    "is-glob" "~4.0.1"
+    "normalize-path" "~3.0.0"
+    "readdirp" "~3.2.0"
   optionalDependencies:
-    fsevents "~2.3.1"
+    "fsevents" "~2.1.1"
 
-chownr@^1.1.1, chownr@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+"chownr@^1.1.1", "chownr@^1.1.2":
+  "resolved" "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
+  "version" "1.1.4"
 
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+"chownr@^2.0.0":
+  "resolved" "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"
+  "version" "2.0.0"
 
-chrome-remote-interface@^0.27.1:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/chrome-remote-interface/-/chrome-remote-interface-0.27.2.tgz#e5605605f092b7ef8575d95304e004039c9d0ab9"
+"chrome-remote-interface@^0.27.1":
+  "resolved" "https://registry.npmjs.org/chrome-remote-interface/-/chrome-remote-interface-0.27.2.tgz"
+  "version" "0.27.2"
   dependencies:
-    commander "2.11.x"
-    ws "^6.1.0"
+    "commander" "2.11.x"
+    "ws" "^6.1.0"
 
-chrome-trace-event@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+"chrome-trace-event@^1.0.2":
+  "resolved" "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    tslib "^1.9.0"
+    "tslib" "^1.9.0"
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+"ci-info@^2.0.0":
+  "resolved" "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"
+  "version" "2.0.0"
 
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+"cipher-base@^1.0.0", "cipher-base@^1.0.1", "cipher-base@^1.0.3":
+  "resolved" "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"
+  "version" "1.0.4"
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    "inherits" "^2.0.1"
+    "safe-buffer" "^5.0.1"
 
-cjs-module-lexer@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.4.3.tgz#9e31f7fe701f5fcee5793f77ab4e58fa8dcde8bc"
+"cjs-module-lexer@^0.4.2":
+  "resolved" "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.4.3.tgz"
+  "version" "0.4.3"
 
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+"class-utils@^0.3.5":
+  "resolved" "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"
+  "version" "0.3.6"
   dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
+    "arr-union" "^3.1.0"
+    "define-property" "^0.2.5"
+    "isobject" "^3.0.0"
+    "static-extend" "^0.1.1"
 
-classnames@^2.2, classnames@^2.2.1, classnames@^2.2.5, classnames@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
+"classnames@^2.2", "classnames@^2.2.1", "classnames@^2.2.5", "classnames@^2.2.6":
+  "resolved" "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz"
+  "version" "2.2.6"
 
-clean-css@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
+"clean-css@^4.2.3":
+  "resolved" "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"
+  "version" "4.2.3"
   dependencies:
-    source-map "~0.6.0"
+    "source-map" "~0.6.0"
 
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+"clean-stack@^2.0.0":
+  "resolved" "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"
+  "version" "2.2.0"
 
-cli-boxes@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
+"cli-boxes@^2.2.0":
+  "resolved" "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz"
+  "version" "2.2.1"
 
-cli-cursor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+"cli-cursor@^1.0.2":
+  "resolved" "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    restore-cursor "^1.0.1"
+    "restore-cursor" "^1.0.1"
 
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+"cli-cursor@^2.0.0", "cli-cursor@^2.1.0":
+  "resolved" "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    restore-cursor "^2.0.0"
+    "restore-cursor" "^2.0.0"
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+"cli-cursor@^3.1.0":
+  "resolved" "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    restore-cursor "^3.1.0"
+    "restore-cursor" "^3.1.0"
 
-cli-table3@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
+"cli-table3@~0.6.0":
+  "resolved" "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.0.tgz"
+  "version" "0.6.0"
   dependencies:
-    object-assign "^4.1.0"
-    string-width "^2.1.1"
+    "object-assign" "^4.1.0"
+    "string-width" "^4.2.0"
   optionalDependencies:
-    colors "^1.1.2"
+    "colors" "^1.1.2"
 
-cli-table3@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee"
+"cli-table3@0.5.1":
+  "resolved" "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz"
+  "version" "0.5.1"
   dependencies:
-    object-assign "^4.1.0"
-    string-width "^4.2.0"
+    "object-assign" "^4.1.0"
+    "string-width" "^2.1.1"
   optionalDependencies:
-    colors "^1.1.2"
+    "colors" "^1.1.2"
 
-cli-truncate@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+"cli-truncate@^0.2.1":
+  "resolved" "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz"
+  "version" "0.2.1"
   dependencies:
-    slice-ansi "0.0.4"
-    string-width "^1.0.1"
+    "slice-ansi" "0.0.4"
+    "string-width" "^1.0.1"
 
-cli-width@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+"cli-width@^2.0.0":
+  "resolved" "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz"
+  "version" "2.2.1"
 
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+"cli-width@^3.0.0":
+  "resolved" "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"
+  "version" "3.0.0"
 
-clipboard@^2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376"
+"cli@~1.0.0":
+  "resolved" "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    good-listener "^1.2.2"
-    select "^1.1.2"
-    tiny-emitter "^2.0.0"
+    "exit" "0.1.2"
+    "glob" "^7.1.1"
 
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+"clipboard@^2.0.0":
+  "resolved" "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz"
+  "version" "2.0.6"
   dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
+    "good-listener" "^1.2.2"
+    "select" "^1.1.2"
+    "tiny-emitter" "^2.0.0"
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+"cliui@^5.0.0":
+  "resolved" "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
+    "string-width" "^3.1.0"
+    "strip-ansi" "^5.2.0"
+    "wrap-ansi" "^5.1.0"
 
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+"cliui@^6.0.0":
+  "resolved" "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^7.0.0"
+    "string-width" "^4.2.0"
+    "strip-ansi" "^6.0.0"
+    "wrap-ansi" "^6.2.0"
 
-clone-deep@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6"
+"cliui@^7.0.2":
+  "resolved" "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
+  "version" "7.0.4"
   dependencies:
-    for-own "^0.1.3"
-    is-plain-object "^2.0.1"
-    kind-of "^3.0.2"
-    lazy-cache "^1.0.3"
-    shallow-clone "^0.1.2"
+    "string-width" "^4.2.0"
+    "strip-ansi" "^6.0.0"
+    "wrap-ansi" "^7.0.0"
 
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+"clone-deep@^0.2.4":
+  "resolved" "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz"
+  "version" "0.2.4"
   dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
+    "for-own" "^0.1.3"
+    "is-plain-object" "^2.0.1"
+    "kind-of" "^3.0.2"
+    "lazy-cache" "^1.0.3"
+    "shallow-clone" "^0.1.2"
 
-clone@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+"clone-deep@^4.0.1":
+  "resolved" "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz"
+  "version" "4.0.1"
+  dependencies:
+    "is-plain-object" "^2.0.4"
+    "kind-of" "^6.0.2"
+    "shallow-clone" "^3.0.0"
 
-clsx@^1.0.4, clsx@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
+"clone@^2.1.2":
+  "resolved" "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
+  "version" "2.1.2"
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+"clsx@^1.0.4", "clsx@^1.1.0":
+  "resolved" "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz"
+  "version" "1.1.1"
 
-coa@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
+"co@^4.6.0":
+  "resolved" "https://registry.npmjs.org/co/-/co-4.6.0.tgz"
+  "version" "4.6.0"
+
+"coa@^2.0.2":
+  "resolved" "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
     "@types/q" "^1.5.1"
-    chalk "^2.4.1"
-    q "^1.1.2"
+    "chalk" "^2.4.1"
+    "q" "^1.1.2"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+"code-point-at@^1.0.0":
+  "resolved" "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"
+  "version" "1.1.0"
 
-codemirror@^5.59.2:
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.59.2.tgz#ee674d3a4a8d241af38d52afc482625ba7393922"
+"codemirror@^5.59.2":
+  "resolved" "https://registry.npmjs.org/codemirror/-/codemirror-5.59.2.tgz"
+  "version" "5.59.2"
 
-collapse-white-space@^1.0.2:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
+"collapse-white-space@^1.0.2":
+  "resolved" "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz"
+  "version" "1.0.6"
 
-collect-v8-coverage@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
+"collect-v8-coverage@^1.0.0":
+  "resolved" "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"
+  "version" "1.0.1"
 
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+"collection-visit@^1.0.0":
+  "resolved" "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
+    "map-visit" "^1.0.0"
+    "object-visit" "^1.0.0"
 
-color-convert@^1.9.0, color-convert@^1.9.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+"color-convert@^1.9.0", "color-convert@^1.9.1":
+  "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
+  "version" "1.9.3"
   dependencies:
-    color-name "1.1.3"
+    "color-name" "1.1.3"
 
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+"color-convert@^2.0.1":
+  "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    color-name "~1.1.4"
+    "color-name" "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+"color-name@^1.0.0", "color-name@^1.1.4", "color-name@~1.1.4":
+  "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  "version" "1.1.4"
 
-color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+"color-name@1.1.3":
+  "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  "version" "1.1.3"
 
-color-string@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6"
+"color-string@^1.5.4":
+  "resolved" "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz"
+  "version" "1.5.4"
   dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
+    "color-name" "^1.0.0"
+    "simple-swizzle" "^0.2.2"
 
-color@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
+"color@^3.0.0":
+  "resolved" "https://registry.npmjs.org/color/-/color-3.1.3.tgz"
+  "version" "3.1.3"
   dependencies:
-    color-convert "^1.9.1"
-    color-string "^1.5.4"
+    "color-convert" "^1.9.1"
+    "color-string" "^1.5.4"
 
-colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+"colorette@^1.2.1":
+  "resolved" "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz"
+  "version" "1.2.1"
 
-colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+"colors@^1.1.2":
+  "resolved" "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"
+  "version" "1.4.0"
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+"combined-stream@^1.0.6", "combined-stream@~1.0.6":
+  "resolved" "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
+  "version" "1.0.8"
   dependencies:
-    delayed-stream "~1.0.0"
+    "delayed-stream" "~1.0.0"
 
-comma-separated-tokens@^1.0.0:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
+"comma-separated-tokens@^1.0.0":
+  "resolved" "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz"
+  "version" "1.0.8"
 
-commander@2.11.x:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+"commander@^2.19.0", "commander@^2.20.0":
+  "resolved" "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
+  "version" "2.20.3"
 
-commander@^2.19.0, commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+"commander@^4.0.1":
+  "resolved" "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"
+  "version" "4.1.1"
 
-commander@^4.0.1, commander@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+"commander@^4.1.1":
+  "resolved" "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"
+  "version" "4.1.1"
 
-commander@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+"commander@^5.1.0":
+  "resolved" "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"
+  "version" "5.1.0"
 
-common-tags@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+"commander@2.11.x":
+  "resolved" "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"
+  "version" "2.11.0"
 
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+"common-tags@^1.8.0":
+  "resolved" "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz"
+  "version" "1.8.0"
 
-component-emitter@^1.2.1, component-emitter@~1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+"commondir@^1.0.1":
+  "resolved" "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
+  "version" "1.0.1"
 
-compose-function@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/compose-function/-/compose-function-3.0.3.tgz#9ed675f13cc54501d30950a486ff6a7ba3ab185f"
+"component-emitter@^1.2.1", "component-emitter@~1.3.0":
+  "resolved" "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"
+  "version" "1.3.0"
+
+"compose-function@3.0.3":
+  "resolved" "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz"
+  "version" "3.0.3"
   dependencies:
-    arity-n "^1.0.4"
+    "arity-n" "^1.0.4"
 
-compressible@~2.0.16:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+"compressible@~2.0.16":
+  "resolved" "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"
+  "version" "2.0.18"
   dependencies:
-    mime-db ">= 1.43.0 < 2"
+    "mime-db" ">= 1.43.0 < 2"
 
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+"compression@^1.7.4":
+  "resolved" "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"
+  "version" "1.7.4"
   dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
-    debug "2.6.9"
-    on-headers "~1.0.2"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
+    "accepts" "~1.3.5"
+    "bytes" "3.0.0"
+    "compressible" "~2.0.16"
+    "debug" "2.6.9"
+    "on-headers" "~1.0.2"
+    "safe-buffer" "5.1.2"
+    "vary" "~1.1.2"
 
-compute-scroll-into-view@^1.0.16:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz#5b7bf4f7127ea2c19b750353d7ce6776a90ee088"
+"compute-scroll-into-view@^1.0.16":
+  "resolved" "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz"
+  "version" "1.0.16"
 
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+"concat-map@0.0.1":
+  "resolved" "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  "version" "0.0.1"
 
-concat-stream@^1.5.0, concat-stream@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+"concat-stream@^1.5.0", "concat-stream@^1.6.2":
+  "resolved" "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"
+  "version" "1.6.2"
   dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
+    "buffer-from" "^1.0.0"
+    "inherits" "^2.0.3"
+    "readable-stream" "^2.2.2"
+    "typedarray" "^0.0.6"
 
-confusing-browser-globals@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz#30d1e7f3d1b882b25ec4933d1d1adac353d20a59"
+"confusing-browser-globals@^1.0.10":
+  "resolved" "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz"
+  "version" "1.0.10"
 
-connect-history-api-fallback@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+"connect-history-api-fallback@^1.6.0":
+  "resolved" "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"
+  "version" "1.6.0"
 
-console-browserify@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+"console-browserify@^1.1.0":
+  "resolved" "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz"
+  "version" "1.2.0"
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-
-consolidate@^0.16.0:
-  version "0.16.0"
-  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.16.0.tgz#a11864768930f2f19431660a65906668f5fbdc16"
+"console-browserify@1.1.x":
+  "resolved" "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    bluebird "^3.7.2"
+    "date-now" "^0.1.4"
 
-constantinople@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151"
+"console-control-strings@^1.0.0", "console-control-strings@~1.1.0":
+  "resolved" "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
+  "version" "1.1.0"
+
+"consolidate@^0.16.0":
+  "resolved" "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz"
+  "version" "0.16.0"
+  dependencies:
+    "bluebird" "^3.7.2"
+
+"constantinople@^4.0.1":
+  "resolved" "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
     "@babel/parser" "^7.6.0"
     "@babel/types" "^7.6.1"
 
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+"constants-browserify@^1.0.0":
+  "resolved" "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"
+  "version" "1.0.0"
 
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+"contains-path@^0.1.0":
+  "resolved" "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz"
+  "version" "0.1.0"
 
-content-disposition@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+"content-disposition@0.5.3":
+  "resolved" "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"
+  "version" "0.5.3"
   dependencies:
-    safe-buffer "5.1.2"
+    "safe-buffer" "5.1.2"
 
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+"content-type@~1.0.4":
+  "resolved" "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"
+  "version" "1.0.4"
 
-convert-source-map@1.7.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+"convert-source-map@^0.3.3":
+  "resolved" "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
+  "version" "0.3.5"
+
+"convert-source-map@^1.4.0", "convert-source-map@^1.5.0", "convert-source-map@^1.6.0", "convert-source-map@^1.7.0", "convert-source-map@1.7.0":
+  "resolved" "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"
+  "version" "1.7.0"
   dependencies:
-    safe-buffer "~5.1.1"
+    "safe-buffer" "~5.1.1"
 
-convert-source-map@^0.3.3:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
+"cookie-signature@1.0.6":
+  "resolved" "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
+  "version" "1.0.6"
 
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+"cookie@^0.4.1":
+  "resolved" "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"
+  "version" "0.4.1"
 
-cookie@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+"cookie@0.4.0":
+  "resolved" "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"
+  "version" "0.4.0"
 
-cookie@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+"copy-concurrently@^1.0.0":
+  "resolved" "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"
+  "version" "1.0.5"
   dependencies:
-    aproba "^1.1.1"
-    fs-write-stream-atomic "^1.0.8"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.0"
+    "aproba" "^1.1.1"
+    "fs-write-stream-atomic" "^1.0.8"
+    "iferr" "^0.1.5"
+    "mkdirp" "^0.5.1"
+    "rimraf" "^2.5.4"
+    "run-queue" "^1.0.0"
 
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+"copy-descriptor@^0.1.0":
+  "resolved" "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"
+  "version" "0.1.1"
 
-copy-to-clipboard@^3.0.8, copy-to-clipboard@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
+"copy-to-clipboard@^3.0.8", "copy-to-clipboard@^3.3.1":
+  "resolved" "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz"
+  "version" "3.3.1"
   dependencies:
-    toggle-selection "^1.0.6"
+    "toggle-selection" "^1.0.6"
 
-core-js-compat@^3.6.2:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
+"core-js-compat@^3.6.2":
+  "resolved" "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"
+  "version" "3.6.5"
   dependencies:
-    browserslist "^4.8.5"
-    semver "7.0.0"
+    "browserslist" "^4.8.5"
+    "semver" "7.0.0"
 
-core-js-pure@^3.0.0, core-js-pure@^3.0.1:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
+"core-js-pure@^3.0.0", "core-js-pure@^3.0.1":
+  "resolved" "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz"
+  "version" "3.6.5"
 
-core-js@^1.0.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+"core-js@^1.0.0":
+  "resolved" "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz"
+  "version" "1.2.7"
 
-core-js@^2.4.0, core-js@^2.6.5:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+"core-js@^2.4.0":
+  "resolved" "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"
+  "version" "2.6.11"
 
-core-js@^3.0.1, core-js@^3.0.4, core-js@^3.6.5:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
+"core-js@^2.6.5":
+  "resolved" "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"
+  "version" "2.6.11"
 
-core-js@^3.6.4:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.10.1.tgz#e683963978b6806dcc6c0a4a8bd4ab0bdaf3f21a"
-  integrity sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==
+"core-js@^3.0.1":
+  "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz"
+  "version" "3.6.5"
 
-core-js@^3.9.1:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"
+"core-js@^3.0.4":
+  "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz"
+  "version" "3.6.5"
 
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+"core-js@^3.5.0":
+  "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.13.1.tgz"
+  "version" "3.13.1"
 
-corejs-upgrade-webpack-plugin@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/corejs-upgrade-webpack-plugin/-/corejs-upgrade-webpack-plugin-2.2.0.tgz#503293bf1fdcb104918eb40d0294e4776ad6923a"
+"core-js@^3.6.4":
+  "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz"
+  "version" "3.10.1"
+
+"core-js@^3.6.5":
+  "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz"
+  "version" "3.6.5"
+
+"core-js@^3.9.1":
+  "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz"
+  "version" "3.9.1"
+
+"core-util-is@~1.0.0", "core-util-is@1.0.2":
+  "resolved" "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+  "version" "1.0.2"
+
+"corejs-upgrade-webpack-plugin@^2.2.0":
+  "resolved" "https://registry.npmjs.org/corejs-upgrade-webpack-plugin/-/corejs-upgrade-webpack-plugin-2.2.0.tgz"
+  "version" "2.2.0"
   dependencies:
-    resolve-from "^5.0.0"
-    webpack "^4.38.0"
+    "resolve-from" "^5.0.0"
+    "webpack" "^4.38.0"
 
-cosmiconfig@^5.0.0, cosmiconfig@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+"cosmiconfig@^5.0.0", "cosmiconfig@^5.2.1":
+  "resolved" "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz"
+  "version" "5.2.1"
   dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.1"
-    parse-json "^4.0.0"
+    "import-fresh" "^2.0.0"
+    "is-directory" "^0.3.1"
+    "js-yaml" "^3.13.1"
+    "parse-json" "^4.0.0"
 
-cosmiconfig@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
+"cosmiconfig@^6.0.0":
+  "resolved" "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
     "@types/parse-json" "^4.0.0"
-    import-fresh "^3.1.0"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.7.2"
+    "import-fresh" "^3.1.0"
+    "parse-json" "^5.0.0"
+    "path-type" "^4.0.0"
+    "yaml" "^1.7.2"
 
-craco-alias@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/craco-alias/-/craco-alias-2.1.1.tgz#c9c2e9d333c674419591f3002a26cb073ee2094b"
+"craco-alias@^2.1.1":
+  "resolved" "https://registry.npmjs.org/craco-alias/-/craco-alias-2.1.1.tgz"
+  "version" "2.1.1"
 
-craco-babel-loader@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/craco-babel-loader/-/craco-babel-loader-0.1.4.tgz#4b84ada5c1b223d0032e8b937d50459a57ad8586"
+"craco-babel-loader@^0.1.4":
+  "resolved" "https://registry.npmjs.org/craco-babel-loader/-/craco-babel-loader-0.1.4.tgz"
+  "version" "0.1.4"
   dependencies:
     "@craco/craco" "^5.0.0"
 
-create-ecdh@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+"create-ecdh@^4.0.0":
+  "resolved" "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz"
+  "version" "4.0.4"
   dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.5.3"
+    "bn.js" "^4.1.0"
+    "elliptic" "^6.5.3"
 
-create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+"create-hash@^1.1.0", "create-hash@^1.1.2", "create-hash@^1.2.0":
+  "resolved" "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
+    "cipher-base" "^1.0.1"
+    "inherits" "^2.0.1"
+    "md5.js" "^1.3.4"
+    "ripemd160" "^2.0.1"
+    "sha.js" "^2.4.0"
 
-create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+"create-hmac@^1.1.0", "create-hmac@^1.1.4", "create-hmac@^1.1.7":
+  "resolved" "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"
+  "version" "1.1.7"
   dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
+    "cipher-base" "^1.0.3"
+    "create-hash" "^1.1.0"
+    "inherits" "^2.0.1"
+    "ripemd160" "^2.0.0"
+    "safe-buffer" "^5.0.1"
+    "sha.js" "^2.4.8"
 
-create-react-context@0.3.0, create-react-context@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c"
+"create-react-context@^0.3.0", "create-react-context@0.3.0":
+  "resolved" "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz"
+  "version" "0.3.0"
   dependencies:
-    gud "^1.0.0"
-    warning "^4.0.3"
+    "gud" "^1.0.0"
+    "warning" "^4.0.3"
 
-cross-fetch@^3.0.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
-  integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
+"cropperjs@1.5.7":
+  "resolved" "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.7.tgz"
+  "version" "1.5.7"
+
+"cross-fetch@^3.0.4":
+  "resolved" "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz"
+  "version" "3.1.4"
   dependencies:
-    node-fetch "2.6.1"
+    "node-fetch" "2.6.1"
 
-cross-spawn@6.0.5, cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+"cross-spawn@^6.0.0":
+  "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
+  "version" "6.0.5"
   dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
+    "nice-try" "^1.0.4"
+    "path-key" "^2.0.1"
+    "semver" "^5.5.0"
+    "shebang-command" "^1.2.0"
+    "which" "^1.2.9"
 
-cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+"cross-spawn@^6.0.5":
+  "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
+  "version" "6.0.5"
   dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
+    "nice-try" "^1.0.4"
+    "path-key" "^2.0.1"
+    "semver" "^5.5.0"
+    "shebang-command" "^1.2.0"
+    "which" "^1.2.9"
 
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+"cross-spawn@^7.0.0", "cross-spawn@^7.0.2", "cross-spawn@^7.0.3", "cross-spawn@7.0.3":
+  "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
+  "version" "7.0.3"
   dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
+    "path-key" "^3.1.0"
+    "shebang-command" "^2.0.0"
+    "which" "^2.0.1"
 
-crypt@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-
-crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+"cross-spawn@6.0.5":
+  "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
+  "version" "6.0.5"
   dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
+    "nice-try" "^1.0.4"
+    "path-key" "^2.0.1"
+    "semver" "^5.5.0"
+    "shebang-command" "^1.2.0"
+    "which" "^1.2.9"
 
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
+"crypt@0.0.2":
+  "resolved" "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"
+  "version" "0.0.2"
 
-css-blank-pseudo@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5"
+"crypto-browserify@^3.11.0":
+  "resolved" "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"
+  "version" "3.12.0"
   dependencies:
-    postcss "^7.0.5"
+    "browserify-cipher" "^1.0.0"
+    "browserify-sign" "^4.0.0"
+    "create-ecdh" "^4.0.0"
+    "create-hash" "^1.1.0"
+    "create-hmac" "^1.1.0"
+    "diffie-hellman" "^5.0.0"
+    "inherits" "^2.0.1"
+    "pbkdf2" "^3.0.3"
+    "public-encrypt" "^4.0.0"
+    "randombytes" "^2.0.0"
+    "randomfill" "^1.0.3"
 
-css-box-model@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/css-box-model/-/css-box-model-1.2.1.tgz#59951d3b81fd6b2074a62d49444415b0d2b4d7c1"
+"crypto-random-string@^1.0.0":
+  "resolved" "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"
+  "version" "1.0.0"
+
+"css-blank-pseudo@^0.1.4":
+  "resolved" "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz"
+  "version" "0.1.4"
   dependencies:
-    tiny-invariant "^1.0.6"
+    "postcss" "^7.0.5"
 
-css-color-keywords@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
-
-css-color-names@0.0.4, css-color-names@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
-
-css-declaration-sorter@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22"
+"css-box-model@^1.2.0":
+  "resolved" "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz"
+  "version" "1.2.1"
   dependencies:
-    postcss "^7.0.1"
-    timsort "^0.3.0"
+    "tiny-invariant" "^1.0.6"
 
-css-has-pseudo@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee"
+"css-color-keywords@^1.0.0":
+  "resolved" "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz"
+  "version" "1.0.0"
+
+"css-color-names@^0.0.4", "css-color-names@0.0.4":
+  "resolved" "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz"
+  "version" "0.0.4"
+
+"css-declaration-sorter@^4.0.1":
+  "resolved" "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    postcss "^7.0.6"
-    postcss-selector-parser "^5.0.0-rc.4"
+    "postcss" "^7.0.1"
+    "timsort" "^0.3.0"
 
-css-loader@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.3.0.tgz#c888af64b2a5b2e85462c72c0f4a85c7e2e0821e"
+"css-has-pseudo@^0.10.0":
+  "resolved" "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz"
+  "version" "0.10.0"
   dependencies:
-    camelcase "^6.0.0"
-    cssesc "^3.0.0"
-    icss-utils "^4.1.1"
-    loader-utils "^2.0.0"
-    postcss "^7.0.32"
-    postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^3.0.3"
-    postcss-modules-scope "^2.2.0"
-    postcss-modules-values "^3.0.0"
-    postcss-value-parser "^4.1.0"
-    schema-utils "^2.7.1"
-    semver "^7.3.2"
+    "postcss" "^7.0.6"
+    "postcss-selector-parser" "^5.0.0-rc.4"
 
-css-loader@^3.0.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
+"css-loader@^3.0.0":
+  "resolved" "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz"
+  "version" "3.6.0"
   dependencies:
-    camelcase "^5.3.1"
-    cssesc "^3.0.0"
-    icss-utils "^4.1.1"
-    loader-utils "^1.2.3"
-    normalize-path "^3.0.0"
-    postcss "^7.0.32"
-    postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^3.0.2"
-    postcss-modules-scope "^2.2.0"
-    postcss-modules-values "^3.0.0"
-    postcss-value-parser "^4.1.0"
-    schema-utils "^2.7.0"
-    semver "^6.3.0"
+    "camelcase" "^5.3.1"
+    "cssesc" "^3.0.0"
+    "icss-utils" "^4.1.1"
+    "loader-utils" "^1.2.3"
+    "normalize-path" "^3.0.0"
+    "postcss" "^7.0.32"
+    "postcss-modules-extract-imports" "^2.0.0"
+    "postcss-modules-local-by-default" "^3.0.2"
+    "postcss-modules-scope" "^2.2.0"
+    "postcss-modules-values" "^3.0.0"
+    "postcss-value-parser" "^4.1.0"
+    "schema-utils" "^2.7.0"
+    "semver" "^6.3.0"
 
-css-prefers-color-scheme@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4"
+"css-loader@4.3.0":
+  "resolved" "https://registry.npmjs.org/css-loader/-/css-loader-4.3.0.tgz"
+  "version" "4.3.0"
   dependencies:
-    postcss "^7.0.5"
+    "camelcase" "^6.0.0"
+    "cssesc" "^3.0.0"
+    "icss-utils" "^4.1.1"
+    "loader-utils" "^2.0.0"
+    "postcss" "^7.0.32"
+    "postcss-modules-extract-imports" "^2.0.0"
+    "postcss-modules-local-by-default" "^3.0.3"
+    "postcss-modules-scope" "^2.2.0"
+    "postcss-modules-values" "^3.0.0"
+    "postcss-value-parser" "^4.1.0"
+    "schema-utils" "^2.7.1"
+    "semver" "^7.3.2"
 
-css-select-base-adapter@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
-
-css-select@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+"css-prefers-color-scheme@^3.1.1":
+  "resolved" "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz"
+  "version" "3.1.1"
   dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
+    "postcss" "^7.0.5"
 
-css-select@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
+"css-select-base-adapter@^0.1.1":
+  "resolved" "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"
+  "version" "0.1.1"
+
+"css-select@^1.1.0":
+  "resolved" "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
-    boolbase "^1.0.0"
-    css-what "^3.2.1"
-    domutils "^1.7.0"
-    nth-check "^1.0.2"
+    "boolbase" "~1.0.0"
+    "css-what" "2.1"
+    "domutils" "1.5.1"
+    "nth-check" "~1.0.1"
 
-css-to-react-native@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756"
+"css-select@^2.0.0":
+  "resolved" "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    camelize "^1.0.0"
-    css-color-keywords "^1.0.0"
-    postcss-value-parser "^4.0.2"
+    "boolbase" "^1.0.0"
+    "css-what" "^3.2.1"
+    "domutils" "^1.7.0"
+    "nth-check" "^1.0.2"
 
-css-tree@1.0.0-alpha.37:
-  version "1.0.0-alpha.37"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
+"css-to-react-native@^3.0.0":
+  "resolved" "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    mdn-data "2.0.4"
-    source-map "^0.6.1"
+    "camelize" "^1.0.0"
+    "css-color-keywords" "^1.0.0"
+    "postcss-value-parser" "^4.0.2"
 
-css-tree@1.0.0-alpha.39:
-  version "1.0.0-alpha.39"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz#2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"
+"css-tree@1.0.0-alpha.37":
+  "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz"
+  "version" "1.0.0-alpha.37"
   dependencies:
-    mdn-data "2.0.6"
-    source-map "^0.6.1"
+    "mdn-data" "2.0.4"
+    "source-map" "^0.6.1"
 
-css-what@2.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
-
-css-what@^3.2.1:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
-
-css.escape@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
-
-css@^2.0.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
+"css-tree@1.0.0-alpha.39":
+  "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz"
+  "version" "1.0.0-alpha.39"
   dependencies:
-    inherits "^2.0.3"
-    source-map "^0.6.1"
-    source-map-resolve "^0.5.2"
-    urix "^0.1.0"
+    "mdn-data" "2.0.6"
+    "source-map" "^0.6.1"
 
-css@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
+"css-what@^3.2.1":
+  "resolved" "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz"
+  "version" "3.4.2"
+
+"css-what@2.1":
+  "resolved" "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz"
+  "version" "2.1.3"
+
+"css.escape@^1.5.1":
+  "resolved" "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz"
+  "version" "1.5.1"
+
+"css@^2.0.0":
+  "resolved" "https://registry.npmjs.org/css/-/css-2.2.4.tgz"
+  "version" "2.2.4"
   dependencies:
-    inherits "^2.0.4"
-    source-map "^0.6.1"
-    source-map-resolve "^0.6.0"
+    "inherits" "^2.0.3"
+    "source-map" "^0.6.1"
+    "source-map-resolve" "^0.5.2"
+    "urix" "^0.1.0"
 
-cssdb@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
-
-cssesc@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
-
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-
-cssfontparser@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz#f4022fc8f9700c68029d542084afbaf425a3f3e3"
-  integrity sha1-9AIvyPlwDGgCnVQghK+69CWj8+M=
-
-cssnano-preset-default@^4.0.7:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
+"css@^3.0.0":
+  "resolved" "https://registry.npmjs.org/css/-/css-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    css-declaration-sorter "^4.0.1"
-    cssnano-util-raw-cache "^4.0.1"
-    postcss "^7.0.0"
-    postcss-calc "^7.0.1"
-    postcss-colormin "^4.0.3"
-    postcss-convert-values "^4.0.1"
-    postcss-discard-comments "^4.0.2"
-    postcss-discard-duplicates "^4.0.2"
-    postcss-discard-empty "^4.0.1"
-    postcss-discard-overridden "^4.0.1"
-    postcss-merge-longhand "^4.0.11"
-    postcss-merge-rules "^4.0.3"
-    postcss-minify-font-values "^4.0.2"
-    postcss-minify-gradients "^4.0.2"
-    postcss-minify-params "^4.0.2"
-    postcss-minify-selectors "^4.0.2"
-    postcss-normalize-charset "^4.0.1"
-    postcss-normalize-display-values "^4.0.2"
-    postcss-normalize-positions "^4.0.2"
-    postcss-normalize-repeat-style "^4.0.2"
-    postcss-normalize-string "^4.0.2"
-    postcss-normalize-timing-functions "^4.0.2"
-    postcss-normalize-unicode "^4.0.1"
-    postcss-normalize-url "^4.0.1"
-    postcss-normalize-whitespace "^4.0.2"
-    postcss-ordered-values "^4.1.2"
-    postcss-reduce-initial "^4.0.3"
-    postcss-reduce-transforms "^4.0.2"
-    postcss-svgo "^4.0.2"
-    postcss-unique-selectors "^4.0.1"
+    "inherits" "^2.0.4"
+    "source-map" "^0.6.1"
+    "source-map-resolve" "^0.6.0"
 
-cssnano-util-get-arguments@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f"
+"cssdb@^4.4.0":
+  "resolved" "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz"
+  "version" "4.4.0"
 
-cssnano-util-get-match@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d"
+"cssesc@^2.0.0":
+  "resolved" "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz"
+  "version" "2.0.0"
 
-cssnano-util-raw-cache@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"
+"cssesc@^3.0.0":
+  "resolved" "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
+  "version" "3.0.0"
+
+"cssfontparser@^1.2.1":
+  "resolved" "https://registry.npmjs.org/cssfontparser/-/cssfontparser-1.2.1.tgz"
+  "version" "1.2.1"
+
+"cssnano-preset-default@^4.0.7":
+  "resolved" "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"
+  "version" "4.0.7"
   dependencies:
-    postcss "^7.0.0"
+    "css-declaration-sorter" "^4.0.1"
+    "cssnano-util-raw-cache" "^4.0.1"
+    "postcss" "^7.0.0"
+    "postcss-calc" "^7.0.1"
+    "postcss-colormin" "^4.0.3"
+    "postcss-convert-values" "^4.0.1"
+    "postcss-discard-comments" "^4.0.2"
+    "postcss-discard-duplicates" "^4.0.2"
+    "postcss-discard-empty" "^4.0.1"
+    "postcss-discard-overridden" "^4.0.1"
+    "postcss-merge-longhand" "^4.0.11"
+    "postcss-merge-rules" "^4.0.3"
+    "postcss-minify-font-values" "^4.0.2"
+    "postcss-minify-gradients" "^4.0.2"
+    "postcss-minify-params" "^4.0.2"
+    "postcss-minify-selectors" "^4.0.2"
+    "postcss-normalize-charset" "^4.0.1"
+    "postcss-normalize-display-values" "^4.0.2"
+    "postcss-normalize-positions" "^4.0.2"
+    "postcss-normalize-repeat-style" "^4.0.2"
+    "postcss-normalize-string" "^4.0.2"
+    "postcss-normalize-timing-functions" "^4.0.2"
+    "postcss-normalize-unicode" "^4.0.1"
+    "postcss-normalize-url" "^4.0.1"
+    "postcss-normalize-whitespace" "^4.0.2"
+    "postcss-ordered-values" "^4.1.2"
+    "postcss-reduce-initial" "^4.0.3"
+    "postcss-reduce-transforms" "^4.0.2"
+    "postcss-svgo" "^4.0.2"
+    "postcss-unique-selectors" "^4.0.1"
 
-cssnano-util-same-parent@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
+"cssnano-util-get-arguments@^4.0.0":
+  "resolved" "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"
+  "version" "4.0.0"
 
-cssnano@^4.1.10:
-  version "4.1.10"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2"
+"cssnano-util-get-match@^4.0.0":
+  "resolved" "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"
+  "version" "4.0.0"
+
+"cssnano-util-raw-cache@^4.0.1":
+  "resolved" "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    cosmiconfig "^5.0.0"
-    cssnano-preset-default "^4.0.7"
-    is-resolvable "^1.0.0"
-    postcss "^7.0.0"
+    "postcss" "^7.0.0"
 
-csso@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz#0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"
+"cssnano-util-same-parent@^4.0.0":
+  "resolved" "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"
+  "version" "4.0.1"
+
+"cssnano@^4.1.10":
+  "resolved" "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz"
+  "version" "4.1.10"
   dependencies:
-    css-tree "1.0.0-alpha.39"
+    "cosmiconfig" "^5.0.0"
+    "cssnano-preset-default" "^4.0.7"
+    "is-resolvable" "^1.0.0"
+    "postcss" "^7.0.0"
 
-cssom@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
-
-cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-
-cssstyle@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+"csso@^4.0.2":
+  "resolved" "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    cssom "~0.3.6"
+    "css-tree" "1.0.0-alpha.39"
 
-csstype@^2.5.7:
-  version "2.6.13"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"
+"cssom@^0.4.4":
+  "resolved" "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz"
+  "version" "0.4.4"
 
-csstype@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz#2b410bbeba38ba9633353aff34b05d9755d065f8"
+"cssom@~0.3.6":
+  "resolved" "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"
+  "version" "0.3.8"
 
-cuid@^2.1.1:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/cuid/-/cuid-2.1.8.tgz#cbb88f954171e0d5747606c0139fb65c5101eac0"
-
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+"cssstyle@^2.2.0":
+  "resolved" "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz"
+  "version" "2.3.0"
   dependencies:
-    array-find-index "^1.0.1"
+    "cssom" "~0.3.6"
 
-cyclist@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+"csstype@^2.5.7":
+  "resolved" "https://registry.npmjs.org/csstype/-/csstype-2.6.13.tgz"
+  "version" "2.6.13"
 
-cypress-file-upload@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-4.1.1.tgz#952713c8104ab7008de99c65bd63f74b244fe4df"
+"csstype@^3.0.2":
+  "resolved" "https://registry.npmjs.org/csstype/-/csstype-3.0.3.tgz"
+  "version" "3.0.3"
+
+"cuid@^2.1.1":
+  "resolved" "https://registry.npmjs.org/cuid/-/cuid-2.1.8.tgz"
+  "version" "2.1.8"
+
+"cyclist@^1.0.1":
+  "resolved" "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz"
+  "version" "1.0.1"
+
+"cypress-file-upload@^4.1.1":
+  "resolved" "https://registry.npmjs.org/cypress-file-upload/-/cypress-file-upload-4.1.1.tgz"
+  "version" "4.1.1"
   dependencies:
-    mime "^2.4.4"
+    "mime" "^2.4.4"
 
-cypress-log-to-output@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/cypress-log-to-output/-/cypress-log-to-output-1.1.2.tgz#b9635a907ed06961cd53cc1bff8d6f55a981a773"
+"cypress-log-to-output@^1.1.2":
+  "resolved" "https://registry.npmjs.org/cypress-log-to-output/-/cypress-log-to-output-1.1.2.tgz"
+  "version" "1.1.2"
   dependencies:
-    chalk "^2.4.2"
-    chrome-remote-interface "^0.27.1"
+    "chalk" "^2.4.2"
+    "chrome-remote-interface" "^0.27.1"
 
-cypress-multi-reporters@^1.2.4:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cypress-multi-reporters/-/cypress-multi-reporters-1.4.0.tgz#5f1d0484a20959cfe782f1bf65ad16c6ad804da7"
+"cypress-multi-reporters@^1.2.4":
+  "resolved" "https://registry.npmjs.org/cypress-multi-reporters/-/cypress-multi-reporters-1.4.0.tgz"
+  "version" "1.4.0"
   dependencies:
-    debug "^4.1.1"
-    lodash "^4.17.15"
+    "debug" "^4.1.1"
+    "lodash" "^4.17.15"
 
-cypress-xpath@^1.4.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/cypress-xpath/-/cypress-xpath-1.6.0.tgz#e96a8554ef2e3693ee5f282d66e88462c3e2a10c"
+"cypress-xpath@^1.4.0":
+  "resolved" "https://registry.npmjs.org/cypress-xpath/-/cypress-xpath-1.6.0.tgz"
+  "version" "1.6.0"
 
-cypress@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.2.1.tgz#27d5fbcf008c698c390fdb0c03441804176d06c4"
+"cypress@>3.0.0", "cypress@6.2.1":
+  "resolved" "https://registry.npmjs.org/cypress/-/cypress-6.2.1.tgz"
+  "version" "6.2.1"
   dependencies:
     "@cypress/listr-verbose-renderer" "^0.4.1"
     "@cypress/request" "^2.88.5"
     "@cypress/xvfb" "^1.2.4"
     "@types/sinonjs__fake-timers" "^6.0.1"
     "@types/sizzle" "^2.3.2"
-    arch "^2.1.2"
-    blob-util "2.0.2"
-    bluebird "^3.7.2"
-    cachedir "^2.3.0"
-    chalk "^4.1.0"
-    check-more-types "^2.24.0"
-    cli-table3 "~0.6.0"
-    commander "^5.1.0"
-    common-tags "^1.8.0"
-    debug "^4.1.1"
-    eventemitter2 "^6.4.2"
-    execa "^4.0.2"
-    executable "^4.1.1"
-    extract-zip "^1.7.0"
-    fs-extra "^9.0.1"
-    getos "^3.2.1"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.3.2"
-    lazy-ass "^1.6.0"
-    listr "^0.14.3"
-    lodash "^4.17.19"
-    log-symbols "^4.0.0"
-    minimist "^1.2.5"
-    moment "^2.27.0"
-    ospath "^1.2.2"
-    pretty-bytes "^5.4.1"
-    ramda "~0.26.1"
-    request-progress "^3.0.0"
-    supports-color "^7.2.0"
-    tmp "~0.2.1"
-    untildify "^4.0.0"
-    url "^0.11.0"
-    yauzl "^2.10.0"
+    "arch" "^2.1.2"
+    "blob-util" "2.0.2"
+    "bluebird" "^3.7.2"
+    "cachedir" "^2.3.0"
+    "chalk" "^4.1.0"
+    "check-more-types" "^2.24.0"
+    "cli-table3" "~0.6.0"
+    "commander" "^5.1.0"
+    "common-tags" "^1.8.0"
+    "debug" "^4.1.1"
+    "eventemitter2" "^6.4.2"
+    "execa" "^4.0.2"
+    "executable" "^4.1.1"
+    "extract-zip" "^1.7.0"
+    "fs-extra" "^9.0.1"
+    "getos" "^3.2.1"
+    "is-ci" "^2.0.0"
+    "is-installed-globally" "^0.3.2"
+    "lazy-ass" "^1.6.0"
+    "listr" "^0.14.3"
+    "lodash" "^4.17.19"
+    "log-symbols" "^4.0.0"
+    "minimist" "^1.2.5"
+    "moment" "^2.27.0"
+    "ospath" "^1.2.2"
+    "pretty-bytes" "^5.4.1"
+    "ramda" "~0.26.1"
+    "request-progress" "^3.0.0"
+    "supports-color" "^7.2.0"
+    "tmp" "~0.2.1"
+    "untildify" "^4.0.0"
+    "url" "^0.11.0"
+    "yauzl" "^2.10.0"
 
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+"d@^1.0.1", "d@1":
+  "resolved" "https://registry.npmjs.org/d/-/d-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
+    "es5-ext" "^0.10.50"
+    "type" "^1.0.1"
 
-damerau-levenshtein@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791"
+"damerau-levenshtein@^1.0.6":
+  "resolved" "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"
+  "version" "1.0.6"
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+"dashdash@^1.12.0":
+  "resolved" "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"
+  "version" "1.14.1"
   dependencies:
-    assert-plus "^1.0.0"
+    "assert-plus" "^1.0.0"
 
-data-urls@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
+"data-urls@^2.0.0":
+  "resolved" "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    abab "^2.0.3"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
+    "abab" "^2.0.3"
+    "whatwg-mimetype" "^2.3.0"
+    "whatwg-url" "^8.0.0"
 
-date-fns@^1.27.2:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
+"date-fns@^1.27.2":
+  "resolved" "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz"
+  "version" "1.30.1"
 
-dateformat@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+"date-now@^0.1.4":
+  "resolved" "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
+  "version" "0.1.4"
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+"dateformat@^3.0.2":
+  "resolved" "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"
+  "version" "3.0.3"
+
+"debug@^2.2.0":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+  "version" "2.6.9"
   dependencies:
-    ms "2.0.0"
+    "ms" "2.0.0"
 
-debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+"debug@^2.3.3":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+  "version" "2.6.9"
   dependencies:
-    ms "^2.1.1"
+    "ms" "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
+"debug@^2.6.0":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+  "version" "2.6.9"
   dependencies:
-    ms "2.1.2"
+    "ms" "2.0.0"
 
-debug@^4.3.0, debug@~4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+"debug@^2.6.9":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+  "version" "2.6.9"
   dependencies:
-    ms "2.1.2"
+    "ms" "2.0.0"
 
-decamelize@^1.1.2, decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-decimal.js@^10.2.0:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-
-decompress-response@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986"
+"debug@^3.0.0":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"
+  "version" "3.2.6"
   dependencies:
-    mimic-response "^2.0.0"
+    "ms" "^2.1.1"
 
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-
-deep-diff@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-1.0.2.tgz#afd3d1f749115be965e89c63edc7abb1506b9c26"
-
-deep-equal@^1.0.1, deep-equal@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
+"debug@^3.1.0":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"
+  "version" "3.2.6"
   dependencies:
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.1"
-    is-regex "^1.0.4"
-    object-is "^1.0.1"
-    object-keys "^1.1.1"
-    regexp.prototype.flags "^1.2.0"
+    "ms" "^2.1.1"
 
-deep-is@^0.1.3, deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-
-deep-object-diff@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
-
-deepmerge@^4.0.0, deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-
-default-gateway@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+"debug@^3.1.1":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"
+  "version" "3.2.6"
   dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
+    "ms" "^2.1.1"
 
-define-properties@^1.1.2, define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+"debug@^3.2.5":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"
+  "version" "3.2.6"
   dependencies:
-    object-keys "^1.0.12"
+    "ms" "^2.1.1"
 
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+"debug@^4.0.1", "debug@^4.1.0", "debug@^4.1.1", "debug@4":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"
+  "version" "4.2.0"
   dependencies:
-    is-descriptor "^0.1.0"
+    "ms" "2.1.2"
 
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+"debug@^4.3.0":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"
+  "version" "4.3.1"
   dependencies:
-    is-descriptor "^1.0.0"
+    "ms" "2.1.2"
 
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+"debug@~4.3.1":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"
+  "version" "4.3.1"
   dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
+    "ms" "2.1.2"
 
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+"debug@2.6.9":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+  "version" "2.6.9"
+  dependencies:
+    "ms" "2.0.0"
+
+"debug@3.2.6":
+  "resolved" "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"
+  "version" "3.2.6"
+  dependencies:
+    "ms" "^2.1.1"
+
+"decamelize-keys@^1.1.0":
+  "resolved" "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"
+  "version" "1.1.0"
+  dependencies:
+    "decamelize" "^1.1.0"
+    "map-obj" "^1.0.0"
+
+"decamelize@^1.1.0", "decamelize@^1.2.0":
+  "resolved" "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
+  "version" "1.2.0"
+
+"decimal.js@^10.2.0":
+  "resolved" "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz"
+  "version" "10.2.1"
+
+"decode-uri-component@^0.2.0":
+  "resolved" "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"
+  "version" "0.2.0"
+
+"decompress-response@^4.2.1":
+  "resolved" "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz"
+  "version" "4.2.1"
+  dependencies:
+    "mimic-response" "^2.0.0"
+
+"dedent@^0.7.0":
+  "resolved" "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"
+  "version" "0.7.0"
+
+"deep-diff@^1.0.2":
+  "resolved" "https://registry.npmjs.org/deep-diff/-/deep-diff-1.0.2.tgz"
+  "version" "1.0.2"
+
+"deep-equal@^1.0.1", "deep-equal@^1.1.1":
+  "resolved" "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"
+  "version" "1.1.1"
+  dependencies:
+    "is-arguments" "^1.0.4"
+    "is-date-object" "^1.0.1"
+    "is-regex" "^1.0.4"
+    "object-is" "^1.0.1"
+    "object-keys" "^1.1.1"
+    "regexp.prototype.flags" "^1.2.0"
+
+"deep-is@^0.1.3", "deep-is@~0.1.3":
+  "resolved" "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
+  "version" "0.1.3"
+
+"deep-object-diff@^1.1.0":
+  "resolved" "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.0.tgz"
+  "version" "1.1.0"
+
+"deepmerge@^4.0.0", "deepmerge@^4.2.2":
+  "resolved" "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"
+  "version" "4.2.2"
+
+"default-gateway@^4.2.0":
+  "resolved" "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"
+  "version" "4.2.0"
+  dependencies:
+    "execa" "^1.0.0"
+    "ip-regex" "^2.1.0"
+
+"define-properties@^1.1.2", "define-properties@^1.1.3":
+  "resolved" "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"
+  "version" "1.1.3"
+  dependencies:
+    "object-keys" "^1.0.12"
+
+"define-property@^0.2.5":
+  "resolved" "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"
+  "version" "0.2.5"
+  dependencies:
+    "is-descriptor" "^0.1.0"
+
+"define-property@^1.0.0":
+  "resolved" "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"
+  "version" "1.0.0"
+  dependencies:
+    "is-descriptor" "^1.0.0"
+
+"define-property@^2.0.2":
+  "resolved" "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"
+  "version" "2.0.2"
+  dependencies:
+    "is-descriptor" "^1.0.2"
+    "isobject" "^3.0.1"
+
+"del@^4.1.1":
+  "resolved" "https://registry.npmjs.org/del/-/del-4.1.1.tgz"
+  "version" "4.1.1"
   dependencies:
     "@types/glob" "^7.1.1"
-    globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
+    "globby" "^6.1.0"
+    "is-path-cwd" "^2.0.0"
+    "is-path-in-cwd" "^2.0.0"
+    "p-map" "^2.0.0"
+    "pify" "^4.0.1"
+    "rimraf" "^2.6.3"
 
-del@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"
+"del@^5.0.0":
+  "resolved" "https://registry.npmjs.org/del/-/del-5.1.0.tgz"
+  "version" "5.1.0"
   dependencies:
-    globby "^10.0.1"
-    graceful-fs "^4.2.2"
-    is-glob "^4.0.1"
-    is-path-cwd "^2.2.0"
-    is-path-inside "^3.0.1"
-    p-map "^3.0.0"
-    rimraf "^3.0.0"
-    slash "^3.0.0"
+    "globby" "^10.0.1"
+    "graceful-fs" "^4.2.2"
+    "is-glob" "^4.0.1"
+    "is-path-cwd" "^2.2.0"
+    "is-path-inside" "^3.0.1"
+    "p-map" "^3.0.0"
+    "rimraf" "^3.0.0"
+    "slash" "^3.0.0"
 
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+"delayed-stream@~1.0.0":
+  "resolved" "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+  "version" "1.0.0"
 
-delegate@^3.1.2:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
+"delegate@^3.1.2":
+  "resolved" "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz"
+  "version" "3.2.0"
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+"delegates@^1.0.0":
+  "resolved" "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
+  "version" "1.0.0"
 
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+"depd@~1.1.2":
+  "resolved" "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
+  "version" "1.1.2"
 
-des.js@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+"des.js@^1.0.0":
+  "resolved" "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
+    "inherits" "^2.0.1"
+    "minimalistic-assert" "^1.0.0"
 
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+"destroy@~1.0.4":
+  "resolved" "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"
+  "version" "1.0.4"
 
-detab@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.3.tgz#33e5dd74d230501bd69985a0d2b9a3382699a130"
+"detab@2.0.3":
+  "resolved" "https://registry.npmjs.org/detab/-/detab-2.0.3.tgz"
+  "version" "2.0.3"
   dependencies:
-    repeat-string "^1.5.4"
+    "repeat-string" "^1.5.4"
 
-detect-newline@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+"detect-newline@^3.0.0":
+  "resolved" "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz"
+  "version" "3.1.0"
 
-detect-node-es@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.0.0.tgz#c0318b9e539a5256ca780dd9575c9345af05b8ed"
+"detect-node-es@^1.0.0":
+  "resolved" "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.0.0.tgz"
+  "version" "1.0.0"
 
-detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+"detect-node@^2.0.4":
+  "resolved" "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz"
+  "version" "2.0.4"
 
-detect-port-alt@1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
+"detect-port-alt@1.1.6":
+  "resolved" "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz"
+  "version" "1.1.6"
   dependencies:
-    address "^1.0.1"
-    debug "^2.6.0"
+    "address" "^1.0.1"
+    "debug" "^2.6.0"
 
-detect-port@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1"
+"detect-port@^1.3.0":
+  "resolved" "https://registry.npmjs.org/detect-port/-/detect-port-1.3.0.tgz"
+  "version" "1.3.0"
   dependencies:
-    address "^1.0.1"
-    debug "^2.6.0"
+    "address" "^1.0.1"
+    "debug" "^2.6.0"
 
-diff-sequences@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
+"diff-sequences@^24.9.0":
+  "resolved" "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz"
+  "version" "24.9.0"
 
-diff-sequences@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
+"diff-sequences@^25.2.6":
+  "resolved" "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz"
+  "version" "25.2.6"
 
-diff-sequences@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.5.0.tgz#ef766cf09d43ed40406611f11c6d8d9dd8b2fefd"
+"diff-sequences@^26.5.0":
+  "resolved" "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz"
+  "version" "26.5.0"
 
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+"diff@^4.0.1":
+  "resolved" "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"
+  "version" "4.0.2"
 
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+"diff@3.5.0":
+  "resolved" "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"
+  "version" "3.5.0"
 
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+"diffie-hellman@^5.0.0":
+  "resolved" "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"
+  "version" "5.0.3"
   dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
+    "bn.js" "^4.1.0"
+    "miller-rabin" "^4.0.0"
+    "randombytes" "^2.0.0"
 
-dir-glob@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+"dir-glob@^3.0.1":
+  "resolved" "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    arrify "^1.0.1"
-    path-type "^3.0.0"
+    "path-type" "^4.0.0"
 
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+"dir-glob@2.0.0":
+  "resolved" "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    path-type "^4.0.0"
+    "arrify" "^1.0.1"
+    "path-type" "^3.0.0"
 
-dnd-core@^9.5.1:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-9.5.1.tgz#e9ec02d33529b68fa528865704d40ac4b14f2baf"
+"dnd-core@^9.5.1":
+  "resolved" "https://registry.npmjs.org/dnd-core/-/dnd-core-9.5.1.tgz"
+  "version" "9.5.1"
   dependencies:
     "@types/asap" "^2.0.0"
     "@types/invariant" "^2.2.30"
-    asap "^2.0.6"
-    invariant "^2.2.4"
-    redux "^4.0.4"
+    "asap" "^2.0.6"
+    "invariant" "^2.2.4"
+    "redux" "^4.0.4"
 
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+"dns-equal@^1.0.0":
+  "resolved" "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"
+  "version" "1.0.0"
 
-dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+"dns-packet@^1.3.1":
+  "resolved" "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz"
+  "version" "1.3.4"
   dependencies:
-    ip "^1.1.0"
-    safe-buffer "^5.0.1"
+    "ip" "^1.1.0"
+    "safe-buffer" "^5.0.1"
 
-dns-txt@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+"dns-txt@^2.0.2":
+  "resolved" "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    buffer-indexof "^1.0.0"
+    "buffer-indexof" "^1.0.0"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+"doctrine@^2.1.0":
+  "resolved" "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
+    "esutils" "^2.0.2"
 
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+"doctrine@^3.0.0":
+  "resolved" "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    esutils "^2.0.2"
+    "esutils" "^2.0.2"
 
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+"doctrine@1.5.0":
+  "resolved" "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz"
+  "version" "1.5.0"
   dependencies:
-    esutils "^2.0.2"
+    "esutils" "^2.0.2"
+    "isarray" "^1.0.0"
 
-doctypes@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+"doctypes@^1.1.0":
+  "resolved" "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"
+  "version" "1.1.0"
 
-dom-accessibility-api@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz#b06d059cdd4a4ad9a79275f9d414a5c126241166"
-  integrity sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ==
+"dom-accessibility-api@^0.5.4":
+  "resolved" "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz"
+  "version" "0.5.4"
 
-dom-converter@^0.2:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
+"dom-converter@^0.2":
+  "resolved" "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"
+  "version" "0.2.0"
   dependencies:
-    utila "~0.4"
+    "utila" "~0.4"
 
-dom-css@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/dom-css/-/dom-css-2.1.0.tgz#fdbc2d5a015d0a3e1872e11472bbd0e7b9e6a202"
+"dom-css@^2.0.0":
+  "resolved" "https://registry.npmjs.org/dom-css/-/dom-css-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    add-px-to-style "1.0.0"
-    prefix-style "2.0.1"
-    to-camel-case "1.0.0"
+    "add-px-to-style" "1.0.0"
+    "prefix-style" "2.0.1"
+    "to-camel-case" "1.0.0"
 
-dom-helpers@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
+"dom-helpers@^3.4.0":
+  "resolved" "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz"
+  "version" "3.4.0"
   dependencies:
     "@babel/runtime" "^7.1.2"
 
-dom-helpers@^5.0.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b"
+"dom-helpers@^5.0.1":
+  "resolved" "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.0.tgz"
+  "version" "5.2.0"
   dependencies:
     "@babel/runtime" "^7.8.7"
-    csstype "^3.0.2"
+    "csstype" "^3.0.2"
 
-dom-serializer@0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+"dom-serializer@0":
+  "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"
+  "version" "0.2.2"
   dependencies:
-    domelementtype "^2.0.1"
-    entities "^2.0.0"
+    "domelementtype" "^2.0.1"
+    "entities" "^2.0.0"
 
-dom-walk@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
+"dom-walk@^0.1.0":
+  "resolved" "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz"
+  "version" "0.1.2"
 
-dom4@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/dom4/-/dom4-2.1.5.tgz#f98a94eb67b340f0fa5b42b0ee9c38cda035428e"
+"dom4@^2.1.5":
+  "resolved" "https://registry.npmjs.org/dom4/-/dom4-2.1.5.tgz"
+  "version" "2.1.5"
 
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+"domain-browser@^1.1.1":
+  "resolved" "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"
+  "version" "1.2.0"
 
-domelementtype@1, domelementtype@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+"domelementtype@^1.3.1", "domelementtype@1":
+  "resolved" "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"
+  "version" "1.3.1"
 
-domelementtype@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
+"domelementtype@^2.0.1":
+  "resolved" "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz"
+  "version" "2.0.2"
 
-domexception@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
+"domexception@^2.0.1":
+  "resolved" "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    webidl-conversions "^5.0.0"
+    "webidl-conversions" "^5.0.0"
 
-domhandler@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+"domhandler@^2.3.0":
+  "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"
+  "version" "2.4.2"
   dependencies:
-    domelementtype "1"
+    "domelementtype" "1"
 
-domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+"domhandler@2.3":
+  "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
+  "version" "2.3.0"
   dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+    "domelementtype" "1"
 
-domutils@^1.5.1, domutils@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+"domutils@^1.5.1":
+  "resolved" "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"
+  "version" "1.7.0"
   dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+    "dom-serializer" "0"
+    "domelementtype" "1"
 
-dot-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
+"domutils@^1.7.0":
+  "resolved" "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"
+  "version" "1.7.0"
   dependencies:
-    no-case "^3.0.3"
-    tslib "^1.10.0"
+    "dom-serializer" "0"
+    "domelementtype" "1"
 
-dot-prop@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+"domutils@1.5", "domutils@1.5.1":
+  "resolved" "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
+  "version" "1.5.1"
   dependencies:
-    is-obj "^2.0.0"
+    "dom-serializer" "0"
+    "domelementtype" "1"
 
-dotenv-defaults@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-1.1.1.tgz#032c024f4b5906d9990eb06d722dc74cc60ec1bd"
+"dot-case@^3.0.3":
+  "resolved" "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz"
+  "version" "3.0.3"
   dependencies:
-    dotenv "^6.2.0"
+    "no-case" "^3.0.3"
+    "tslib" "^1.10.0"
 
-dotenv-expand@5.1.0, dotenv-expand@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
-
-dotenv-webpack@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.8.0.tgz#7ca79cef2497dd4079d43e81e0796bc9d0f68a5e"
+"dot-prop@^5.2.0":
+  "resolved" "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz"
+  "version" "5.3.0"
   dependencies:
-    dotenv-defaults "^1.0.2"
+    "is-obj" "^2.0.0"
 
-dotenv@8.2.0, dotenv@^8.0.0, dotenv@^8.1.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
-
-dotenv@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
-
-downloadjs@^1.4.7:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c"
-
-draft-js@^0.11.7:
-  version "0.11.7"
-  resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.11.7.tgz#be293aaa255c46d8a6647f3860aa4c178484a206"
-  integrity sha512-ne7yFfN4sEL82QPQEn80xnADR8/Q6ALVworbC5UOSzOvjffmYfFsr3xSZtxbIirti14R7Y33EZC5rivpLgIbsg==
+"dotenv-defaults@^1.0.2":
+  "resolved" "https://registry.npmjs.org/dotenv-defaults/-/dotenv-defaults-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
-    fbjs "^2.0.0"
-    immutable "~3.7.4"
-    object-assign "^4.1.1"
+    "dotenv" "^6.2.0"
 
-duplexer@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+"dotenv-expand@^5.1.0", "dotenv-expand@5.1.0":
+  "resolved" "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz"
+  "version" "5.1.0"
 
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+"dotenv-webpack@^1.7.0":
+  "resolved" "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-1.8.0.tgz"
+  "version" "1.8.0"
   dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
+    "dotenv-defaults" "^1.0.2"
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+"dotenv@^6.2.0":
+  "resolved" "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz"
+  "version" "6.2.0"
+
+"dotenv@^8.0.0", "dotenv@^8.1.0", "dotenv@8.2.0":
+  "resolved" "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz"
+  "version" "8.2.0"
+
+"downloadjs@^1.4.7":
+  "resolved" "https://registry.npmjs.org/downloadjs/-/downloadjs-1.4.7.tgz"
+  "version" "1.4.7"
+
+"draft-js@^0.10.1 || ^0.11.0", "draft-js@^0.11.0", "draft-js@^0.11.7":
+  "resolved" "https://registry.npmjs.org/draft-js/-/draft-js-0.11.7.tgz"
+  "version" "0.11.7"
   dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
+    "fbjs" "^2.0.0"
+    "immutable" "~3.7.4"
+    "object-assign" "^4.1.1"
 
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+"duplexer@^0.1.1":
+  "resolved" "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
+  "version" "0.1.2"
 
-ejs@^2.6.1, ejs@^2.7.4:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
-
-ejs@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b"
+"duplexify@^3.4.2", "duplexify@^3.6.0":
+  "resolved" "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"
+  "version" "3.7.1"
   dependencies:
-    jake "^10.6.1"
+    "end-of-stream" "^1.0.0"
+    "inherits" "^2.0.1"
+    "readable-stream" "^2.0.0"
+    "stream-shift" "^1.0.0"
 
-electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.571:
-  version "1.3.579"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.579.tgz#58bf17499de6edf697e1442017d8569bce0d301a"
-
-electron-to-chromium@^1.3.564:
-  version "1.3.584"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.584.tgz#506cf7ba5895aafa8241876ab028654b61fd9ceb"
-
-elegant-spinner@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-
-element-resize-detector@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.1.tgz#b0305194447a4863155e58f13323a0aef30851d1"
+"ecc-jsbn@~0.1.1":
+  "resolved" "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
+  "version" "0.1.2"
   dependencies:
-    batch-processor "1.0.0"
+    "jsbn" "~0.1.0"
+    "safer-buffer" "^2.1.0"
 
-elliptic@^6.5.3:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+"ee-first@1.1.1":
+  "resolved" "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
+  "version" "1.1.1"
+
+"ejs@^2.6.1", "ejs@^2.7.4":
+  "resolved" "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz"
+  "version" "2.7.4"
+
+"ejs@^3.1.5":
+  "resolved" "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz"
+  "version" "3.1.5"
   dependencies:
-    bn.js "^4.11.9"
-    brorand "^1.1.0"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.1"
-    inherits "^2.0.4"
-    minimalistic-assert "^1.0.1"
-    minimalistic-crypto-utils "^1.0.1"
+    "jake" "^10.6.1"
 
-emittery@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
+"electron-to-chromium@^1.3.247", "electron-to-chromium@^1.3.571":
+  "resolved" "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.579.tgz"
+  "version" "1.3.579"
 
-emoji-picker-react@^3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/emoji-picker-react/-/emoji-picker-react-3.4.2.tgz#593179b2fba3de99fae639f4519d25f43c6b8f15"
-  integrity sha512-KFtPFmP0akcb9dHIloJ7Ln/0EARQjjDli9JkKpfWglVpxnMRT2F1FIZQnFeDJoRy2mjsg/KLUKj2nay8qnjv+w==
+"electron-to-chromium@^1.3.564":
+  "resolved" "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.584.tgz"
+  "version" "1.3.584"
+
+"elegant-spinner@^1.0.1":
+  "resolved" "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz"
+  "version" "1.0.1"
+
+"element-resize-detector@^1.2.1":
+  "resolved" "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.1.tgz"
+  "version" "1.2.1"
+  dependencies:
+    "batch-processor" "1.0.0"
+
+"elliptic@^6.5.3":
+  "resolved" "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"
+  "version" "6.5.4"
+  dependencies:
+    "bn.js" "^4.11.9"
+    "brorand" "^1.1.0"
+    "hash.js" "^1.0.0"
+    "hmac-drbg" "^1.0.1"
+    "inherits" "^2.0.4"
+    "minimalistic-assert" "^1.0.1"
+    "minimalistic-crypto-utils" "^1.0.1"
+
+"emittery@^0.7.1":
+  "resolved" "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz"
+  "version" "0.7.2"
+
+"emoji-mart@^3.0.1":
+  "resolved" "https://registry.npmjs.org/emoji-mart/-/emoji-mart-3.0.1.tgz"
+  "version" "3.0.1"
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    "prop-types" "^15.6.0"
+
+"emoji-regex@^7.0.1":
+  "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"
+  "version" "7.0.3"
+
+"emoji-regex@^8.0.0":
+  "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
+  "version" "8.0.0"
+
+"emoji-regex@^9.0.0":
+  "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.0.tgz"
+  "version" "9.2.0"
 
 "emoji-regex@>=6.0.0 <=6.1.1":
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"
+  "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz"
+  "version" "6.1.1"
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+"emojis-list@^2.0.0":
+  "resolved" "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"
+  "version" "2.1.0"
 
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+"emojis-list@^3.0.0":
+  "resolved" "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"
+  "version" "3.0.0"
 
-emoji-regex@^9.0.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.0.tgz#a26da8e832b16a9753309f25e35e3c0efb9a066a"
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-
-emotion-theming@^10.0.19:
-  version "10.0.27"
-  resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.27.tgz#1887baaec15199862c89b1b984b79806f2b9ab10"
+"emotion-theming@^10.0.19":
+  "resolved" "https://registry.npmjs.org/emotion-theming/-/emotion-theming-10.0.27.tgz"
+  "version" "10.0.27"
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@emotion/weak-memoize" "0.2.5"
-    hoist-non-react-statics "^3.3.0"
+    "hoist-non-react-statics" "^3.3.0"
 
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+"encodeurl@~1.0.2":
+  "resolved" "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
+  "version" "1.0.2"
 
-encoding@^0.1.11:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+"encoding@^0.1.11":
+  "resolved" "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"
+  "version" "0.1.13"
   dependencies:
-    iconv-lite "^0.6.2"
+    "iconv-lite" "^0.6.2"
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+"end-of-stream@^1.0.0", "end-of-stream@^1.1.0":
+  "resolved" "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
+  "version" "1.4.4"
   dependencies:
-    once "^1.4.0"
+    "once" "^1.4.0"
 
-endent@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/endent/-/endent-2.0.1.tgz#fb18383a3f37ae3213a5d9f6c4a880d1061eb4c5"
+"endent@^2.0.1":
+  "resolved" "https://registry.npmjs.org/endent/-/endent-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    dedent "^0.7.0"
-    fast-json-parse "^1.0.3"
-    objectorarray "^1.0.4"
+    "dedent" "^0.7.0"
+    "fast-json-parse" "^1.0.3"
+    "objectorarray" "^1.0.4"
 
-engine.io-client@~5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-5.0.0.tgz#65733887c8999d280e1dd7f241779a2c66e9559e"
-  integrity sha512-e6GK0Fqvq45Nu/j7YdIVqXtDPvlsggAcfml3QiEiGdJ1qeh7IQU6knxSN3+yy9BmbnXtIfjo1hK4MFyHKdc9mQ==
+"engine.io-client@~5.0.0":
+  "resolved" "https://registry.npmjs.org/engine.io-client/-/engine.io-client-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    base64-arraybuffer "0.1.4"
-    component-emitter "~1.3.0"
-    debug "~4.3.1"
-    engine.io-parser "~4.0.1"
-    has-cors "1.1.0"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    ws "~7.4.2"
-    yeast "0.1.2"
+    "base64-arraybuffer" "0.1.4"
+    "component-emitter" "~1.3.0"
+    "debug" "~4.3.1"
+    "engine.io-parser" "~4.0.1"
+    "has-cors" "1.1.0"
+    "parseqs" "0.0.6"
+    "parseuri" "0.0.6"
+    "ws" "~7.4.2"
+    "yeast" "0.1.2"
 
-engine.io-parser@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.2.tgz#e41d0b3fb66f7bf4a3671d2038a154024edb501e"
-  integrity sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg==
+"engine.io-parser@~4.0.1":
+  "resolved" "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    base64-arraybuffer "0.1.4"
+    "base64-arraybuffer" "0.1.4"
 
-enhanced-resolve@^2.2.2:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz#a115c32504b6302e85a76269d7a57ccdd962e359"
+"enhanced-resolve@^2.2.2":
+  "resolved" "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz"
+  "version" "2.3.0"
   dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.3.0"
-    object-assign "^4.0.1"
-    tapable "^0.2.3"
+    "graceful-fs" "^4.1.2"
+    "memory-fs" "^0.3.0"
+    "object-assign" "^4.0.1"
+    "tapable" "^0.2.3"
 
-enhanced-resolve@^4.0.0, enhanced-resolve@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+"enhanced-resolve@^4.0.0", "enhanced-resolve@^4.3.0":
+  "resolved" "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"
+  "version" "4.3.0"
   dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.5.0"
-    tapable "^1.0.0"
+    "graceful-fs" "^4.1.2"
+    "memory-fs" "^0.5.0"
+    "tapable" "^1.0.0"
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+"enquirer@^2.3.5":
+  "resolved" "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"
+  "version" "2.3.6"
   dependencies:
-    ansi-colors "^4.1.1"
+    "ansi-colors" "^4.1.1"
 
-entities@^1.1.1, entities@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+"entities@^1.1.1", "entities@^1.1.2":
+  "resolved" "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"
+  "version" "1.1.2"
 
-entities@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
+"entities@^2.0.0":
+  "resolved" "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz"
+  "version" "2.0.3"
 
-errno@^0.1.3, errno@~0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+"entities@1.0":
+  "resolved" "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
+  "version" "1.0.0"
+
+"env-paths@^2.2.0":
+  "resolved" "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"
+  "version" "2.2.1"
+
+"errno@^0.1.3", "errno@~0.1.7":
+  "resolved" "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"
+  "version" "0.1.7"
   dependencies:
-    prr "~1.0.1"
+    "prr" "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+"error-ex@^1.2.0", "error-ex@^1.3.1":
+  "resolved" "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
+  "version" "1.3.2"
   dependencies:
-    is-arrayish "^0.2.1"
+    "is-arrayish" "^0.2.1"
 
-error-stack-parser@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8"
+"error-stack-parser@^2.0.6":
+  "resolved" "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz"
+  "version" "2.0.6"
   dependencies:
-    stackframe "^1.1.1"
+    "stackframe" "^1.1.1"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4, es-abstract@^1.17.5:
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
+"es-abstract@^1.17.0", "es-abstract@^1.17.0-next.0", "es-abstract@^1.17.0-next.1", "es-abstract@^1.17.2", "es-abstract@^1.17.4", "es-abstract@^1.17.5":
+  "resolved" "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz"
+  "version" "1.17.7"
   dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
+    "es-to-primitive" "^1.2.1"
+    "function-bind" "^1.1.1"
+    "has" "^1.0.3"
+    "has-symbols" "^1.0.1"
+    "is-callable" "^1.2.2"
+    "is-regex" "^1.1.1"
+    "object-inspect" "^1.8.0"
+    "object-keys" "^1.1.1"
+    "object.assign" "^4.1.1"
+    "string.prototype.trimend" "^1.0.1"
+    "string.prototype.trimstart" "^1.0.1"
 
-es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
+"es-abstract@^1.18.0-next.0":
+  "resolved" "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz"
+  "version" "1.18.0-next.1"
   dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
+    "es-to-primitive" "^1.2.1"
+    "function-bind" "^1.1.1"
+    "has" "^1.0.3"
+    "has-symbols" "^1.0.1"
+    "is-callable" "^1.2.2"
+    "is-negative-zero" "^2.0.0"
+    "is-regex" "^1.1.1"
+    "object-inspect" "^1.8.0"
+    "object-keys" "^1.1.1"
+    "object.assign" "^4.1.1"
+    "string.prototype.trimend" "^1.0.1"
+    "string.prototype.trimstart" "^1.0.1"
 
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-
-es-get-iterator@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8"
+"es-abstract@^1.18.0-next.1":
+  "resolved" "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz"
+  "version" "1.18.0-next.1"
   dependencies:
-    es-abstract "^1.17.4"
-    has-symbols "^1.0.1"
-    is-arguments "^1.0.4"
-    is-map "^2.0.1"
-    is-set "^2.0.1"
-    is-string "^1.0.5"
-    isarray "^2.0.5"
+    "es-to-primitive" "^1.2.1"
+    "function-bind" "^1.1.1"
+    "has" "^1.0.3"
+    "has-symbols" "^1.0.1"
+    "is-callable" "^1.2.2"
+    "is-negative-zero" "^2.0.0"
+    "is-regex" "^1.1.1"
+    "object-inspect" "^1.8.0"
+    "object-keys" "^1.1.1"
+    "object.assign" "^4.1.1"
+    "string.prototype.trimend" "^1.0.1"
+    "string.prototype.trimstart" "^1.0.1"
 
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+"es-array-method-boxes-properly@^1.0.0":
+  "resolved" "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"
+  "version" "1.0.0"
+
+"es-get-iterator@^1.0.2":
+  "resolved" "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
+    "es-abstract" "^1.17.4"
+    "has-symbols" "^1.0.1"
+    "is-arguments" "^1.0.4"
+    "is-map" "^2.0.1"
+    "is-set" "^2.0.1"
+    "is-string" "^1.0.5"
+    "isarray" "^2.0.5"
 
-es5-ext@^0.10.35, es5-ext@^0.10.50:
-  version "0.10.53"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
+"es-to-primitive@^1.2.1":
+  "resolved" "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"
+  "version" "1.2.1"
   dependencies:
-    es6-iterator "~2.0.3"
-    es6-symbol "~3.1.3"
-    next-tick "~1.0.0"
+    "is-callable" "^1.1.4"
+    "is-date-object" "^1.0.1"
+    "is-symbol" "^1.0.2"
 
-es5-shim@^4.5.13:
-  version "4.5.14"
-  resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.14.tgz#90009e1019d0ea327447cb523deaff8fe45697ef"
-
-es6-error@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
-
-es6-iterator@2.0.3, es6-iterator@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+"es5-ext@^0.10.35", "es5-ext@^0.10.50":
+  "resolved" "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"
+  "version" "0.10.53"
   dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
+    "es6-iterator" "~2.0.3"
+    "es6-symbol" "~3.1.3"
+    "next-tick" "~1.0.0"
 
-es6-shim@^0.35.5:
-  version "0.35.5"
-  resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.5.tgz#46f59dc0a84a1c5029e8ff1166ca0a902077a9ab"
+"es5-shim@^4.5.13":
+  "resolved" "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.14.tgz"
+  "version" "4.5.14"
 
-es6-symbol@^3.1.1, es6-symbol@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+"es6-error@^4.1.1":
+  "resolved" "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz"
+  "version" "4.1.1"
+
+"es6-iterator@~2.0.3", "es6-iterator@2.0.3":
+  "resolved" "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"
+  "version" "2.0.3"
   dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
+    "d" "1"
+    "es5-ext" "^0.10.35"
+    "es6-symbol" "^3.1.1"
 
-escalade@^3.0.2, escalade@^3.1.0, escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+"es6-shim@^0.35.5":
+  "resolved" "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.5.tgz"
+  "version" "0.35.5"
 
-escape-html@^1.0.3, escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
-
-escodegen@^1.12.0, escodegen@^1.14.1:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+"es6-symbol@^3.1.1", "es6-symbol@~3.1.3":
+  "resolved" "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"
+  "version" "3.1.3"
   dependencies:
-    esprima "^4.0.1"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
+    "d" "^1.0.1"
+    "ext" "^1.1.2"
+
+"escalade@^3.0.2", "escalade@^3.1.0", "escalade@^3.1.1":
+  "resolved" "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
+  "version" "3.1.1"
+
+"escape-html@^1.0.3", "escape-html@~1.0.3":
+  "resolved" "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
+  "version" "1.0.3"
+
+"escape-string-regexp@^1.0.2", "escape-string-regexp@^1.0.5", "escape-string-regexp@1.0.5":
+  "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+  "version" "1.0.5"
+
+"escape-string-regexp@^2.0.0":
+  "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"
+  "version" "2.0.0"
+
+"escape-string-regexp@2.0.0":
+  "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"
+  "version" "2.0.0"
+
+"escodegen@^1.12.0", "escodegen@^1.14.1":
+  "resolved" "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz"
+  "version" "1.14.3"
+  dependencies:
+    "esprima" "^4.0.1"
+    "estraverse" "^4.2.0"
+    "esutils" "^2.0.2"
+    "optionator" "^0.8.1"
   optionalDependencies:
-    source-map "~0.6.1"
+    "source-map" "~0.6.1"
 
-eslint-config-prettier@^6.12.0:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz#9eb2bccff727db1c52104f0b49e87ea46605a0d2"
+"eslint-config-prettier@^6.12.0":
+  "resolved" "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz"
+  "version" "6.12.0"
   dependencies:
-    get-stdin "^6.0.0"
+    "get-stdin" "^6.0.0"
 
-eslint-config-react-app@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-6.0.0.tgz#ccff9fc8e36b322902844cbd79197982be355a0e"
+"eslint-config-react-app@^6.0.0":
+  "resolved" "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    confusing-browser-globals "^1.0.10"
+    "confusing-browser-globals" "^1.0.10"
 
-eslint-config-react@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/eslint-config-react/-/eslint-config-react-1.1.7.tgz#a0918d0fc47d0e9bd161a47308021da85d2585b3"
+"eslint-config-react@^1.1.7":
+  "resolved" "https://registry.npmjs.org/eslint-config-react/-/eslint-config-react-1.1.7.tgz"
+  "version" "1.1.7"
 
-eslint-import-resolver-node@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
+"eslint-import-resolver-node@^0.3.4":
+  "resolved" "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"
+  "version" "0.3.4"
   dependencies:
-    debug "^2.6.9"
-    resolve "^1.13.1"
+    "debug" "^2.6.9"
+    "resolve" "^1.13.1"
 
-eslint-module-utils@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
+"eslint-module-utils@^2.6.0":
+  "resolved" "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"
+  "version" "2.6.0"
   dependencies:
-    debug "^2.6.9"
-    pkg-dir "^2.0.0"
+    "debug" "^2.6.9"
+    "pkg-dir" "^2.0.0"
 
-eslint-plugin-cypress@^2.11.2:
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.11.2.tgz#a8f3fe7ec840f55e4cea37671f93293e6c3e76a0"
+"eslint-plugin-cypress@^2.11.2":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.11.2.tgz"
+  "version" "2.11.2"
   dependencies:
-    globals "^11.12.0"
+    "globals" "^11.12.0"
 
-eslint-plugin-flowtype@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.2.0.tgz#a4bef5dc18f9b2bdb41569a4ab05d73805a3d261"
+"eslint-plugin-flowtype@^5.2.0":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.2.0.tgz"
+  "version" "5.2.0"
   dependencies:
-    lodash "^4.17.15"
-    string-natural-compare "^3.0.1"
+    "lodash" "^4.17.15"
+    "string-natural-compare" "^3.0.1"
 
-eslint-plugin-import@^2.22.1:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
+"eslint-plugin-import@^2.22.0", "eslint-plugin-import@^2.22.1":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"
+  "version" "2.22.1"
   dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flat "^1.2.3"
-    contains-path "^0.1.0"
-    debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.4"
-    eslint-module-utils "^2.6.0"
-    has "^1.0.3"
-    minimatch "^3.0.4"
-    object.values "^1.1.1"
-    read-pkg-up "^2.0.0"
-    resolve "^1.17.0"
-    tsconfig-paths "^3.9.0"
+    "array-includes" "^3.1.1"
+    "array.prototype.flat" "^1.2.3"
+    "contains-path" "^0.1.0"
+    "debug" "^2.6.9"
+    "doctrine" "1.5.0"
+    "eslint-import-resolver-node" "^0.3.4"
+    "eslint-module-utils" "^2.6.0"
+    "has" "^1.0.3"
+    "minimatch" "^3.0.4"
+    "object.values" "^1.1.1"
+    "read-pkg-up" "^2.0.0"
+    "resolve" "^1.17.0"
+    "tsconfig-paths" "^3.9.0"
 
-eslint-plugin-jest@^24.1.0:
-  version "24.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.1.0.tgz#6708037d7602e5288ce877fd0103f329dc978361"
+"eslint-plugin-jest@^24.0.0", "eslint-plugin-jest@^24.1.0":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.1.0.tgz"
+  "version" "24.1.0"
   dependencies:
     "@typescript-eslint/experimental-utils" "^4.0.1"
 
-eslint-plugin-jsx-a11y@^6.3.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz#a2d84caa49756942f42f1ffab9002436391718fd"
+"eslint-plugin-jsx-a11y@^6.3.1":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz"
+  "version" "6.4.1"
   dependencies:
     "@babel/runtime" "^7.11.2"
-    aria-query "^4.2.2"
-    array-includes "^3.1.1"
-    ast-types-flow "^0.0.7"
-    axe-core "^4.0.2"
-    axobject-query "^2.2.0"
-    damerau-levenshtein "^1.0.6"
-    emoji-regex "^9.0.0"
-    has "^1.0.3"
-    jsx-ast-utils "^3.1.0"
-    language-tags "^1.0.5"
+    "aria-query" "^4.2.2"
+    "array-includes" "^3.1.1"
+    "ast-types-flow" "^0.0.7"
+    "axe-core" "^4.0.2"
+    "axobject-query" "^2.2.0"
+    "damerau-levenshtein" "^1.0.6"
+    "emoji-regex" "^9.0.0"
+    "has" "^1.0.3"
+    "jsx-ast-utils" "^3.1.0"
+    "language-tags" "^1.0.5"
 
-eslint-plugin-prettier@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"
+"eslint-plugin-prettier@^3.1.4":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz"
+  "version" "3.1.4"
   dependencies:
-    prettier-linter-helpers "^1.0.0"
+    "prettier-linter-helpers" "^1.0.0"
 
-eslint-plugin-react-hooks@^2.3.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz#4ef5930592588ce171abeb26f400c7fbcbc23cd0"
+"eslint-plugin-react-hooks@^2.3.0":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz"
+  "version" "2.5.1"
 
-eslint-plugin-react-hooks@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
+"eslint-plugin-react-hooks@^4.0.8", "eslint-plugin-react-hooks@^4.2.0":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz"
+  "version" "4.2.0"
 
-eslint-plugin-react@^7.21.3:
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.4.tgz#31060b2e5ff82b12e24a3cc33edb7d12f904775c"
+"eslint-plugin-react@^7.20.3", "eslint-plugin-react@^7.21.5":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz"
+  "version" "7.21.5"
   dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flatmap "^1.2.3"
-    doctrine "^2.1.0"
-    has "^1.0.3"
-    jsx-ast-utils "^2.4.1 || ^3.0.0"
-    object.entries "^1.1.2"
-    object.fromentries "^2.0.2"
-    object.values "^1.1.1"
-    prop-types "^15.7.2"
-    resolve "^1.17.0"
-    string.prototype.matchall "^4.0.2"
+    "array-includes" "^3.1.1"
+    "array.prototype.flatmap" "^1.2.3"
+    "doctrine" "^2.1.0"
+    "has" "^1.0.3"
+    "jsx-ast-utils" "^2.4.1 || ^3.0.0"
+    "object.entries" "^1.1.2"
+    "object.fromentries" "^2.0.2"
+    "object.values" "^1.1.1"
+    "prop-types" "^15.7.2"
+    "resolve" "^1.18.1"
+    "string.prototype.matchall" "^4.0.2"
 
-eslint-plugin-react@^7.21.5:
-  version "7.21.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz#50b21a412b9574bfe05b21db176e8b7b3b15bff3"
+"eslint-plugin-react@^7.21.3":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.21.4.tgz"
+  "version" "7.21.4"
   dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flatmap "^1.2.3"
-    doctrine "^2.1.0"
-    has "^1.0.3"
-    jsx-ast-utils "^2.4.1 || ^3.0.0"
-    object.entries "^1.1.2"
-    object.fromentries "^2.0.2"
-    object.values "^1.1.1"
-    prop-types "^15.7.2"
-    resolve "^1.18.1"
-    string.prototype.matchall "^4.0.2"
+    "array-includes" "^3.1.1"
+    "array.prototype.flatmap" "^1.2.3"
+    "doctrine" "^2.1.0"
+    "has" "^1.0.3"
+    "jsx-ast-utils" "^2.4.1 || ^3.0.0"
+    "object.entries" "^1.1.2"
+    "object.fromentries" "^2.0.2"
+    "object.values" "^1.1.1"
+    "prop-types" "^15.7.2"
+    "resolve" "^1.17.0"
+    "string.prototype.matchall" "^4.0.2"
 
-eslint-plugin-testing-library@^3.9.2:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.9.2.tgz#ea94048fcc4bf2936588af229d78017c780e9dd6"
+"eslint-plugin-sort-destructure-keys@^1.3.5":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-sort-destructure-keys/-/eslint-plugin-sort-destructure-keys-1.3.5.tgz"
+  "version" "1.3.5"
+  dependencies:
+    "natural-compare-lite" "^1.4.0"
+
+"eslint-plugin-testing-library@^3.9.0", "eslint-plugin-testing-library@^3.9.2":
+  "resolved" "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.9.2.tgz"
+  "version" "3.9.2"
   dependencies:
     "@typescript-eslint/experimental-utils" "^3.10.1"
 
-eslint-scope@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+"eslint-scope@^4.0.3":
+  "resolved" "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
+    "esrecurse" "^4.1.0"
+    "estraverse" "^4.1.1"
 
-eslint-scope@^5.0.0, eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+"eslint-scope@^5.0.0", "eslint-scope@^5.1.1":
+  "resolved" "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
+  "version" "5.1.1"
   dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
+    "esrecurse" "^4.3.0"
+    "estraverse" "^4.1.1"
 
-eslint-utils@^2.0.0, eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+"eslint-utils@^2.0.0", "eslint-utils@^2.1.0":
+  "resolved" "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    "eslint-visitor-keys" "^1.1.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+"eslint-visitor-keys@^1.0.0", "eslint-visitor-keys@^1.1.0", "eslint-visitor-keys@^1.3.0":
+  "resolved" "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
+  "version" "1.3.0"
 
-eslint-visitor-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+"eslint-visitor-keys@^2.0.0":
+  "resolved" "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"
+  "version" "2.0.0"
 
-eslint-webpack-plugin@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.1.0.tgz#6d54f8539897b02f682007eb74fac987965e0b11"
+"eslint-webpack-plugin@^2.1.0":
+  "resolved" "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
     "@types/eslint" "^7.2.0"
-    arrify "^2.0.1"
-    fs-extra "^9.0.1"
-    micromatch "^4.0.2"
-    schema-utils "^2.7.0"
+    "arrify" "^2.0.1"
+    "fs-extra" "^9.0.1"
+    "micromatch" "^4.0.2"
+    "schema-utils" "^2.7.0"
 
-eslint@^7.11.0:
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.12.1.tgz#bd9a81fa67a6cfd51656cdb88812ce49ccec5801"
+"eslint@*", "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0", "eslint@^3 || ^4 || ^5 || ^6 || ^7", "eslint@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", "eslint@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", "eslint@^5 || ^6 || ^7", "eslint@^5.0.0 || ^6.0.0 || ^7.0.0", "eslint@^7.0.0", "eslint@^7.1.0", "eslint@^7.11.0", "eslint@^7.5.0", "eslint@>= 3.2.1", "eslint@>= 4.12.1", "eslint@>=3.14.1", "eslint@>=5", "eslint@>=5.0.0", "eslint@3 - 7":
+  "resolved" "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz"
+  "version" "7.12.1"
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@eslint/eslintrc" "^0.2.1"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    enquirer "^2.3.5"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.0"
-    esquery "^1.2.0"
-    esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    js-yaml "^3.13.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash "^4.17.19"
-    minimatch "^3.0.4"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
-    strip-json-comments "^3.1.0"
-    table "^5.2.3"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
+    "ajv" "^6.10.0"
+    "chalk" "^4.0.0"
+    "cross-spawn" "^7.0.2"
+    "debug" "^4.0.1"
+    "doctrine" "^3.0.0"
+    "enquirer" "^2.3.5"
+    "eslint-scope" "^5.1.1"
+    "eslint-utils" "^2.1.0"
+    "eslint-visitor-keys" "^2.0.0"
+    "espree" "^7.3.0"
+    "esquery" "^1.2.0"
+    "esutils" "^2.0.2"
+    "file-entry-cache" "^5.0.1"
+    "functional-red-black-tree" "^1.0.1"
+    "glob-parent" "^5.0.0"
+    "globals" "^12.1.0"
+    "ignore" "^4.0.6"
+    "import-fresh" "^3.0.0"
+    "imurmurhash" "^0.1.4"
+    "is-glob" "^4.0.0"
+    "js-yaml" "^3.13.1"
+    "json-stable-stringify-without-jsonify" "^1.0.1"
+    "levn" "^0.4.1"
+    "lodash" "^4.17.19"
+    "minimatch" "^3.0.4"
+    "natural-compare" "^1.4.0"
+    "optionator" "^0.9.1"
+    "progress" "^2.0.0"
+    "regexpp" "^3.1.0"
+    "semver" "^7.2.1"
+    "strip-ansi" "^6.0.0"
+    "strip-json-comments" "^3.1.0"
+    "table" "^5.2.3"
+    "text-table" "^0.2.0"
+    "v8-compile-cache" "^2.0.3"
 
-espree@^7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
+"espree@^7.3.0":
+  "resolved" "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz"
+  "version" "7.3.0"
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.3.0"
+    "acorn" "^7.4.0"
+    "acorn-jsx" "^5.2.0"
+    "eslint-visitor-keys" "^1.3.0"
 
-esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+"esprima@^4.0.0", "esprima@^4.0.1", "esprima@~4.0.0":
+  "resolved" "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
+  "version" "4.0.1"
 
-esquery@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+"esquery@^1.2.0":
+  "resolved" "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"
+  "version" "1.3.1"
   dependencies:
-    estraverse "^5.1.0"
+    "estraverse" "^5.1.0"
 
-esrecurse@^4.1.0, esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+"esrecurse@^4.1.0", "esrecurse@^4.3.0":
+  "resolved" "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
+  "version" "4.3.0"
   dependencies:
-    estraverse "^5.2.0"
+    "estraverse" "^5.2.0"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+"estraverse@^4.1.1", "estraverse@^4.2.0":
+  "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
+  "version" "4.3.0"
 
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+"estraverse@^5.1.0":
+  "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"
+  "version" "5.2.0"
 
-estree-walker@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
+"estraverse@^5.2.0":
+  "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"
+  "version" "5.2.0"
 
-estree-walker@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
+"estree-walker@^0.6.1":
+  "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"
+  "version" "0.6.1"
 
-estree-walker@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.1.tgz#f8e030fb21cefa183b44b7ad516b747434e7a3e0"
+"estree-walker@^1.0.1":
+  "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"
+  "version" "1.0.1"
 
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+"estree-walker@^2.0.1":
+  "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.1.tgz"
+  "version" "2.0.1"
 
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+"esutils@^2.0.2":
+  "resolved" "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
+  "version" "2.0.3"
 
-eventemitter2@^6.4.2:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.3.tgz#35c563619b13f3681e7eb05cbdaf50f56ba58820"
+"etag@~1.8.1":
+  "resolved" "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
+  "version" "1.8.1"
 
-eventemitter3@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+"eventemitter2@^6.4.2":
+  "resolved" "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.3.tgz"
+  "version" "6.4.3"
 
-events@^1.1.0, events@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+"eventemitter3@^4.0.0":
+  "resolved" "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
+  "version" "4.0.7"
 
-events@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
+"events@^1.1.0", "events@^1.1.1":
+  "resolved" "https://registry.npmjs.org/events/-/events-1.1.1.tgz"
+  "version" "1.1.1"
 
-events@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+"events@^3.0.0":
+  "resolved" "https://registry.npmjs.org/events/-/events-3.2.0.tgz"
+  "version" "3.2.0"
 
-eventsource@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
+"events@^3.3.0":
+  "resolved" "https://registry.npmjs.org/events/-/events-3.3.0.tgz"
+  "version" "3.3.0"
+
+"eventsource@^1.0.7":
+  "resolved" "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"
+  "version" "1.0.7"
   dependencies:
-    original "^1.0.0"
+    "original" "^1.0.0"
 
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+"evp_bytestokey@^1.0.0", "evp_bytestokey@^1.0.3":
+  "resolved" "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"
+  "version" "1.0.3"
   dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
+    "md5.js" "^1.3.4"
+    "safe-buffer" "^5.1.1"
 
-exec-sh@^0.3.2:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+"exec-sh@^0.3.2":
+  "resolved" "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz"
+  "version" "0.3.4"
 
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+"execa@^1.0.0":
+  "resolved" "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
+    "cross-spawn" "^6.0.0"
+    "get-stream" "^4.0.0"
+    "is-stream" "^1.1.0"
+    "npm-run-path" "^2.0.0"
+    "p-finally" "^1.0.0"
+    "signal-exit" "^3.0.0"
+    "strip-eof" "^1.0.0"
 
-execa@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
+"execa@^2.0.3":
+  "resolved" "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^3.0.0"
-    onetime "^5.1.0"
-    p-finally "^2.0.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
+    "cross-spawn" "^7.0.0"
+    "get-stream" "^5.0.0"
+    "is-stream" "^2.0.0"
+    "merge-stream" "^2.0.0"
+    "npm-run-path" "^3.0.0"
+    "onetime" "^5.1.0"
+    "p-finally" "^2.0.0"
+    "signal-exit" "^3.0.2"
+    "strip-final-newline" "^2.0.0"
 
-execa@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+"execa@^4.0.0":
+  "resolved" "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
+    "cross-spawn" "^7.0.0"
+    "get-stream" "^5.0.0"
+    "human-signals" "^1.1.1"
+    "is-stream" "^2.0.0"
+    "merge-stream" "^2.0.0"
+    "npm-run-path" "^4.0.0"
+    "onetime" "^5.1.0"
+    "signal-exit" "^3.0.2"
+    "strip-final-newline" "^2.0.0"
 
-execa@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2"
+"execa@^4.0.2":
+  "resolved" "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
+    "cross-spawn" "^7.0.0"
+    "get-stream" "^5.0.0"
+    "human-signals" "^1.1.1"
+    "is-stream" "^2.0.0"
+    "merge-stream" "^2.0.0"
+    "npm-run-path" "^4.0.0"
+    "onetime" "^5.1.0"
+    "signal-exit" "^3.0.2"
+    "strip-final-newline" "^2.0.0"
 
-executable@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
+"executable@^4.1.1":
+  "resolved" "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz"
+  "version" "4.1.1"
   dependencies:
-    pify "^2.2.0"
+    "pify" "^2.2.0"
 
-exifr@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/exifr/-/exifr-6.0.0.tgz#e82af10e158852a1c7e19aea45bceb4cdd486727"
+"exifr@^6.0.0":
+  "resolved" "https://registry.npmjs.org/exifr/-/exifr-6.0.0.tgz"
+  "version" "6.0.0"
 
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+"exit-hook@^1.0.0":
+  "resolved" "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"
+  "version" "1.1.1"
 
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+"exit@^0.1.2", "exit@0.1.2", "exit@0.1.x":
+  "resolved" "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
+  "version" "0.1.2"
 
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+"expand-brackets@^2.1.4":
+  "resolved" "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"
+  "version" "2.1.4"
   dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+    "debug" "^2.3.3"
+    "define-property" "^0.2.5"
+    "extend-shallow" "^2.0.1"
+    "posix-character-classes" "^0.1.0"
+    "regex-not" "^1.0.0"
+    "snapdragon" "^0.8.1"
+    "to-regex" "^3.0.1"
 
-expect@^26.6.0, expect@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.1.tgz#e1e053cdc43b21a452b36fc7cc9401e4603949c1"
+"expect@^26.6.0", "expect@^26.6.1":
+  "resolved" "https://registry.npmjs.org/expect/-/expect-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
-    ansi-styles "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.6.1"
-    jest-message-util "^26.6.1"
-    jest-regex-util "^26.0.0"
+    "ansi-styles" "^4.0.0"
+    "jest-get-type" "^26.3.0"
+    "jest-matcher-utils" "^26.6.1"
+    "jest-message-util" "^26.6.1"
+    "jest-regex-util" "^26.0.0"
 
-express@^4.17.0, express@^4.17.1:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+"express@^4.17.0", "express@^4.17.1":
+  "resolved" "https://registry.npmjs.org/express/-/express-4.17.1.tgz"
+  "version" "4.17.1"
   dependencies:
-    accepts "~1.3.7"
-    array-flatten "1.1.1"
-    body-parser "1.19.0"
-    content-disposition "0.5.3"
-    content-type "~1.0.4"
-    cookie "0.4.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "~1.1.2"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.5"
-    qs "6.7.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.1.2"
-    send "0.17.1"
-    serve-static "1.14.1"
-    setprototypeof "1.1.1"
-    statuses "~1.5.0"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
+    "accepts" "~1.3.7"
+    "array-flatten" "1.1.1"
+    "body-parser" "1.19.0"
+    "content-disposition" "0.5.3"
+    "content-type" "~1.0.4"
+    "cookie" "0.4.0"
+    "cookie-signature" "1.0.6"
+    "debug" "2.6.9"
+    "depd" "~1.1.2"
+    "encodeurl" "~1.0.2"
+    "escape-html" "~1.0.3"
+    "etag" "~1.8.1"
+    "finalhandler" "~1.1.2"
+    "fresh" "0.5.2"
+    "merge-descriptors" "1.0.1"
+    "methods" "~1.1.2"
+    "on-finished" "~2.3.0"
+    "parseurl" "~1.3.3"
+    "path-to-regexp" "0.1.7"
+    "proxy-addr" "~2.0.5"
+    "qs" "6.7.0"
+    "range-parser" "~1.2.1"
+    "safe-buffer" "5.1.2"
+    "send" "0.17.1"
+    "serve-static" "1.14.1"
+    "setprototypeof" "1.1.1"
+    "statuses" "~1.5.0"
+    "type-is" "~1.6.18"
+    "utils-merge" "1.0.1"
+    "vary" "~1.1.2"
 
-ext@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
+"ext@^1.1.2":
+  "resolved" "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"
+  "version" "1.4.0"
   dependencies:
-    type "^2.0.0"
+    "type" "^2.0.0"
 
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+"extend-shallow@^2.0.1":
+  "resolved" "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    is-extendable "^0.1.0"
+    "is-extendable" "^0.1.0"
 
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+"extend-shallow@^3.0.0":
+  "resolved" "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
+    "assign-symbols" "^1.0.0"
+    "is-extendable" "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+"extend-shallow@^3.0.2":
+  "resolved" "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
+    "assign-symbols" "^1.0.0"
+    "is-extendable" "^1.0.1"
 
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+"extend@^3.0.0", "extend@~3.0.2":
+  "resolved" "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
+  "version" "3.0.2"
+
+"external-editor@^3.0.3":
+  "resolved" "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+    "chardet" "^0.7.0"
+    "iconv-lite" "^0.4.24"
+    "tmp" "^0.0.33"
 
-extract-zip@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
+"extglob@^2.0.4":
+  "resolved" "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"
+  "version" "2.0.4"
   dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
-    yauzl "^2.10.0"
+    "array-unique" "^0.3.2"
+    "define-property" "^1.0.0"
+    "expand-brackets" "^2.1.4"
+    "extend-shallow" "^2.0.1"
+    "fragment-cache" "^0.2.1"
+    "regex-not" "^1.0.0"
+    "snapdragon" "^0.8.1"
+    "to-regex" "^3.0.1"
 
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
-factory.ts@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/factory.ts/-/factory.ts-0.5.1.tgz#4bab72d8457078906aa6ab396c0d341e8a3ab382"
-  integrity sha512-jwAq8w7MmxUojIFzKezMwTzDc5QoxcqzAA8+n9A0EAWBje2CRHUeBrW9x/ioV2DRjHgkHX7i0G0ipfDhlatIQw==
+"extract-zip@^1.7.0":
+  "resolved" "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz"
+  "version" "1.7.0"
   dependencies:
-    clone-deep "^4.0.1"
-    source-map-support "^0.5.9"
+    "concat-stream" "^1.6.2"
+    "debug" "^2.6.9"
+    "mkdirp" "^0.5.4"
+    "yauzl" "^2.10.0"
 
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+"extsprintf@^1.2.0":
+  "resolved" "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz"
+  "version" "1.4.0"
 
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+"extsprintf@1.3.0":
+  "resolved" "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"
+  "version" "1.3.0"
 
-fast-diff@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+"factory.ts@^0.5.1":
+  "resolved" "https://registry.npmjs.org/factory.ts/-/factory.ts-0.5.1.tgz"
+  "version" "0.5.1"
+  dependencies:
+    "clone-deep" "^4.0.1"
+    "source-map-support" "^0.5.9"
 
-fast-glob@^2.0.2:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
+"fast-deep-equal@^2.0.1":
+  "resolved" "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"
+  "version" "2.0.1"
+
+"fast-deep-equal@^3.1.1":
+  "resolved" "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
+  "version" "3.1.3"
+
+"fast-diff@^1.1.2":
+  "resolved" "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"
+  "version" "1.2.0"
+
+"fast-glob@^2.0.2":
+  "resolved" "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz"
+  "version" "2.2.7"
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
     "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
+    "glob-parent" "^3.1.0"
+    "is-glob" "^4.0.0"
+    "merge2" "^1.2.3"
+    "micromatch" "^3.1.10"
 
-fast-glob@^3.0.3, fast-glob@^3.1.1:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
+"fast-glob@^3.0.3", "fast-glob@^3.1.1":
+  "resolved" "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"
+  "version" "3.2.4"
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
-    merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
+    "glob-parent" "^5.1.0"
+    "merge2" "^1.3.0"
+    "micromatch" "^4.0.2"
+    "picomatch" "^2.2.1"
 
-fast-json-parse@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d"
+"fast-json-parse@^1.0.3":
+  "resolved" "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz"
+  "version" "1.0.3"
 
-fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+"fast-json-stable-stringify@^2.0.0", "fast-json-stable-stringify@^2.1.0", "fast-json-stable-stringify@2.x":
+  "resolved" "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
+  "version" "2.1.0"
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+"fast-levenshtein@^2.0.6", "fast-levenshtein@~2.0.6":
+  "resolved" "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
+  "version" "2.0.6"
 
-fast-xml-parser@^3.17.5:
-  version "3.17.5"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.17.5.tgz#760bc7755681d2e1d70329c9ac6a1a7cb38b135e"
+"fast-xml-parser@^3.17.5":
+  "resolved" "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.17.5.tgz"
+  "version" "3.17.5"
 
-fastq@^1.6.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
+"fastq@^1.6.0":
+  "resolved" "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz"
+  "version" "1.8.0"
   dependencies:
-    reusify "^1.0.4"
+    "reusify" "^1.0.4"
 
-fault@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13"
+"fault@^1.0.2":
+  "resolved" "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz"
+  "version" "1.0.4"
   dependencies:
-    format "^0.2.0"
+    "format" "^0.2.0"
 
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+"faye-websocket@^0.10.0":
+  "resolved" "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"
+  "version" "0.10.0"
   dependencies:
-    websocket-driver ">=0.5.1"
+    "websocket-driver" ">=0.5.1"
 
-faye-websocket@~0.11.1:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
+"faye-websocket@~0.11.1":
+  "resolved" "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"
+  "version" "0.11.3"
   dependencies:
-    websocket-driver ">=0.5.1"
+    "websocket-driver" ">=0.5.1"
 
-fb-watchman@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+"fb-watchman@^2.0.0":
+  "resolved" "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    bser "2.1.1"
+    "bser" "2.1.1"
 
-fbemitter@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/fbemitter/-/fbemitter-2.1.1.tgz#523e14fdaf5248805bb02f62efc33be703f51865"
+"fbemitter@^2.0.0":
+  "resolved" "https://registry.npmjs.org/fbemitter/-/fbemitter-2.1.1.tgz"
+  "version" "2.1.1"
   dependencies:
-    fbjs "^0.8.4"
+    "fbjs" "^0.8.4"
 
-fbjs-css-vars@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8"
-  integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==
+"fbjs-css-vars@^1.0.0":
+  "resolved" "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz"
+  "version" "1.0.2"
 
-fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.4:
-  version "0.8.17"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
+"fbjs@^0.8.0", "fbjs@^0.8.1", "fbjs@^0.8.4":
+  "resolved" "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz"
+  "version" "0.8.17"
   dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.18"
+    "core-js" "^1.0.0"
+    "isomorphic-fetch" "^2.1.1"
+    "loose-envify" "^1.0.0"
+    "object-assign" "^4.1.0"
+    "promise" "^7.1.1"
+    "setimmediate" "^1.0.5"
+    "ua-parser-js" "^0.7.18"
 
-fbjs@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-2.0.0.tgz#01fb812138d7e31831ed3e374afe27b9169ef442"
-  integrity sha512-8XA8ny9ifxrAWlyhAbexXcs3rRMtxWcs3M0lctLfB49jRDHiaxj+Mo0XxbwE7nKZYzgCFoq64FS+WFd4IycPPQ==
+"fbjs@^2.0.0":
+  "resolved" "https://registry.npmjs.org/fbjs/-/fbjs-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    core-js "^3.6.4"
-    cross-fetch "^3.0.4"
-    fbjs-css-vars "^1.0.0"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.18"
+    "core-js" "^3.6.4"
+    "cross-fetch" "^3.0.4"
+    "fbjs-css-vars" "^1.0.0"
+    "loose-envify" "^1.0.0"
+    "object-assign" "^4.1.0"
+    "promise" "^7.1.1"
+    "setimmediate" "^1.0.5"
+    "ua-parser-js" "^0.7.18"
 
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+"fd-slicer@~1.1.0":
+  "resolved" "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    pend "~1.2.0"
+    "pend" "~1.2.0"
 
-figgy-pudding@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
-  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
+"figgy-pudding@^3.5.1":
+  "resolved" "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz"
+  "version" "3.5.2"
 
-figures@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+"figures@^1.7.0":
+  "resolved" "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"
+  "version" "1.7.0"
   dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
+    "escape-string-regexp" "^1.0.5"
+    "object-assign" "^4.1.0"
 
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+"figures@^2.0.0":
+  "resolved" "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    escape-string-regexp "^1.0.5"
+    "escape-string-regexp" "^1.0.5"
 
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+"figures@^3.0.0":
+  "resolved" "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"
+  "version" "3.2.0"
   dependencies:
-    escape-string-regexp "^1.0.5"
+    "escape-string-regexp" "^1.0.5"
 
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+"file-entry-cache@^5.0.1":
+  "resolved" "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"
+  "version" "5.0.1"
   dependencies:
-    flat-cache "^2.0.1"
+    "flat-cache" "^2.0.1"
 
-file-loader@6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.1.tgz#a6f29dfb3f5933a1c350b2dbaa20ac5be0539baa"
+"file-loader@*", "file-loader@^4.2.0":
+  "resolved" "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz"
+  "version" "4.3.0"
   dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
+    "loader-utils" "^1.2.3"
+    "schema-utils" "^2.5.0"
 
-file-loader@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af"
+"file-loader@6.1.1":
+  "resolved" "https://registry.npmjs.org/file-loader/-/file-loader-6.1.1.tgz"
+  "version" "6.1.1"
   dependencies:
-    loader-utils "^1.2.3"
-    schema-utils "^2.5.0"
+    "loader-utils" "^2.0.0"
+    "schema-utils" "^3.0.0"
 
-file-system-cache@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-1.0.5.tgz#84259b36a2bbb8d3d6eb1021d3132ffe64cfff4f"
+"file-saver@^2.0.0":
+  "resolved" "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz"
+  "version" "2.0.5"
+
+"file-system-cache@^1.0.5":
+  "resolved" "https://registry.npmjs.org/file-system-cache/-/file-system-cache-1.0.5.tgz"
+  "version" "1.0.5"
   dependencies:
-    bluebird "^3.3.5"
-    fs-extra "^0.30.0"
-    ramda "^0.21.0"
+    "bluebird" "^3.3.5"
+    "fs-extra" "^0.30.0"
+    "ramda" "^0.21.0"
 
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+"file-uri-to-path@1.0.0":
+  "resolved" "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
+  "version" "1.0.0"
 
-filelist@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb"
+"filelist@^1.0.1":
+  "resolved" "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    minimatch "^3.0.4"
+    "minimatch" "^3.0.4"
 
-filesize@3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
+"filesize@3.6.1":
+  "resolved" "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz"
+  "version" "3.6.1"
 
-filesize@6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
+"filesize@6.1.0":
+  "resolved" "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz"
+  "version" "6.1.0"
 
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+"fill-range@^4.0.0":
+  "resolved" "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
+    "extend-shallow" "^2.0.1"
+    "is-number" "^3.0.0"
+    "repeat-string" "^1.6.1"
+    "to-regex-range" "^2.1.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+"fill-range@^7.0.1":
+  "resolved" "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
+  "version" "7.0.1"
   dependencies:
-    to-regex-range "^5.0.1"
+    "to-regex-range" "^5.0.1"
 
-finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+"finalhandler@~1.1.2":
+  "resolved" "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"
+  "version" "1.1.2"
   dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
-    unpipe "~1.0.0"
+    "debug" "2.6.9"
+    "encodeurl" "~1.0.2"
+    "escape-html" "~1.0.3"
+    "on-finished" "~2.3.0"
+    "parseurl" "~1.3.3"
+    "statuses" "~1.5.0"
+    "unpipe" "~1.0.0"
 
-find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+"find-cache-dir@^2.0.0", "find-cache-dir@^2.1.0":
+  "resolved" "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    commondir "^1.0.1"
-    make-dir "^2.0.0"
-    pkg-dir "^3.0.0"
+    "commondir" "^1.0.1"
+    "make-dir" "^2.0.0"
+    "pkg-dir" "^3.0.0"
 
-find-cache-dir@^3.0.0, find-cache-dir@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
+"find-cache-dir@^3.0.0", "find-cache-dir@^3.3.1":
+  "resolved" "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz"
+  "version" "3.3.1"
   dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
+    "commondir" "^1.0.1"
+    "make-dir" "^3.0.2"
+    "pkg-dir" "^4.1.0"
 
-find-root@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+"find-root@^1.1.0":
+  "resolved" "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz"
+  "version" "1.1.0"
 
-find-up@3.0.0, find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+"find-up@^2.0.0":
+  "resolved" "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    locate-path "^3.0.0"
+    "locate-path" "^2.0.0"
 
-find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+"find-up@^2.1.0":
+  "resolved" "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
+    "locate-path" "^2.0.0"
 
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+"find-up@^3.0.0", "find-up@3.0.0":
+  "resolved" "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
+    "locate-path" "^3.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+"find-up@^4.0.0":
+  "resolved" "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    locate-path "^2.0.0"
+    "locate-path" "^5.0.0"
+    "path-exists" "^4.0.0"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+"find-up@^4.1.0":
+  "resolved" "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
+    "locate-path" "^5.0.0"
+    "path-exists" "^4.0.0"
 
-flat@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
+"find-up@4.1.0":
+  "resolved" "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    is-buffer "~2.0.3"
+    "locate-path" "^5.0.0"
+    "path-exists" "^4.0.0"
 
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-
-flatten@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
-
-flow-bin@^0.91.0:
-  version "0.91.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.91.0.tgz#f5c89729f74b2ccbd47df6fbfadbdcc89cc1e478"
-
-flow-parser@0.*:
-  version "0.135.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.135.0.tgz#6fa98be0cd4d3b214cc9f121c86a070e312649ce"
-
-flush-write-stream@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+"find-yarn-workspace-root@^2.0.0":
+  "resolved" "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
+    "micromatch" "^4.0.2"
 
-flux@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/flux/-/flux-3.1.3.tgz#d23bed515a79a22d933ab53ab4ada19d05b2f08a"
+"flat-cache@^2.0.1":
+  "resolved" "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    fbemitter "^2.0.0"
-    fbjs "^0.8.0"
+    "flatted" "^2.0.0"
+    "rimraf" "2.6.3"
+    "write" "1.0.3"
 
-focus-lock@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.7.0.tgz#b2bfb0ca7beacc8710a1ff74275fe0dc60a1d88a"
-
-follow-redirects@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
-
-follow-redirects@^1.10.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
-
-for-in@^0.1.3:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-
-for-in@^1.0.1, for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
-for-own@^0.1.3:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+"flat@^4.1.0":
+  "resolved" "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    for-in "^1.0.1"
+    "is-buffer" "~2.0.3"
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+"flatted@^2.0.0":
+  "resolved" "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"
+  "version" "2.0.2"
 
-fork-ts-checker-webpack-plugin@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz#ce1d77190b44d81a761b10b6284a373795e41f0c"
+"flatten@^1.0.2":
+  "resolved" "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz"
+  "version" "1.0.3"
+
+"flow-bin@^0.148.0":
+  "resolved" "https://registry.npmjs.org/flow-bin/-/flow-bin-0.148.0.tgz"
+  "version" "0.148.0"
+
+"flow-parser@0.*":
+  "resolved" "https://registry.npmjs.org/flow-parser/-/flow-parser-0.135.0.tgz"
+  "version" "0.135.0"
+
+"flush-write-stream@^1.0.0":
+  "resolved" "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
-    babel-code-frame "^6.22.0"
-    chalk "^2.4.1"
-    chokidar "^2.0.4"
-    micromatch "^3.1.10"
-    minimatch "^3.0.4"
-    semver "^5.6.0"
-    tapable "^1.0.0"
-    worker-rpc "^0.1.0"
+    "inherits" "^2.0.3"
+    "readable-stream" "^2.3.6"
 
-fork-ts-checker-webpack-plugin@4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5"
+"flux@^3.1.3":
+  "resolved" "https://registry.npmjs.org/flux/-/flux-3.1.3.tgz"
+  "version" "3.1.3"
+  dependencies:
+    "fbemitter" "^2.0.0"
+    "fbjs" "^0.8.0"
+
+"focus-lock@^0.7.0":
+  "resolved" "https://registry.npmjs.org/focus-lock/-/focus-lock-0.7.0.tgz"
+  "version" "0.7.0"
+
+"follow-redirects@^1.0.0":
+  "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz"
+  "version" "1.13.0"
+
+"follow-redirects@^1.10.0":
+  "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz"
+  "version" "1.13.1"
+
+"for-in@^0.1.3":
+  "resolved" "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz"
+  "version" "0.1.8"
+
+"for-in@^1.0.1", "for-in@^1.0.2":
+  "resolved" "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"
+  "version" "1.0.2"
+
+"for-own@^0.1.3":
+  "resolved" "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"
+  "version" "0.1.5"
+  dependencies:
+    "for-in" "^1.0.1"
+
+"forever-agent@~0.6.1":
+  "resolved" "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+  "version" "0.6.1"
+
+"fork-ts-checker-webpack-plugin@1.5.0":
+  "resolved" "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz"
+  "version" "1.5.0"
+  dependencies:
+    "babel-code-frame" "^6.22.0"
+    "chalk" "^2.4.1"
+    "chokidar" "^2.0.4"
+    "micromatch" "^3.1.10"
+    "minimatch" "^3.0.4"
+    "semver" "^5.6.0"
+    "tapable" "^1.0.0"
+    "worker-rpc" "^0.1.0"
+
+"fork-ts-checker-webpack-plugin@4.1.6":
+  "resolved" "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz"
+  "version" "4.1.6"
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    chalk "^2.4.1"
-    micromatch "^3.1.10"
-    minimatch "^3.0.4"
-    semver "^5.6.0"
-    tapable "^1.0.0"
-    worker-rpc "^0.1.0"
+    "chalk" "^2.4.1"
+    "micromatch" "^3.1.10"
+    "minimatch" "^3.0.4"
+    "semver" "^5.6.0"
+    "tapable" "^1.0.0"
+    "worker-rpc" "^0.1.0"
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+"form-data@~2.3.2":
+  "resolved" "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"
+  "version" "2.3.3"
   dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
+    "asynckit" "^0.4.0"
+    "combined-stream" "^1.0.6"
+    "mime-types" "^2.1.12"
 
-format@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
+"format@^0.2.0":
+  "resolved" "https://registry.npmjs.org/format/-/format-0.2.2.tgz"
+  "version" "0.2.2"
 
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+"forwarded@~0.1.2":
+  "resolved" "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"
+  "version" "0.1.2"
 
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+"fragment-cache@^0.2.1":
+  "resolved" "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"
+  "version" "0.2.1"
   dependencies:
-    map-cache "^0.2.2"
+    "map-cache" "^0.2.2"
 
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+"fresh@0.5.2":
+  "resolved" "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
+  "version" "0.5.2"
 
-from2@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+"from2@^2.1.0":
+  "resolved" "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"
+  "version" "2.3.0"
   dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
+    "inherits" "^2.0.1"
+    "readable-stream" "^2.0.0"
 
-fs-extra@^0.30.0:
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
+"fs-extra@^0.30.0":
+  "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"
+  "version" "0.30.0"
   dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
+    "graceful-fs" "^4.1.2"
+    "jsonfile" "^2.1.0"
+    "klaw" "^1.0.0"
+    "path-is-absolute" "^1.0.0"
+    "rimraf" "^2.2.8"
 
-fs-extra@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+"fs-extra@^7.0.0", "fs-extra@^7.0.1":
+  "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"
+  "version" "7.0.1"
   dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
+    "graceful-fs" "^4.1.2"
+    "jsonfile" "^4.0.0"
+    "universalify" "^0.1.0"
 
-fs-extra@^8.0.1, fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+"fs-extra@^8.0.1":
+  "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"
+  "version" "8.1.0"
   dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
+    "graceful-fs" "^4.2.0"
+    "jsonfile" "^4.0.0"
+    "universalify" "^0.1.0"
 
-fs-extra@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
+"fs-extra@^8.1.0":
+  "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"
+  "version" "8.1.0"
   dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^1.0.0"
+    "graceful-fs" "^4.2.0"
+    "jsonfile" "^4.0.0"
+    "universalify" "^0.1.0"
 
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+"fs-extra@^9.0.1":
+  "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz"
+  "version" "9.0.1"
   dependencies:
-    minipass "^3.0.0"
+    "at-least-node" "^1.0.0"
+    "graceful-fs" "^4.2.0"
+    "jsonfile" "^6.0.1"
+    "universalify" "^1.0.0"
 
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+"fs-minipass@^2.0.0":
+  "resolved" "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
+    "minipass" "^3.0.0"
 
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+"fs-write-stream-atomic@^1.0.8":
+  "resolved" "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"
+  "version" "1.0.10"
   dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
+    "graceful-fs" "^4.1.2"
+    "iferr" "^0.1.5"
+    "imurmurhash" "^0.1.4"
+    "readable-stream" "1 || 2"
 
-fsevents@^2.1.2, fsevents@^2.1.3, fsevents@~2.1.1, fsevents@~2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+"fs.realpath@^1.0.0":
+  "resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+  "version" "1.0.0"
 
-fsevents@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-fstream@^1.0.0, fstream@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+"fsevents@^1.2.7":
+  "resolved" "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz"
+  "version" "1.2.13"
   dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
+    "bindings" "^1.5.0"
+    "nan" "^2.12.1"
 
-fsu@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fsu/-/fsu-1.1.1.tgz#bd36d3579907c59d85b257a75b836aa9e0c31834"
+"fsevents@^2.1.2", "fsevents@^2.1.3", "fsevents@~2.1.1", "fsevents@~2.1.2":
+  "resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"
+  "version" "2.1.3"
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+"fsevents@~2.3.1":
+  "resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
+  "version" "2.3.2"
 
-function.prototype.name@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz#5cdf79d7c05db401591dfde83e3b70c5123e9a45"
+"fsu@^1.0.2":
+  "resolved" "https://registry.npmjs.org/fsu/-/fsu-1.1.1.tgz"
+  "version" "1.1.1"
+
+"function-bind@^1.1.1":
+  "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
+  "version" "1.1.1"
+
+"function.prototype.name@^1.1.0":
+  "resolved" "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.2.tgz"
+  "version" "1.1.2"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    functions-have-names "^1.2.0"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
+    "functions-have-names" "^1.2.0"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+"functional-red-black-tree@^1.0.1":
+  "resolved" "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"
+  "version" "1.0.1"
 
-functions-have-names@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91"
+"functions-have-names@^1.2.0":
+  "resolved" "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.1.tgz"
+  "version" "1.2.1"
 
-fuse.js@^3.4.5, fuse.js@^3.4.6:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.6.1.tgz#7de85fdd6e1b3377c23ce010892656385fd9b10c"
+"fuse.js@^3.4.5", "fuse.js@^3.4.6":
+  "resolved" "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz"
+  "version" "3.6.1"
 
-fusioncharts@^3.16.0:
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/fusioncharts/-/fusioncharts-3.16.0.tgz#fe3e3e7a1563b6f04ec98741025b03c29e8b745d"
+"fusioncharts@^3.16.0":
+  "resolved" "https://registry.npmjs.org/fusioncharts/-/fusioncharts-3.16.0.tgz"
+  "version" "3.16.0"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@fusioncharts/charts" "^3.16.0"
@@ -8851,1484 +9271,1500 @@ fusioncharts@^3.16.0:
     "@fusioncharts/powercharts" "^3.16.0"
     "@fusioncharts/utils" "^1.2.0"
     "@fusioncharts/widgets" "^3.16.0"
-    mutationobserver-shim "^0.3.5"
-    promise-polyfill "^8.1.3"
+    "mutationobserver-shim" "^0.3.5"
+    "promise-polyfill" "^8.1.3"
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+"gauge@~2.7.3":
+  "resolved" "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"
+  "version" "2.7.4"
   dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
+    "aproba" "^1.0.3"
+    "console-control-strings" "^1.0.0"
+    "has-unicode" "^2.0.0"
+    "object-assign" "^4.1.0"
+    "signal-exit" "^3.0.0"
+    "string-width" "^1.0.1"
+    "strip-ansi" "^3.0.1"
+    "wide-align" "^1.1.0"
 
-gaze@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+"gaze@^1.0.0":
+  "resolved" "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz"
+  "version" "1.1.3"
   dependencies:
-    globule "^1.0.0"
+    "globule" "^1.0.0"
 
-generic-names@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-2.0.1.tgz#f8a378ead2ccaa7a34f0317b05554832ae41b872"
+"generic-names@^2.0.1":
+  "resolved" "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    loader-utils "^1.1.0"
+    "loader-utils" "^1.1.0"
 
-gensync@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+"gensync@^1.0.0-beta.1":
+  "resolved" "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"
+  "version" "1.0.0-beta.1"
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+"get-caller-file@^2.0.1", "get-caller-file@^2.0.5":
+  "resolved" "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
+  "version" "2.0.5"
 
-get-own-enumerable-property-symbols@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
+"get-own-enumerable-property-symbols@^3.0.0":
+  "resolved" "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"
+  "version" "3.0.2"
 
-get-package-type@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+"get-package-type@^0.1.0":
+  "resolved" "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"
+  "version" "0.1.0"
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+"get-stdin@^4.0.1":
+  "resolved" "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+  "version" "4.0.1"
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
+"get-stdin@^6.0.0":
+  "resolved" "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz"
+  "version" "6.0.0"
 
-get-stdin@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+"get-stdin@^7.0.0":
+  "resolved" "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz"
+  "version" "7.0.0"
 
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+"get-stream@^4.0.0":
+  "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    pump "^3.0.0"
+    "pump" "^3.0.0"
 
-get-stream@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+"get-stream@^5.0.0":
+  "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"
+  "version" "5.2.0"
   dependencies:
-    pump "^3.0.0"
+    "pump" "^3.0.0"
 
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+"get-value@^2.0.3", "get-value@^2.0.6":
+  "resolved" "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"
+  "version" "2.0.6"
 
-getos@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
+"getos@^3.2.1":
+  "resolved" "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz"
+  "version" "3.2.1"
   dependencies:
-    async "^3.2.0"
+    "async" "^3.2.0"
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+"getpass@^0.1.1":
+  "resolved" "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"
+  "version" "0.1.7"
   dependencies:
-    assert-plus "^1.0.0"
+    "assert-plus" "^1.0.0"
 
-github-slugger@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.3.0.tgz#9bd0a95c5efdfc46005e82a906ef8e2a059124c9"
+"github-slugger@^1.0.0":
+  "resolved" "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz"
+  "version" "1.3.0"
   dependencies:
-    emoji-regex ">=6.0.0 <=6.1.1"
+    "emoji-regex" ">=6.0.0 <=6.1.1"
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+"glob-base@^0.3.0":
+  "resolved" "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"
+  "version" "0.3.0"
   dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
+    "glob-parent" "^2.0.0"
+    "is-glob" "^2.0.0"
 
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+"glob-parent@^2.0.0":
+  "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    is-glob "^2.0.0"
+    "is-glob" "^2.0.0"
 
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+"glob-parent@^3.1.0":
+  "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
+    "is-glob" "^3.1.0"
+    "path-dirname" "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+"glob-parent@^5.0.0", "glob-parent@^5.1.0", "glob-parent@~5.1.0":
+  "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"
+  "version" "5.1.1"
   dependencies:
-    is-glob "^4.0.1"
+    "is-glob" "^4.0.1"
 
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+"glob-to-regexp@^0.3.0":
+  "resolved" "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"
+  "version" "0.3.0"
 
-glob@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+"glob@^7.0.0", "glob@^7.0.3", "glob@^7.1.1", "glob@^7.1.2", "glob@^7.1.3", "glob@^7.1.4", "glob@^7.1.6", "glob@~7.1.1":
+  "resolved" "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
+  "version" "7.1.6"
   dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
+    "fs.realpath" "^1.0.0"
+    "inflight" "^1.0.4"
+    "inherits" "2"
+    "minimatch" "^3.0.4"
+    "once" "^1.3.0"
+    "path-is-absolute" "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+"glob@7.1.3":
+  "resolved" "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"
+  "version" "7.1.3"
   dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
+    "fs.realpath" "^1.0.0"
+    "inflight" "^1.0.4"
+    "inherits" "2"
+    "minimatch" "^3.0.4"
+    "once" "^1.3.0"
+    "path-is-absolute" "^1.0.0"
 
-global-dirs@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201"
+"global-dirs@^2.0.1":
+  "resolved" "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    ini "^1.3.5"
+    "ini" "^1.3.5"
 
-global-modules@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+"global-modules@2.0.0":
+  "resolved" "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    global-prefix "^3.0.0"
+    "global-prefix" "^3.0.0"
 
-global-prefix@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+"global-prefix@^3.0.0":
+  "resolved" "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    ini "^1.3.5"
-    kind-of "^6.0.2"
-    which "^1.3.1"
+    "ini" "^1.3.5"
+    "kind-of" "^6.0.2"
+    "which" "^1.3.1"
 
-global@^4.3.2, global@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
+"global@^4.3.2", "global@^4.4.0":
+  "resolved" "https://registry.npmjs.org/global/-/global-4.4.0.tgz"
+  "version" "4.4.0"
   dependencies:
-    min-document "^2.19.0"
-    process "^0.11.10"
+    "min-document" "^2.19.0"
+    "process" "^0.11.10"
 
-globals@^11.1.0, globals@^11.12.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+"globals@^11.1.0", "globals@^11.12.0":
+  "resolved" "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
+  "version" "11.12.0"
 
-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+"globals@^12.1.0":
+  "resolved" "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"
+  "version" "12.4.0"
   dependencies:
-    type-fest "^0.8.1"
+    "type-fest" "^0.8.1"
 
-globalthis@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"
+"globalthis@^1.0.0":
+  "resolved" "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    define-properties "^1.1.3"
+    "define-properties" "^1.1.3"
 
-globby@11.0.1, globby@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
-    slash "^3.0.0"
-
-globby@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "2.0.0"
-    fast-glob "^2.0.2"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
-globby@^10.0.1:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
+"globby@^10.0.1":
+  "resolved" "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz"
+  "version" "10.0.2"
   dependencies:
     "@types/glob" "^7.1.1"
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.0.3"
-    glob "^7.1.3"
-    ignore "^5.1.1"
-    merge2 "^1.2.3"
-    slash "^3.0.0"
+    "array-union" "^2.1.0"
+    "dir-glob" "^3.0.1"
+    "fast-glob" "^3.0.3"
+    "glob" "^7.1.3"
+    "ignore" "^5.1.1"
+    "merge2" "^1.2.3"
+    "slash" "^3.0.0"
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+"globby@^11.0.1", "globby@11.0.1":
+  "resolved" "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz"
+  "version" "11.0.1"
   dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
+    "array-union" "^2.1.0"
+    "dir-glob" "^3.0.1"
+    "fast-glob" "^3.1.1"
+    "ignore" "^5.1.4"
+    "merge2" "^1.3.0"
+    "slash" "^3.0.0"
 
-globule@^1.0.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"
+"globby@^6.1.0":
+  "resolved" "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"
+  "version" "6.1.0"
   dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
+    "array-union" "^1.0.1"
+    "glob" "^7.0.3"
+    "object-assign" "^4.0.1"
+    "pify" "^2.0.0"
+    "pinkie-promise" "^2.0.0"
 
-good-listener@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+"globby@8.0.2":
+  "resolved" "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz"
+  "version" "8.0.2"
   dependencies:
-    delegate "^3.1.2"
+    "array-union" "^1.0.1"
+    "dir-glob" "2.0.0"
+    "fast-glob" "^2.0.2"
+    "glob" "^7.1.2"
+    "ignore" "^3.3.5"
+    "pify" "^3.0.0"
+    "slash" "^1.0.0"
 
-google-maps-infobox@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/google-maps-infobox/-/google-maps-infobox-2.0.0.tgz#1ea6de93c0cdf4138c2d586331835c83dcc59dc2"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-
-graphql@^15.4.0:
-  version "15.5.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.0.tgz#39d19494dbe69d1ea719915b578bf920344a69d5"
-  integrity sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA==
-
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-
-growly@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-
-gud@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0"
-
-gzip-size@5.1.1, gzip-size@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
+"globule@^1.0.0":
+  "resolved" "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz"
+  "version" "1.3.2"
   dependencies:
-    duplexer "^0.1.1"
-    pify "^4.0.1"
+    "glob" "~7.1.1"
+    "lodash" "~4.17.10"
+    "minimatch" "~3.0.2"
 
-handle-thing@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+"good-listener@^1.2.2":
+  "resolved" "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz"
+  "version" "1.2.2"
   dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
+    "delegate" "^3.1.2"
 
-harmony-reflect@^1.4.6:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz#c108d4f2bb451efef7a37861fdbdae72c9bdefa9"
+"google-maps-infobox@^2.0.0":
+  "resolved" "https://registry.npmjs.org/google-maps-infobox/-/google-maps-infobox-2.0.0.tgz"
+  "version" "2.0.0"
 
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+"graceful-fs@^4.1.11", "graceful-fs@^4.1.15", "graceful-fs@^4.1.2", "graceful-fs@^4.1.6", "graceful-fs@^4.1.9", "graceful-fs@^4.2.0", "graceful-fs@^4.2.2", "graceful-fs@^4.2.4":
+  "resolved" "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"
+  "version" "4.2.4"
+
+"graceful-fs@^4.2.3":
+  "resolved" "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"
+  "version" "4.2.6"
+
+"graphql@^15.4.0":
+  "resolved" "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz"
+  "version" "15.5.0"
+
+"growl@1.10.5":
+  "resolved" "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"
+  "version" "1.10.5"
+
+"growly@^1.3.0":
+  "resolved" "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"
+  "version" "1.3.0"
+
+"gud@^1.0.0":
+  "resolved" "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz"
+  "version" "1.0.0"
+
+"gzip-size@^5.1.1", "gzip-size@5.1.1":
+  "resolved" "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz"
+  "version" "5.1.1"
   dependencies:
-    ansi-regex "^2.0.0"
+    "duplexer" "^0.1.1"
+    "pify" "^4.0.1"
 
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+"handle-thing@^2.0.0":
+  "resolved" "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"
+  "version" "2.0.1"
 
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+"har-schema@^2.0.0":
+  "resolved" "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"
+  "version" "2.0.0"
 
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-
-has-symbols@^1.0.0, has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+"har-validator@~5.1.3":
+  "resolved" "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"
+  "version" "5.1.5"
   dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
+    "ajv" "^6.12.3"
+    "har-schema" "^2.0.0"
 
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+"hard-rejection@^2.1.0":
+  "resolved" "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz"
+  "version" "2.1.0"
+
+"harmony-reflect@^1.4.6":
+  "resolved" "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.1.tgz"
+  "version" "1.6.1"
+
+"has-ansi@^2.0.0":
+  "resolved" "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
+    "ansi-regex" "^2.0.0"
 
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+"has-cors@1.1.0":
+  "resolved" "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"
+  "version" "1.1.0"
 
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+"has-flag@^3.0.0":
+  "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
+  "version" "3.0.0"
+
+"has-flag@^4.0.0":
+  "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
+  "version" "4.0.0"
+
+"has-symbols@^1.0.0", "has-symbols@^1.0.1":
+  "resolved" "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"
+  "version" "1.0.1"
+
+"has-unicode@^2.0.0":
+  "resolved" "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"
+  "version" "2.0.1"
+
+"has-value@^0.3.1":
+  "resolved" "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"
+  "version" "0.3.1"
   dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
+    "get-value" "^2.0.3"
+    "has-values" "^0.1.4"
+    "isobject" "^2.0.0"
 
-has@^1.0.0, has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+"has-value@^1.0.0":
+  "resolved" "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    function-bind "^1.1.1"
+    "get-value" "^2.0.6"
+    "has-values" "^1.0.0"
+    "isobject" "^3.0.0"
 
-hash-base@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+"has-values@^0.1.4":
+  "resolved" "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"
+  "version" "0.1.4"
+
+"has-values@^1.0.0":
+  "resolved" "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    inherits "^2.0.4"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
+    "is-number" "^3.0.0"
+    "kind-of" "^4.0.0"
 
-hash-sum@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
-
-hash-sum@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+"has@^1.0.0", "has@^1.0.3":
+  "resolved" "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
+  "version" "1.0.3"
   dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
+    "function-bind" "^1.1.1"
 
-hast-to-hyperscript@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-9.0.0.tgz#768fb557765fe28749169c885056417342d71e83"
+"hash-base@^3.0.0":
+  "resolved" "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"
+  "version" "3.1.0"
+  dependencies:
+    "inherits" "^2.0.4"
+    "readable-stream" "^3.6.0"
+    "safe-buffer" "^5.2.0"
+
+"hash-sum@^1.0.2":
+  "resolved" "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"
+  "version" "1.0.2"
+
+"hash-sum@^2.0.0":
+  "resolved" "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz"
+  "version" "2.0.0"
+
+"hash.js@^1.0.0", "hash.js@^1.0.3":
+  "resolved" "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"
+  "version" "1.1.7"
+  dependencies:
+    "inherits" "^2.0.3"
+    "minimalistic-assert" "^1.0.1"
+
+"hast-to-hyperscript@^9.0.0":
+  "resolved" "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.0.tgz"
+  "version" "9.0.0"
   dependencies:
     "@types/unist" "^2.0.3"
-    comma-separated-tokens "^1.0.0"
-    property-information "^5.3.0"
-    space-separated-tokens "^1.0.0"
-    style-to-object "^0.3.0"
-    unist-util-is "^4.0.0"
-    web-namespaces "^1.0.0"
+    "comma-separated-tokens" "^1.0.0"
+    "property-information" "^5.3.0"
+    "space-separated-tokens" "^1.0.0"
+    "style-to-object" "^0.3.0"
+    "unist-util-is" "^4.0.0"
+    "web-namespaces" "^1.0.0"
 
-hast-util-from-parse5@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-6.0.0.tgz#b38793c81e1a99f5fd592a4a88fc2731dccd0f30"
+"hast-util-from-parse5@^6.0.0":
+  "resolved" "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
     "@types/parse5" "^5.0.0"
-    ccount "^1.0.0"
-    hastscript "^5.0.0"
-    property-information "^5.0.0"
-    vfile "^4.0.0"
-    web-namespaces "^1.0.0"
+    "ccount" "^1.0.0"
+    "hastscript" "^5.0.0"
+    "property-information" "^5.0.0"
+    "vfile" "^4.0.0"
+    "web-namespaces" "^1.0.0"
 
-hast-util-parse-selector@^2.0.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz#60c99d0b519e12ab4ed32e58f150ec3f61ed1974"
+"hast-util-parse-selector@^2.0.0":
+  "resolved" "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz"
+  "version" "2.2.4"
 
-hast-util-raw@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977"
+"hast-util-raw@6.0.1":
+  "resolved" "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-6.0.1.tgz"
+  "version" "6.0.1"
   dependencies:
     "@types/hast" "^2.0.0"
-    hast-util-from-parse5 "^6.0.0"
-    hast-util-to-parse5 "^6.0.0"
-    html-void-elements "^1.0.0"
-    parse5 "^6.0.0"
-    unist-util-position "^3.0.0"
-    vfile "^4.0.0"
-    web-namespaces "^1.0.0"
-    xtend "^4.0.0"
-    zwitch "^1.0.0"
+    "hast-util-from-parse5" "^6.0.0"
+    "hast-util-to-parse5" "^6.0.0"
+    "html-void-elements" "^1.0.0"
+    "parse5" "^6.0.0"
+    "unist-util-position" "^3.0.0"
+    "vfile" "^4.0.0"
+    "web-namespaces" "^1.0.0"
+    "xtend" "^4.0.0"
+    "zwitch" "^1.0.0"
 
-hast-util-to-parse5@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479"
+"hast-util-to-parse5@^6.0.0":
+  "resolved" "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    hast-to-hyperscript "^9.0.0"
-    property-information "^5.0.0"
-    web-namespaces "^1.0.0"
-    xtend "^4.0.0"
-    zwitch "^1.0.0"
+    "hast-to-hyperscript" "^9.0.0"
+    "property-information" "^5.0.0"
+    "web-namespaces" "^1.0.0"
+    "xtend" "^4.0.0"
+    "zwitch" "^1.0.0"
 
-hastscript@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a"
+"hastscript@^5.0.0":
+  "resolved" "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
-    comma-separated-tokens "^1.0.0"
-    hast-util-parse-selector "^2.0.0"
-    property-information "^5.0.0"
-    space-separated-tokens "^1.0.0"
+    "comma-separated-tokens" "^1.0.0"
+    "hast-util-parse-selector" "^2.0.0"
+    "property-information" "^5.0.0"
+    "space-separated-tokens" "^1.0.0"
 
-he@1.2.0, he@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+"he@^1.2.0", "he@1.2.0":
+  "resolved" "https://registry.npmjs.org/he/-/he-1.2.0.tgz"
+  "version" "1.2.0"
 
-headers-utils@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/headers-utils/-/headers-utils-3.0.2.tgz#dfc65feae4b0e34357308aefbcafa99c895e59ef"
-  integrity sha512-xAxZkM1dRyGV2Ou5bzMxBPNLoRCjcX+ya7KSWybQD2KwLphxsapUVK6x/02o7f4VU6GPSXch9vNY2+gkU8tYWQ==
+"headers-utils@^3.0.2":
+  "resolved" "https://registry.npmjs.org/headers-utils/-/headers-utils-3.0.2.tgz"
+  "version" "3.0.2"
 
-hex-color-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
+"hex-color-regex@^1.1.0":
+  "resolved" "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz"
+  "version" "1.1.0"
 
-highlight.js@~9.13.0:
-  version "9.13.1"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz#054586d53a6863311168488a0f58d6c505ce641e"
+"highlight.js@~9.13.0":
+  "resolved" "https://registry.npmjs.org/highlight.js/-/highlight.js-9.13.1.tgz"
+  "version" "9.13.1"
 
-history@^4.10.1, history@^4.9.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
+"history@^4.10.1", "history@^4.9.0":
+  "resolved" "https://registry.npmjs.org/history/-/history-4.10.1.tgz"
+  "version" "4.10.1"
   dependencies:
     "@babel/runtime" "^7.1.2"
-    loose-envify "^1.2.0"
-    resolve-pathname "^3.0.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-    value-equal "^1.0.1"
+    "loose-envify" "^1.2.0"
+    "resolve-pathname" "^3.0.0"
+    "tiny-invariant" "^1.0.2"
+    "tiny-warning" "^1.0.0"
+    "value-equal" "^1.0.1"
 
-hmac-drbg@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+"hmac-drbg@^1.0.1":
+  "resolved" "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
+    "hash.js" "^1.0.3"
+    "minimalistic-assert" "^1.0.0"
+    "minimalistic-crypto-utils" "^1.0.1"
 
-hogan.js@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/hogan.js/-/hogan.js-3.0.2.tgz#4cd9e1abd4294146e7679e41d7898732b02c7bfd"
+"hogan.js@^3.0.2":
+  "resolved" "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    mkdirp "0.3.0"
-    nopt "1.0.10"
+    "mkdirp" "0.3.0"
+    "nopt" "1.0.10"
 
-hoist-non-react-statics@^2.3.1:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
+"hoist-non-react-statics@^2.3.1":
+  "resolved" "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz"
+  "version" "2.5.5"
 
-hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
+"hoist-non-react-statics@^3.0.0", "hoist-non-react-statics@^3.1.0", "hoist-non-react-statics@^3.3.0", "hoist-non-react-statics@^3.3.2":
+  "resolved" "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"
+  "version" "3.3.2"
   dependencies:
-    react-is "^16.7.0"
+    "react-is" "^16.7.0"
 
-hoopy@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
+"hoopy@^0.1.4":
+  "resolved" "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz"
+  "version" "0.1.4"
 
-hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+"hosted-git-info@^2.1.4":
+  "resolved" "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
+  "version" "2.8.9"
 
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+"hosted-git-info@^4.0.1":
+  "resolved" "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
+    "lru-cache" "^6.0.0"
 
-hsl-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
-
-hsla-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
-
-html-comment-regex@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
-
-html-encoding-sniffer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
+"hpack.js@^2.1.6":
+  "resolved" "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"
+  "version" "2.1.6"
   dependencies:
-    whatwg-encoding "^1.0.5"
+    "inherits" "^2.0.1"
+    "obuf" "^1.0.0"
+    "readable-stream" "^2.0.1"
+    "wbuf" "^1.1.0"
 
-html-entities@^1.2.0, html-entities@^1.2.1, html-entities@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
+"hsl-regex@^1.0.0":
+  "resolved" "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz"
+  "version" "1.0.0"
 
-html-escaper@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+"hsla-regex@^1.0.0":
+  "resolved" "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz"
+  "version" "1.0.0"
 
-html-minifier-terser@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
+"html-comment-regex@^1.1.0":
+  "resolved" "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz"
+  "version" "1.1.2"
+
+"html-encoding-sniffer@^2.0.1":
+  "resolved" "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    camel-case "^4.1.1"
-    clean-css "^4.2.3"
-    commander "^4.1.1"
-    he "^1.2.0"
-    param-case "^3.0.3"
-    relateurl "^0.2.7"
-    terser "^4.6.3"
+    "whatwg-encoding" "^1.0.5"
 
-html-tags@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
+"html-entities@^1.2.0", "html-entities@^1.2.1", "html-entities@^1.3.1":
+  "resolved" "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz"
+  "version" "1.3.1"
 
-html-void-elements@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
+"html-escaper@^2.0.0":
+  "resolved" "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"
+  "version" "2.0.2"
 
-html-webpack-plugin@4.5.0, html-webpack-plugin@^4.0.0-beta.2:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz#625097650886b97ea5dae331c320e3238f6c121c"
+"html-minifier-terser@^5.0.1":
+  "resolved" "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"
+  "version" "5.1.1"
+  dependencies:
+    "camel-case" "^4.1.1"
+    "clean-css" "^4.2.3"
+    "commander" "^4.1.1"
+    "he" "^1.2.0"
+    "param-case" "^3.0.3"
+    "relateurl" "^0.2.7"
+    "terser" "^4.6.3"
+
+"html-tags@^3.1.0":
+  "resolved" "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz"
+  "version" "3.1.0"
+
+"html-void-elements@^1.0.0":
+  "resolved" "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz"
+  "version" "1.0.5"
+
+"html-webpack-plugin@^4.0.0-beta.2", "html-webpack-plugin@4.5.0":
+  "resolved" "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz"
+  "version" "4.5.0"
   dependencies:
     "@types/html-minifier-terser" "^5.0.0"
     "@types/tapable" "^1.0.5"
     "@types/webpack" "^4.41.8"
-    html-minifier-terser "^5.0.1"
-    loader-utils "^1.2.3"
-    lodash "^4.17.15"
-    pretty-error "^2.1.1"
-    tapable "^1.1.3"
-    util.promisify "1.0.0"
+    "html-minifier-terser" "^5.0.1"
+    "loader-utils" "^1.2.3"
+    "lodash" "^4.17.15"
+    "pretty-error" "^2.1.1"
+    "tapable" "^1.1.3"
+    "util.promisify" "1.0.0"
 
-htmlparser2@^3.3.0:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+"htmlparser2@^3.3.0":
+  "resolved" "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"
+  "version" "3.10.1"
   dependencies:
-    domelementtype "^1.3.1"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.1.1"
+    "domelementtype" "^1.3.1"
+    "domhandler" "^2.3.0"
+    "domutils" "^1.5.1"
+    "entities" "^1.1.1"
+    "inherits" "^2.0.1"
+    "readable-stream" "^3.1.1"
 
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-
-http-errors@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+"htmlparser2@3.8.x":
+  "resolved" "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"
+  "version" "3.8.3"
   dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
+    "domelementtype" "1"
+    "domhandler" "2.3"
+    "domutils" "1.5"
+    "entities" "1.0"
+    "readable-stream" "1.1"
 
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+"http-deceiver@^1.2.7":
+  "resolved" "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"
+  "version" "1.2.7"
+
+"http-errors@~1.6.2":
+  "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
+  "version" "1.6.3"
   dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
+    "depd" "~1.1.2"
+    "inherits" "2.0.3"
+    "setprototypeof" "1.1.0"
+    "statuses" ">= 1.4.0 < 2"
 
-http-errors@~1.7.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+"http-errors@~1.7.2":
+  "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"
+  "version" "1.7.3"
   dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
+    "depd" "~1.1.2"
+    "inherits" "2.0.4"
+    "setprototypeof" "1.1.1"
+    "statuses" ">= 1.5.0 < 2"
+    "toidentifier" "1.0.0"
 
-http-parser-js@>=0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77"
-
-http-proxy-middleware@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+"http-errors@1.7.2":
+  "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"
+  "version" "1.7.2"
   dependencies:
-    http-proxy "^1.17.0"
-    is-glob "^4.0.0"
-    lodash "^4.17.11"
-    micromatch "^3.1.10"
+    "depd" "~1.1.2"
+    "inherits" "2.0.3"
+    "setprototypeof" "1.1.1"
+    "statuses" ">= 1.5.0 < 2"
+    "toidentifier" "1.0.0"
 
-http-proxy@^1.17.0:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+"http-parser-js@>=0.5.1":
+  "resolved" "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz"
+  "version" "0.5.2"
+
+"http-proxy-middleware@0.19.1":
+  "resolved" "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"
+  "version" "0.19.1"
   dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
+    "http-proxy" "^1.17.0"
+    "is-glob" "^4.0.0"
+    "lodash" "^4.17.11"
+    "micromatch" "^3.1.10"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+"http-proxy@^1.17.0":
+  "resolved" "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"
+  "version" "1.18.1"
   dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
+    "eventemitter3" "^4.0.0"
+    "follow-redirects" "^1.0.0"
+    "requires-port" "^1.0.0"
 
-https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+"http-signature@~1.2.0":
+  "resolved" "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
-    agent-base "6"
-    debug "4"
+    "assert-plus" "^1.0.0"
+    "jsprim" "^1.2.2"
+    "sshpk" "^1.7.0"
 
-human-signals@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+"https-browserify@^1.0.0":
+  "resolved" "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"
+  "version" "1.0.0"
 
-husky@^3.0.5:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-3.1.0.tgz#5faad520ab860582ed94f0c1a77f0f04c90b57c0"
+"https-proxy-agent@^5.0.0":
+  "resolved" "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    chalk "^2.4.2"
-    ci-info "^2.0.0"
-    cosmiconfig "^5.2.1"
-    execa "^1.0.0"
-    get-stdin "^7.0.0"
-    opencollective-postinstall "^2.0.2"
-    pkg-dir "^4.2.0"
-    please-upgrade-node "^3.2.0"
-    read-pkg "^5.2.0"
-    run-node "^1.0.0"
-    slash "^3.0.0"
+    "agent-base" "6"
+    "debug" "4"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+"human-signals@^1.1.1":
+  "resolved" "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"
+  "version" "1.1.1"
+
+"husky@^3.0.5":
+  "resolved" "https://registry.npmjs.org/husky/-/husky-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+    "chalk" "^2.4.2"
+    "ci-info" "^2.0.0"
+    "cosmiconfig" "^5.2.1"
+    "execa" "^1.0.0"
+    "get-stdin" "^7.0.0"
+    "opencollective-postinstall" "^2.0.2"
+    "pkg-dir" "^4.2.0"
+    "please-upgrade-node" "^3.2.0"
+    "read-pkg" "^5.2.0"
+    "run-node" "^1.0.0"
+    "slash" "^3.0.0"
 
-iconv-lite@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+"iconv-lite@^0.4.24", "iconv-lite@0.4.24":
+  "resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
+  "version" "0.4.24"
   dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
+    "safer-buffer" ">= 2.1.2 < 3"
 
-icss-replace-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
-
-icss-utils@^4.0.0, icss-utils@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
+"iconv-lite@^0.6.2":
+  "resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz"
+  "version" "0.6.2"
   dependencies:
-    postcss "^7.0.14"
+    "safer-buffer" ">= 2.1.2 < 3.0.0"
 
-identity-obj-proxy@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14"
+"icss-replace-symbols@^1.1.0":
+  "resolved" "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"
+  "version" "1.1.0"
+
+"icss-utils@^4.0.0", "icss-utils@^4.1.1":
+  "resolved" "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz"
+  "version" "4.1.1"
   dependencies:
-    harmony-reflect "^1.4.6"
+    "postcss" "^7.0.14"
 
-ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-
-ignore@^3.3.5:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-
-ignore@^5.1.1, ignore@^5.1.4:
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
-
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-
-immer@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d"
-
-immer@7.0.9:
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.9.tgz#28e7552c21d39dd76feccd2b800b7bc86ee4a62e"
-
-immer@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.1.tgz#9c73db683e2b3975c424fb0572af5889877ae656"
-
-immutable@~3.7.4:
-  version "3.7.6"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
-  integrity sha1-E7TTyxK++hVIKib+Gy665kAHHks=
-
-import-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+"identity-obj-proxy@3.0.0":
+  "resolved" "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    import-from "^2.1.0"
+    "harmony-reflect" "^1.4.6"
 
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+"ieee754@^1.1.4":
+  "resolved" "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"
+  "version" "1.1.13"
+
+"iferr@^0.1.5":
+  "resolved" "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"
+  "version" "0.1.5"
+
+"ignore@^3.3.5":
+  "resolved" "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz"
+  "version" "3.3.10"
+
+"ignore@^4.0.6":
+  "resolved" "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"
+  "version" "4.0.6"
+
+"ignore@^5.1.1":
+  "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"
+  "version" "5.1.8"
+
+"ignore@^5.1.4":
+  "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"
+  "version" "5.1.8"
+
+"immediate@~3.0.5":
+  "resolved" "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"
+  "version" "3.0.6"
+
+"immer@^8.0.1":
+  "resolved" "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz"
+  "version" "8.0.1"
+
+"immer@1.10.0":
+  "resolved" "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz"
+  "version" "1.10.0"
+
+"immer@7.0.9":
+  "resolved" "https://registry.npmjs.org/immer/-/immer-7.0.9.tgz"
+  "version" "7.0.9"
+
+"immutable@^3.8.2 || ^4.0.0", "immutable@~3.7.4":
+  "resolved" "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz"
+  "version" "3.7.6"
+
+"import-cwd@^2.0.0":
+  "resolved" "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
+    "import-from" "^2.1.0"
 
-import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+"import-fresh@^2.0.0":
+  "resolved" "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
+    "caller-path" "^2.0.0"
+    "resolve-from" "^3.0.0"
 
-import-from@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+"import-fresh@^3.0.0", "import-fresh@^3.1.0", "import-fresh@^3.2.1":
+  "resolved" "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"
+  "version" "3.2.1"
   dependencies:
-    resolve-from "^3.0.0"
+    "parent-module" "^1.0.0"
+    "resolve-from" "^4.0.0"
 
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+"import-from@^2.1.0":
+  "resolved" "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
+    "resolve-from" "^3.0.0"
 
-import-local@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
+"import-local@^2.0.0":
+  "resolved" "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
+    "pkg-dir" "^3.0.0"
+    "resolve-cwd" "^2.0.0"
 
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-
-in-publish@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c"
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+"import-local@^3.0.2":
+  "resolved" "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    repeating "^2.0.0"
+    "pkg-dir" "^4.2.0"
+    "resolve-cwd" "^3.0.0"
 
-indent-string@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+"imurmurhash@^0.1.4":
+  "resolved" "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
+  "version" "0.1.4"
 
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+"indent-string@^3.0.0":
+  "resolved" "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"
+  "version" "3.2.0"
 
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+"indent-string@^4.0.0":
+  "resolved" "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
+  "version" "4.0.0"
 
-infer-owner@^1.0.3, infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+"indexes-of@^1.0.1":
+  "resolved" "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"
+  "version" "1.0.1"
 
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+"infer-owner@^1.0.3", "infer-owner@^1.0.4":
+  "resolved" "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"
+  "version" "1.0.4"
+
+"inflight@^1.0.4":
+  "resolved" "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+  "version" "1.0.6"
   dependencies:
-    once "^1.3.0"
-    wrappy "1"
+    "once" "^1.3.0"
+    "wrappy" "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+"inherits@^2.0.0", "inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.1", "inherits@~2.0.3", "inherits@2", "inherits@2.0.4":
+  "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
+  "version" "2.0.4"
 
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+"inherits@2.0.1":
+  "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+  "version" "2.0.1"
 
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+"inherits@2.0.3":
+  "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+  "version" "2.0.3"
 
-ini@^1.3.5:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+"ini@^1.3.5":
+  "resolved" "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
+  "version" "1.3.8"
 
-inline-style-parser@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
+"inline-style-parser@0.1.1":
+  "resolved" "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz"
+  "version" "0.1.1"
 
-inquirer@6.5.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42"
+"inquirer@^7.0.0", "inquirer@^7.3.3":
+  "resolved" "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"
+  "version" "7.3.3"
   dependencies:
-    ansi-escapes "^3.2.0"
-    chalk "^2.4.2"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.12"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
+    "ansi-escapes" "^4.2.1"
+    "chalk" "^4.1.0"
+    "cli-cursor" "^3.1.0"
+    "cli-width" "^3.0.0"
+    "external-editor" "^3.0.3"
+    "figures" "^3.0.0"
+    "lodash" "^4.17.19"
+    "mute-stream" "0.0.8"
+    "run-async" "^2.4.0"
+    "rxjs" "^6.6.0"
+    "string-width" "^4.1.0"
+    "strip-ansi" "^6.0.0"
+    "through" "^2.3.6"
 
-inquirer@^7.0.0, inquirer@^7.3.3:
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+"inquirer@6.5.0":
+  "resolved" "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz"
+  "version" "6.5.0"
   dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.19"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.6.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
+    "ansi-escapes" "^3.2.0"
+    "chalk" "^2.4.2"
+    "cli-cursor" "^2.1.0"
+    "cli-width" "^2.0.0"
+    "external-editor" "^3.0.3"
+    "figures" "^2.0.0"
+    "lodash" "^4.17.12"
+    "mute-stream" "0.0.7"
+    "run-async" "^2.2.0"
+    "rxjs" "^6.4.0"
+    "string-width" "^2.1.0"
+    "strip-ansi" "^5.1.0"
+    "through" "^2.3.6"
 
-instantsearch.css@^7.4.2:
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/instantsearch.css/-/instantsearch.css-7.4.5.tgz#2a521aa634329bf1680f79adf87c79d67669ec8d"
+"instantsearch.css@^7.4.2":
+  "resolved" "https://registry.npmjs.org/instantsearch.css/-/instantsearch.css-7.4.5.tgz"
+  "version" "7.4.5"
 
-instantsearch.js@^4.4.1:
-  version "4.8.3"
-  resolved "https://registry.yarnpkg.com/instantsearch.js/-/instantsearch.js-4.8.3.tgz#f9bff4370c7250ddc674c14fce078a69cda2c841"
+"instantsearch.js@^4.4.1":
+  "resolved" "https://registry.npmjs.org/instantsearch.js/-/instantsearch.js-4.8.3.tgz"
+  "version" "4.8.3"
   dependencies:
     "@types/googlemaps" "^3.39.6"
-    algoliasearch-helper "^3.2.2"
-    classnames "^2.2.5"
-    events "^1.1.0"
-    hogan.js "^3.0.2"
-    preact "^10.0.0"
-    prop-types "^15.5.10"
-    qs "^6.5.1"
+    "algoliasearch-helper" "^3.2.2"
+    "classnames" "^2.2.5"
+    "events" "^1.1.0"
+    "hogan.js" "^3.0.2"
+    "preact" "^10.0.0"
+    "prop-types" "^15.5.10"
+    "qs" "^6.5.1"
 
-internal-ip@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+"internal-ip@^4.3.0":
+  "resolved" "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"
+  "version" "4.3.0"
   dependencies:
-    default-gateway "^4.2.0"
-    ipaddr.js "^1.9.0"
+    "default-gateway" "^4.2.0"
+    "ipaddr.js" "^1.9.0"
 
-internal-slot@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
+"internal-slot@^1.0.2":
+  "resolved" "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    es-abstract "^1.17.0-next.1"
-    has "^1.0.3"
-    side-channel "^1.0.2"
+    "es-abstract" "^1.17.0-next.1"
+    "has" "^1.0.3"
+    "side-channel" "^1.0.2"
 
-interpret@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+"interpret@^1.0.0":
+  "resolved" "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"
+  "version" "1.4.0"
 
-interpret@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
+"interpret@^2.0.0":
+  "resolved" "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"
+  "version" "2.2.0"
 
-interweave-autolink@^4.0.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/interweave-autolink/-/interweave-autolink-4.2.1.tgz#b875e67970512484e47666adf952b9025743bd9d"
+"interweave-autolink@^4.4.2":
+  "resolved" "https://registry.npmjs.org/interweave-autolink/-/interweave-autolink-4.4.2.tgz"
+  "version" "4.4.2"
+
+"interweave@^12.0.0", "interweave@^12.7.2":
+  "resolved" "https://registry.npmjs.org/interweave/-/interweave-12.7.2.tgz"
+  "version" "12.7.2"
   dependencies:
-    "@types/react" "*"
-    prop-types "^15.7.2"
+    "escape-html" "^1.0.3"
 
-interweave@^12.1.1:
-  version "12.5.0"
-  resolved "https://registry.yarnpkg.com/interweave/-/interweave-12.5.0.tgz#c1c6cbda55e3d2864c94eeed8e86f4159111f493"
+"invariant@^2.2.1", "invariant@^2.2.2", "invariant@^2.2.3", "invariant@^2.2.4":
+  "resolved" "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"
+  "version" "2.2.4"
   dependencies:
-    "@types/react" "*"
-    escape-html "^1.0.3"
-    prop-types "^15.7.2"
+    "loose-envify" "^1.0.0"
 
-invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+"ip-regex@^2.1.0":
+  "resolved" "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"
+  "version" "2.1.0"
+
+"ip@^1.1.0", "ip@^1.1.5":
+  "resolved" "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"
+  "version" "1.1.5"
+
+"ipaddr.js@^1.9.0", "ipaddr.js@1.9.1":
+  "resolved" "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
+  "version" "1.9.1"
+
+"is-absolute-url@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz"
+  "version" "2.1.0"
+
+"is-absolute-url@^3.0.0", "is-absolute-url@^3.0.3":
+  "resolved" "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz"
+  "version" "3.0.3"
+
+"is-accessor-descriptor@^0.1.6":
+  "resolved" "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"
+  "version" "0.1.6"
   dependencies:
-    loose-envify "^1.0.0"
+    "kind-of" "^3.0.2"
 
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-
-ip@^1.1.0, ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-
-ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
-
-is-absolute-url@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
-
-is-absolute-url@^3.0.0, is-absolute-url@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+"is-accessor-descriptor@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    kind-of "^3.0.2"
+    "kind-of" "^6.0.0"
 
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+"is-alphabetical@^1.0.0", "is-alphabetical@1.0.4":
+  "resolved" "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz"
+  "version" "1.0.4"
+
+"is-alphanumerical@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"
+  "version" "1.0.4"
   dependencies:
-    kind-of "^6.0.0"
+    "is-alphabetical" "^1.0.0"
+    "is-decimal" "^1.0.0"
 
-is-alphabetical@1.0.4, is-alphabetical@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
+"is-arguments@^1.0.4":
+  "resolved" "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz"
+  "version" "1.0.4"
 
-is-alphanumerical@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
+"is-arrayish@^0.2.1":
+  "resolved" "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+  "version" "0.2.1"
+
+"is-arrayish@^0.3.1":
+  "resolved" "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"
+  "version" "0.3.2"
+
+"is-binary-path@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
+    "binary-extensions" "^1.0.0"
 
-is-arguments@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+"is-binary-path@~2.1.0":
+  "resolved" "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    binary-extensions "^1.0.0"
+    "binary-extensions" "^2.0.0"
 
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+"is-buffer@^1.0.2", "is-buffer@^1.1.5", "is-buffer@~1.1.6":
+  "resolved" "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
+  "version" "1.1.6"
+
+"is-buffer@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz"
+  "version" "2.0.4"
+
+"is-buffer@~2.0.3":
+  "resolved" "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz"
+  "version" "2.0.4"
+
+"is-callable@^1.1.4", "is-callable@^1.2.2":
+  "resolved" "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz"
+  "version" "1.2.2"
+
+"is-ci@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    binary-extensions "^2.0.0"
+    "ci-info" "^2.0.0"
 
-is-buffer@^1.0.2, is-buffer@^1.1.5, is-buffer@~1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
-is-buffer@^2.0.0, is-buffer@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-
-is-callable@^1.1.4, is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+"is-color-stop@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    ci-info "^2.0.0"
+    "css-color-names" "^0.0.4"
+    "hex-color-regex" "^1.1.0"
+    "hsl-regex" "^1.0.0"
+    "hsla-regex" "^1.0.0"
+    "rgb-regex" "^1.0.1"
+    "rgba-regex" "^1.0.0"
 
-is-color-stop@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
+"is-core-module@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    css-color-names "^0.0.4"
-    hex-color-regex "^1.1.0"
-    hsl-regex "^1.0.0"
-    hsla-regex "^1.0.0"
-    rgb-regex "^1.0.1"
-    rgba-regex "^1.0.0"
+    "has" "^1.0.3"
 
-is-core-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.0.0.tgz#58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
+"is-core-module@^2.2.0":
+  "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz"
+  "version" "2.4.0"
   dependencies:
-    has "^1.0.3"
+    "has" "^1.0.3"
 
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+"is-data-descriptor@^0.1.4":
+  "resolved" "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"
+  "version" "0.1.4"
   dependencies:
-    kind-of "^3.0.2"
+    "kind-of" "^3.0.2"
 
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+"is-data-descriptor@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    kind-of "^6.0.0"
+    "kind-of" "^6.0.0"
 
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+"is-date-object@^1.0.1":
+  "resolved" "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"
+  "version" "1.0.2"
 
-is-decimal@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
+"is-decimal@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz"
+  "version" "1.0.4"
 
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+"is-descriptor@^0.1.0":
+  "resolved" "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"
+  "version" "0.1.6"
   dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
+    "is-accessor-descriptor" "^0.1.6"
+    "is-data-descriptor" "^0.1.4"
+    "kind-of" "^5.0.0"
 
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+"is-descriptor@^1.0.0", "is-descriptor@^1.0.2":
+  "resolved" "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
+    "is-accessor-descriptor" "^1.0.0"
+    "is-data-descriptor" "^1.0.0"
+    "kind-of" "^6.0.2"
 
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+"is-directory@^0.3.1":
+  "resolved" "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"
+  "version" "0.3.1"
 
-is-docker@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
+"is-docker@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"
+  "version" "2.1.1"
 
-is-dom@^1.0.9:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-dom/-/is-dom-1.1.0.tgz#af1fced292742443bb59ca3f76ab5e80907b4e8a"
+"is-dom@^1.0.9":
+  "resolved" "https://registry.npmjs.org/is-dom/-/is-dom-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    is-object "^1.0.1"
-    is-window "^1.0.2"
+    "is-object" "^1.0.1"
+    "is-window" "^1.0.2"
 
-is-expression@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-4.0.0.tgz#c33155962abf21d0afd2552514d67d2ec16fd2ab"
+"is-expression@^4.0.0":
+  "resolved" "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    acorn "^7.1.1"
-    object-assign "^4.1.1"
+    "acorn" "^7.1.1"
+    "object-assign" "^4.1.1"
 
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+"is-extendable@^0.1.0", "is-extendable@^0.1.1":
+  "resolved" "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
+  "version" "0.1.1"
 
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+"is-extendable@^1.0.1":
+  "resolved" "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    is-plain-object "^2.0.4"
+    "is-plain-object" "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+"is-extglob@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
+  "version" "1.0.0"
 
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+"is-extglob@^2.1.0", "is-extglob@^2.1.1":
+  "resolved" "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
+  "version" "2.1.1"
 
-is-finite@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+"is-fullwidth-code-point@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    number-is-nan "^1.0.0"
+    "number-is-nan" "^1.0.0"
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+"is-fullwidth-code-point@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
+  "version" "2.0.0"
 
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+"is-fullwidth-code-point@^3.0.0":
+  "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
+  "version" "3.0.0"
 
-is-function@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
+"is-function@^1.0.1":
+  "resolved" "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz"
+  "version" "1.0.2"
 
-is-generator-fn@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+"is-generator-fn@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz"
+  "version" "2.1.0"
 
-is-glob@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+"is-glob@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    is-extglob "^1.0.0"
+    "is-extglob" "^1.0.0"
 
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+"is-glob@^3.1.0":
+  "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    is-extglob "^2.1.0"
+    "is-extglob" "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+"is-glob@^4.0.0", "is-glob@^4.0.1", "is-glob@~4.0.1":
+  "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    is-extglob "^2.1.1"
+    "is-extglob" "^2.1.1"
 
-is-hexadecimal@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
+"is-hexadecimal@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"
+  "version" "1.0.4"
 
-is-installed-globally@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
+"is-installed-globally@^0.3.2":
+  "resolved" "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz"
+  "version" "0.3.2"
   dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
+    "global-dirs" "^2.0.1"
+    "is-path-inside" "^3.0.1"
 
-is-map@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
+"is-map@^2.0.1":
+  "resolved" "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz"
+  "version" "2.0.1"
 
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+"is-module@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"
+  "version" "1.0.0"
 
-is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
+"is-negative-zero@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz"
+  "version" "2.0.0"
 
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+"is-number@^3.0.0":
+  "resolved" "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    kind-of "^3.0.2"
+    "kind-of" "^3.0.2"
 
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+"is-number@^7.0.0":
+  "resolved" "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
+  "version" "7.0.0"
 
-is-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+"is-obj@^1.0.1":
+  "resolved" "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"
+  "version" "1.0.1"
 
-is-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+"is-obj@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"
+  "version" "2.0.0"
 
-is-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+"is-object@^1.0.1":
+  "resolved" "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"
+  "version" "1.0.1"
 
-is-observable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
+"is-observable@^1.1.0":
+  "resolved" "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    symbol-observable "^1.1.0"
+    "symbol-observable" "^1.1.0"
 
-is-path-cwd@^2.0.0, is-path-cwd@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+"is-path-cwd@^2.0.0", "is-path-cwd@^2.2.0":
+  "resolved" "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"
+  "version" "2.2.0"
 
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+"is-path-in-cwd@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    is-path-inside "^2.1.0"
+    "is-path-inside" "^2.1.0"
 
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
+"is-path-inside@^2.1.0":
+  "resolved" "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    path-is-inside "^1.0.2"
+    "path-is-inside" "^1.0.2"
 
-is-path-inside@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
+"is-path-inside@^3.0.1":
+  "resolved" "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz"
+  "version" "3.0.2"
 
-is-plain-obj@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+"is-plain-obj@^1.0.0", "is-plain-obj@^1.1.0":
+  "resolved" "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
+  "version" "1.1.0"
 
-is-plain-obj@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+"is-plain-obj@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"
+  "version" "2.1.0"
 
-is-plain-object@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"
+"is-plain-object@^2.0.1", "is-plain-object@^2.0.3", "is-plain-object@^2.0.4":
+  "resolved" "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
+  "version" "2.0.4"
   dependencies:
-    isobject "^4.0.0"
+    "isobject" "^3.0.1"
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+"is-plain-object@^3.0.0":
+  "resolved" "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz"
+  "version" "3.0.1"
+
+"is-plain-object@3.0.0":
+  "resolved" "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    isobject "^3.0.1"
+    "isobject" "^4.0.0"
 
-is-plain-object@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"
+"is-potential-custom-element-name@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"
+  "version" "1.0.0"
 
-is-potential-custom-element-name@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
+"is-promise@^2.0.0", "is-promise@^2.1.0":
+  "resolved" "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"
+  "version" "2.2.2"
 
-is-promise@^2.0.0, is-promise@^2.1.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
-
-is-regex@^1.0.3, is-regex@^1.0.4, is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+"is-regex@^1.0.3", "is-regex@^1.0.4", "is-regex@^1.1.1":
+  "resolved" "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
-    has-symbols "^1.0.1"
+    "has-symbols" "^1.0.1"
 
-is-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+"is-regexp@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"
+  "version" "1.0.0"
 
-is-resolvable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+"is-resolvable@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"
+  "version" "1.1.0"
 
-is-root@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
+"is-root@2.1.0":
+  "resolved" "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz"
+  "version" "2.1.0"
 
-is-set@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43"
+"is-set@^2.0.1":
+  "resolved" "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz"
+  "version" "2.0.1"
 
-is-shallow-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shallow-equal/-/is-shallow-equal-1.0.1.tgz#c410b51eb1c12ee50cd02891d32d1691a132d73c"
+"is-shallow-equal@^1.0.1":
+  "resolved" "https://registry.npmjs.org/is-shallow-equal/-/is-shallow-equal-1.0.1.tgz"
+  "version" "1.0.1"
 
-is-stream@^1.0.1, is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+"is-stream@^1.0.1", "is-stream@^1.1.0":
+  "resolved" "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"
+  "version" "1.1.0"
 
-is-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+"is-stream@^2.0.0":
+  "resolved" "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"
+  "version" "2.0.0"
 
-is-string@^1.0.4, is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+"is-string@^1.0.4", "is-string@^1.0.5":
+  "resolved" "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"
+  "version" "1.0.5"
 
-is-svg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
+"is-svg@^3.0.0":
+  "resolved" "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    html-comment-regex "^1.1.0"
+    "html-comment-regex" "^1.1.0"
 
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+"is-symbol@^1.0.2", "is-symbol@^1.0.3":
+  "resolved" "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"
+  "version" "1.0.3"
   dependencies:
-    has-symbols "^1.0.1"
+    "has-symbols" "^1.0.1"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+"is-typedarray@^1.0.0", "is-typedarray@~1.0.0":
+  "resolved" "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+  "version" "1.0.0"
 
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+"is-whitespace-character@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz"
+  "version" "1.0.4"
 
-is-whitespace-character@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
+"is-window@^1.0.2":
+  "resolved" "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz"
+  "version" "1.0.2"
 
-is-window@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-window/-/is-window-1.0.2.tgz#2c896ca53db97de45d3c33133a65d8c9f563480d"
+"is-windows@^1.0.2":
+  "resolved" "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"
+  "version" "1.0.2"
 
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+"is-word-character@^1.0.0":
+  "resolved" "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz"
+  "version" "1.0.4"
 
-is-word-character@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230"
+"is-wsl@^1.1.0":
+  "resolved" "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"
+  "version" "1.1.0"
 
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-
-is-wsl@^2.1.1, is-wsl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+"is-wsl@^2.1.1":
+  "resolved" "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"
+  "version" "2.2.0"
   dependencies:
-    is-docker "^2.0.0"
+    "is-docker" "^2.0.0"
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+"is-wsl@^2.2.0":
+  "resolved" "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"
+  "version" "2.2.0"
   dependencies:
-    isarray "1.0.0"
+    "is-docker" "^2.0.0"
 
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+"isarray@^1.0.0", "isarray@~1.0.0", "isarray@1.0.0":
+  "resolved" "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+  "version" "1.0.0"
 
-isobject@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
+"isarray@^2.0.5":
+  "resolved" "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"
+  "version" "2.0.5"
 
-isomorphic-fetch@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+"isarray@0.0.1":
+  "resolved" "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+  "version" "0.0.1"
+
+"isexe@^2.0.0":
+  "resolved" "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
+  "version" "2.0.0"
+
+"isobject@^2.0.0":
+  "resolved" "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    node-fetch "^1.0.1"
-    whatwg-fetch ">=0.10.0"
+    "isarray" "1.0.0"
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+"isobject@^3.0.0", "isobject@^3.0.1":
+  "resolved" "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
+  "version" "3.0.1"
 
-istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+"isobject@^4.0.0":
+  "resolved" "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz"
+  "version" "4.0.0"
 
-istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+"isomorphic-fetch@^2.1.1":
+  "resolved" "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"
+  "version" "2.2.1"
+  dependencies:
+    "node-fetch" "^1.0.1"
+    "whatwg-fetch" ">=0.10.0"
 
-istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
+"isstream@~0.1.2":
+  "resolved" "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+  "version" "0.1.2"
+
+"istanbul-lib-coverage@^2.0.5":
+  "resolved" "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"
+  "version" "2.0.5"
+
+"istanbul-lib-coverage@^3.0.0":
+  "resolved" "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"
+  "version" "3.0.0"
+
+"istanbul-lib-instrument@^3.3.0":
+  "resolved" "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz"
+  "version" "3.3.0"
   dependencies:
     "@babel/generator" "^7.4.0"
     "@babel/parser" "^7.4.3"
     "@babel/template" "^7.4.0"
     "@babel/traverse" "^7.4.3"
     "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
+    "istanbul-lib-coverage" "^2.0.5"
+    "semver" "^6.0.0"
 
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+"istanbul-lib-instrument@^4.0.0", "istanbul-lib-instrument@^4.0.3":
+  "resolved" "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
     "@babel/core" "^7.7.5"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
+    "istanbul-lib-coverage" "^3.0.0"
+    "semver" "^6.3.0"
 
-istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+"istanbul-lib-report@^3.0.0":
+  "resolved" "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
-    supports-color "^7.1.0"
+    "istanbul-lib-coverage" "^3.0.0"
+    "make-dir" "^3.0.0"
+    "supports-color" "^7.1.0"
 
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
+"istanbul-lib-source-maps@^4.0.0":
+  "resolved" "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
+    "debug" "^4.1.1"
+    "istanbul-lib-coverage" "^3.0.0"
+    "source-map" "^0.6.1"
 
-istanbul-reports@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+"istanbul-reports@^3.0.2":
+  "resolved" "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
+    "html-escaper" "^2.0.0"
+    "istanbul-lib-report" "^3.0.0"
 
-iterate-iterator@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.1.tgz#1693a768c1ddd79c969051459453f082fe82e9f6"
+"iterate-iterator@^1.0.1":
+  "resolved" "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz"
+  "version" "1.0.1"
 
-iterate-value@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/iterate-value/-/iterate-value-1.0.2.tgz#935115bd37d006a52046535ebc8d07e9c9337f57"
+"iterate-value@^1.0.0":
+  "resolved" "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    es-get-iterator "^1.0.2"
-    iterate-iterator "^1.0.1"
+    "es-get-iterator" "^1.0.2"
+    "iterate-iterator" "^1.0.1"
 
-jake@^10.6.1:
-  version "10.8.2"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
+"jake@^10.6.1":
+  "resolved" "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz"
+  "version" "10.8.2"
   dependencies:
-    async "0.9.x"
-    chalk "^2.4.2"
-    filelist "^1.0.1"
-    minimatch "^3.0.4"
+    "async" "0.9.x"
+    "chalk" "^2.4.2"
+    "filelist" "^1.0.1"
+    "minimatch" "^3.0.4"
 
-jest-canvas-mock@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.3.1.tgz#9535d14bc18ccf1493be36ac37dd349928387826"
-  integrity sha512-5FnSZPrX3Q2ZfsbYNE3wqKR3+XorN8qFzDzB5o0golWgt6EOX1+emBnpOc9IAQ+NXFj8Nzm3h7ZdE/9H0ylBcg==
+"jest-canvas-mock@^2.3.1":
+  "resolved" "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.3.1.tgz"
+  "version" "2.3.1"
   dependencies:
-    cssfontparser "^1.2.1"
-    moo-color "^1.0.2"
+    "cssfontparser" "^1.2.1"
+    "moo-color" "^1.0.2"
 
-jest-changed-files@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.1.tgz#2fac3dc51297977ee883347948d8e3d37c417fba"
+"jest-changed-files@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
-    execa "^4.0.0"
-    throat "^5.0.0"
+    "execa" "^4.0.0"
+    "throat" "^5.0.0"
 
-jest-circus@26.6.0:
-  version "26.6.0"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-26.6.0.tgz#7d9647b2e7f921181869faae1f90a2629fd70705"
+"jest-circus@26.6.0":
+  "resolved" "https://registry.npmjs.org/jest-circus/-/jest-circus-26.6.0.tgz"
+  "version" "26.6.0"
   dependencies:
     "@babel/traverse" "^7.1.0"
     "@jest/environment" "^26.6.0"
@@ -10336,182 +10772,182 @@ jest-circus@26.6.0:
     "@jest/types" "^26.6.0"
     "@types/babel__traverse" "^7.0.4"
     "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    dedent "^0.7.0"
-    expect "^26.6.0"
-    is-generator-fn "^2.0.0"
-    jest-each "^26.6.0"
-    jest-matcher-utils "^26.6.0"
-    jest-message-util "^26.6.0"
-    jest-runner "^26.6.0"
-    jest-runtime "^26.6.0"
-    jest-snapshot "^26.6.0"
-    jest-util "^26.6.0"
-    pretty-format "^26.6.0"
-    stack-utils "^2.0.2"
-    throat "^5.0.0"
+    "chalk" "^4.0.0"
+    "co" "^4.6.0"
+    "dedent" "^0.7.0"
+    "expect" "^26.6.0"
+    "is-generator-fn" "^2.0.0"
+    "jest-each" "^26.6.0"
+    "jest-matcher-utils" "^26.6.0"
+    "jest-message-util" "^26.6.0"
+    "jest-runner" "^26.6.0"
+    "jest-runtime" "^26.6.0"
+    "jest-snapshot" "^26.6.0"
+    "jest-util" "^26.6.0"
+    "pretty-format" "^26.6.0"
+    "stack-utils" "^2.0.2"
+    "throat" "^5.0.0"
 
-jest-cli@^26.6.0:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.1.tgz#8952242fa812c05bd129abf7c022424045b7fd67"
+"jest-cli@^26.6.0":
+  "resolved" "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/core" "^26.6.1"
     "@jest/test-result" "^26.6.1"
     "@jest/types" "^26.6.1"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    import-local "^3.0.2"
-    is-ci "^2.0.0"
-    jest-config "^26.6.1"
-    jest-util "^26.6.1"
-    jest-validate "^26.6.1"
-    prompts "^2.0.1"
-    yargs "^15.4.1"
+    "chalk" "^4.0.0"
+    "exit" "^0.1.2"
+    "graceful-fs" "^4.2.4"
+    "import-local" "^3.0.2"
+    "is-ci" "^2.0.0"
+    "jest-config" "^26.6.1"
+    "jest-util" "^26.6.1"
+    "jest-validate" "^26.6.1"
+    "prompts" "^2.0.1"
+    "yargs" "^15.4.1"
 
-jest-config@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.1.tgz#8c343fbdd9c24ad003e261f73583c3c020f32b42"
+"jest-config@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-config/-/jest-config-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@babel/core" "^7.1.0"
     "@jest/test-sequencer" "^26.6.1"
     "@jest/types" "^26.6.1"
-    babel-jest "^26.6.1"
-    chalk "^4.0.0"
-    deepmerge "^4.2.2"
-    glob "^7.1.1"
-    graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.6.1"
-    jest-environment-node "^26.6.1"
-    jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.6.1"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.1"
-    jest-util "^26.6.1"
-    jest-validate "^26.6.1"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.1"
+    "babel-jest" "^26.6.1"
+    "chalk" "^4.0.0"
+    "deepmerge" "^4.2.2"
+    "glob" "^7.1.1"
+    "graceful-fs" "^4.2.4"
+    "jest-environment-jsdom" "^26.6.1"
+    "jest-environment-node" "^26.6.1"
+    "jest-get-type" "^26.3.0"
+    "jest-jasmine2" "^26.6.1"
+    "jest-regex-util" "^26.0.0"
+    "jest-resolve" "^26.6.1"
+    "jest-util" "^26.6.1"
+    "jest-validate" "^26.6.1"
+    "micromatch" "^4.0.2"
+    "pretty-format" "^26.6.1"
 
-jest-diff@^24.3.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
+"jest-diff@^24.3.0":
+  "resolved" "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
-    chalk "^2.0.1"
-    diff-sequences "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
+    "chalk" "^2.0.1"
+    "diff-sequences" "^24.9.0"
+    "jest-get-type" "^24.9.0"
+    "pretty-format" "^24.9.0"
 
-jest-diff@^25.2.1:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9"
+"jest-diff@^25.2.1":
+  "resolved" "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz"
+  "version" "25.5.0"
   dependencies:
-    chalk "^3.0.0"
-    diff-sequences "^25.2.6"
-    jest-get-type "^25.2.6"
-    pretty-format "^25.5.0"
+    "chalk" "^3.0.0"
+    "diff-sequences" "^25.2.6"
+    "jest-get-type" "^25.2.6"
+    "pretty-format" "^25.5.0"
 
-jest-diff@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.1.tgz#38aa194979f454619bb39bdee299fb64ede5300c"
+"jest-diff@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^26.5.0"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.1"
+    "chalk" "^4.0.0"
+    "diff-sequences" "^26.5.0"
+    "jest-get-type" "^26.3.0"
+    "pretty-format" "^26.6.1"
 
-jest-docblock@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
+"jest-docblock@^26.0.0":
+  "resolved" "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz"
+  "version" "26.0.0"
   dependencies:
-    detect-newline "^3.0.0"
+    "detect-newline" "^3.0.0"
 
-jest-each@^26.6.0, jest-each@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.1.tgz#e968e88309a3e2ae9648634af8f89d8ee5acfddd"
+"jest-each@^26.6.0", "jest-each@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-each/-/jest-each-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
-    chalk "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-util "^26.6.1"
-    pretty-format "^26.6.1"
+    "chalk" "^4.0.0"
+    "jest-get-type" "^26.3.0"
+    "jest-util" "^26.6.1"
+    "pretty-format" "^26.6.1"
 
-jest-environment-jsdom@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.1.tgz#63093bf89daee6139616568a43633b84cf7aac21"
+"jest-environment-jsdom@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/environment" "^26.6.1"
     "@jest/fake-timers" "^26.6.1"
     "@jest/types" "^26.6.1"
     "@types/node" "*"
-    jest-mock "^26.6.1"
-    jest-util "^26.6.1"
-    jsdom "^16.4.0"
+    "jest-mock" "^26.6.1"
+    "jest-util" "^26.6.1"
+    "jsdom" "^16.4.0"
 
-jest-environment-node@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.1.tgz#4d73d8b33c26989a92a0ed3ad0bfd6f7a196d9bd"
+"jest-environment-node@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/environment" "^26.6.1"
     "@jest/fake-timers" "^26.6.1"
     "@jest/types" "^26.6.1"
     "@types/node" "*"
-    jest-mock "^26.6.1"
-    jest-util "^26.6.1"
+    "jest-mock" "^26.6.1"
+    "jest-util" "^26.6.1"
 
-jest-get-type@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
+"jest-get-type@^24.9.0":
+  "resolved" "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz"
+  "version" "24.9.0"
 
-jest-get-type@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
+"jest-get-type@^25.2.6":
+  "resolved" "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz"
+  "version" "25.2.6"
 
-jest-get-type@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
+"jest-get-type@^26.3.0":
+  "resolved" "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz"
+  "version" "26.3.0"
 
-jest-haste-map@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
+"jest-haste-map@^24.9.0":
+  "resolved" "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
     "@jest/types" "^24.9.0"
-    anymatch "^2.0.0"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.1.15"
-    invariant "^2.2.4"
-    jest-serializer "^24.9.0"
-    jest-util "^24.9.0"
-    jest-worker "^24.9.0"
-    micromatch "^3.1.10"
-    sane "^4.0.3"
-    walker "^1.0.7"
+    "anymatch" "^2.0.0"
+    "fb-watchman" "^2.0.0"
+    "graceful-fs" "^4.1.15"
+    "invariant" "^2.2.4"
+    "jest-serializer" "^24.9.0"
+    "jest-util" "^24.9.0"
+    "jest-worker" "^24.9.0"
+    "micromatch" "^3.1.10"
+    "sane" "^4.0.3"
+    "walker" "^1.0.7"
   optionalDependencies:
-    fsevents "^1.2.7"
+    "fsevents" "^1.2.7"
 
-jest-haste-map@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.1.tgz#97e96f5fd7576d980307fbe6160b10c016b543d4"
+"jest-haste-map@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
     "@types/graceful-fs" "^4.1.2"
     "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-regex-util "^26.0.0"
-    jest-serializer "^26.5.0"
-    jest-util "^26.6.1"
-    jest-worker "^26.6.1"
-    micromatch "^4.0.2"
-    sane "^4.0.3"
-    walker "^1.0.7"
+    "anymatch" "^3.0.3"
+    "fb-watchman" "^2.0.0"
+    "graceful-fs" "^4.2.4"
+    "jest-regex-util" "^26.0.0"
+    "jest-serializer" "^26.5.0"
+    "jest-util" "^26.6.1"
+    "jest-worker" "^26.6.1"
+    "micromatch" "^4.0.2"
+    "sane" "^4.0.3"
+    "walker" "^1.0.7"
   optionalDependencies:
-    fsevents "^2.1.2"
+    "fsevents" "^2.1.2"
 
-jest-jasmine2@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.1.tgz#11c92603d1fa97e3c33404359e69d6cec7e57017"
+"jest-jasmine2@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@babel/traverse" "^7.1.0"
     "@jest/environment" "^26.6.1"
@@ -10519,148 +10955,160 @@ jest-jasmine2@^26.6.1:
     "@jest/test-result" "^26.6.1"
     "@jest/types" "^26.6.1"
     "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    expect "^26.6.1"
-    is-generator-fn "^2.0.0"
-    jest-each "^26.6.1"
-    jest-matcher-utils "^26.6.1"
-    jest-message-util "^26.6.1"
-    jest-runtime "^26.6.1"
-    jest-snapshot "^26.6.1"
-    jest-util "^26.6.1"
-    pretty-format "^26.6.1"
-    throat "^5.0.0"
+    "chalk" "^4.0.0"
+    "co" "^4.6.0"
+    "expect" "^26.6.1"
+    "is-generator-fn" "^2.0.0"
+    "jest-each" "^26.6.1"
+    "jest-matcher-utils" "^26.6.1"
+    "jest-message-util" "^26.6.1"
+    "jest-runtime" "^26.6.1"
+    "jest-snapshot" "^26.6.1"
+    "jest-util" "^26.6.1"
+    "pretty-format" "^26.6.1"
+    "throat" "^5.0.0"
 
-jest-leak-detector@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.1.tgz#f63e46dc4e3aa30d29b40ae49966a15730d25bbe"
+"jest-leak-detector@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.1"
+    "jest-get-type" "^26.3.0"
+    "pretty-format" "^26.6.1"
 
-jest-matcher-utils@^26.6.0, jest-matcher-utils@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.1.tgz#bc90822d352c91c2ec1814731327691d06598400"
+"jest-matcher-utils@^26.6.0", "jest-matcher-utils@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
-    chalk "^4.0.0"
-    jest-diff "^26.6.1"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.1"
+    "chalk" "^4.0.0"
+    "jest-diff" "^26.6.1"
+    "jest-get-type" "^26.3.0"
+    "pretty-format" "^26.6.1"
 
-jest-message-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
+"jest-message-util@^24.9.0":
+  "resolved" "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@jest/test-result" "^24.9.0"
     "@jest/types" "^24.9.0"
     "@types/stack-utils" "^1.0.1"
-    chalk "^2.0.1"
-    micromatch "^3.1.10"
-    slash "^2.0.0"
-    stack-utils "^1.0.1"
+    "chalk" "^2.0.1"
+    "micromatch" "^3.1.10"
+    "slash" "^2.0.0"
+    "stack-utils" "^1.0.1"
 
-jest-message-util@^26.6.0, jest-message-util@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.1.tgz#d62c20c0fe7be10bfd6020b675abb9b5fa933ff3"
+"jest-message-util@^26.6.0", "jest-message-util@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@jest/types" "^26.6.1"
     "@types/stack-utils" "^2.0.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    micromatch "^4.0.2"
-    slash "^3.0.0"
-    stack-utils "^2.0.2"
+    "chalk" "^4.0.0"
+    "graceful-fs" "^4.2.4"
+    "micromatch" "^4.0.2"
+    "slash" "^3.0.0"
+    "stack-utils" "^2.0.2"
 
-jest-mock@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6"
+"jest-mock@^24.9.0":
+  "resolved" "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
     "@jest/types" "^24.9.0"
 
-jest-mock@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.1.tgz#6c12a92a82fc833f81a5b6de6b67d78386e276a3"
+"jest-mock@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
     "@types/node" "*"
 
-jest-pnp-resolver@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
+"jest-pnp-resolver@^1.2.2":
+  "resolved" "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"
+  "version" "1.2.2"
 
-jest-regex-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
+"jest-regex-util@^24.9.0":
+  "resolved" "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz"
+  "version" "24.9.0"
 
-jest-regex-util@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
+"jest-regex-util@^26.0.0":
+  "resolved" "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz"
+  "version" "26.0.0"
 
-jest-resolve-dependencies@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.1.tgz#e9d091a159ad198c029279737a8b4c507791d75c"
+"jest-resolve-dependencies@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
-    jest-regex-util "^26.0.0"
-    jest-snapshot "^26.6.1"
+    "jest-regex-util" "^26.0.0"
+    "jest-snapshot" "^26.6.1"
 
-jest-resolve@26.6.0:
-  version "26.6.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.0.tgz#070fe7159af87b03e50f52ea5e17ee95bbee40e1"
+"jest-resolve@*":
+  "version" "26.6.0"
   dependencies:
     "@jest/types" "^26.6.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^26.6.0"
-    read-pkg-up "^7.0.1"
-    resolve "^1.17.0"
-    slash "^3.0.0"
+    "chalk" "^4.0.0"
+    "graceful-fs" "^4.2.4"
+    "jest-pnp-resolver" "^1.2.2"
+    "jest-util" "^26.6.0"
+    "read-pkg-up" "^7.0.1"
+    "resolve" "^1.17.0"
+    "slash" "^3.0.0"
 
-jest-resolve@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.1.tgz#e9a9130cc069620d5aeeb87043dd9e130b68c6a1"
+"jest-resolve@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^26.6.1"
-    read-pkg-up "^7.0.1"
-    resolve "^1.18.1"
-    slash "^3.0.0"
+    "chalk" "^4.0.0"
+    "graceful-fs" "^4.2.4"
+    "jest-pnp-resolver" "^1.2.2"
+    "jest-util" "^26.6.1"
+    "read-pkg-up" "^7.0.1"
+    "resolve" "^1.18.1"
+    "slash" "^3.0.0"
 
-jest-runner@^26.6.0, jest-runner@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.1.tgz#a945971b5a23740c1fe20e372a38de668b7c76bf"
+"jest-resolve@26.6.0":
+  "resolved" "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.0.tgz"
+  "version" "26.6.0"
+  dependencies:
+    "@jest/types" "^26.6.0"
+    "chalk" "^4.0.0"
+    "graceful-fs" "^4.2.4"
+    "jest-pnp-resolver" "^1.2.2"
+    "jest-util" "^26.6.0"
+    "read-pkg-up" "^7.0.1"
+    "resolve" "^1.17.0"
+    "slash" "^3.0.0"
+
+"jest-runner@^26.6.0", "jest-runner@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/console" "^26.6.1"
     "@jest/environment" "^26.6.1"
     "@jest/test-result" "^26.6.1"
     "@jest/types" "^26.6.1"
     "@types/node" "*"
-    chalk "^4.0.0"
-    emittery "^0.7.1"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.1"
-    jest-docblock "^26.0.0"
-    jest-haste-map "^26.6.1"
-    jest-leak-detector "^26.6.1"
-    jest-message-util "^26.6.1"
-    jest-resolve "^26.6.1"
-    jest-runtime "^26.6.1"
-    jest-util "^26.6.1"
-    jest-worker "^26.6.1"
-    source-map-support "^0.5.6"
-    throat "^5.0.0"
+    "chalk" "^4.0.0"
+    "emittery" "^0.7.1"
+    "exit" "^0.1.2"
+    "graceful-fs" "^4.2.4"
+    "jest-config" "^26.6.1"
+    "jest-docblock" "^26.0.0"
+    "jest-haste-map" "^26.6.1"
+    "jest-leak-detector" "^26.6.1"
+    "jest-message-util" "^26.6.1"
+    "jest-resolve" "^26.6.1"
+    "jest-runtime" "^26.6.1"
+    "jest-util" "^26.6.1"
+    "jest-worker" "^26.6.1"
+    "source-map-support" "^0.5.6"
+    "throat" "^5.0.0"
 
-jest-runtime@^26.6.0, jest-runtime@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.1.tgz#9a131e7b4f0bc6beefd62e7443f757c1d5fa9dec"
+"jest-runtime@^26.6.0", "jest-runtime@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/console" "^26.6.1"
     "@jest/environment" "^26.6.1"
@@ -10671,212 +11119,210 @@ jest-runtime@^26.6.0, jest-runtime@^26.6.1:
     "@jest/transform" "^26.6.1"
     "@jest/types" "^26.6.1"
     "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-    cjs-module-lexer "^0.4.2"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.1"
-    jest-haste-map "^26.6.1"
-    jest-message-util "^26.6.1"
-    jest-mock "^26.6.1"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.1"
-    jest-snapshot "^26.6.1"
-    jest-util "^26.6.1"
-    jest-validate "^26.6.1"
-    slash "^3.0.0"
-    strip-bom "^4.0.0"
-    yargs "^15.4.1"
+    "chalk" "^4.0.0"
+    "cjs-module-lexer" "^0.4.2"
+    "collect-v8-coverage" "^1.0.0"
+    "exit" "^0.1.2"
+    "glob" "^7.1.3"
+    "graceful-fs" "^4.2.4"
+    "jest-config" "^26.6.1"
+    "jest-haste-map" "^26.6.1"
+    "jest-message-util" "^26.6.1"
+    "jest-mock" "^26.6.1"
+    "jest-regex-util" "^26.0.0"
+    "jest-resolve" "^26.6.1"
+    "jest-snapshot" "^26.6.1"
+    "jest-util" "^26.6.1"
+    "jest-validate" "^26.6.1"
+    "slash" "^3.0.0"
+    "strip-bom" "^4.0.0"
+    "yargs" "^15.4.1"
 
-jest-serializer@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
+"jest-serializer@^24.9.0":
+  "resolved" "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz"
+  "version" "24.9.0"
 
-jest-serializer@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.5.0.tgz#f5425cc4c5f6b4b355f854b5f0f23ec6b962bc13"
+"jest-serializer@^26.5.0":
+  "resolved" "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz"
+  "version" "26.5.0"
   dependencies:
     "@types/node" "*"
-    graceful-fs "^4.2.4"
+    "graceful-fs" "^4.2.4"
 
-jest-snapshot@^26.6.0, jest-snapshot@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.1.tgz#469e9d0b749496aea7dad0d7e5e5c88b91cdb4cc"
+"jest-snapshot@^26.6.0", "jest-snapshot@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@babel/types" "^7.0.0"
     "@jest/types" "^26.6.1"
     "@types/babel__traverse" "^7.0.4"
     "@types/prettier" "^2.0.0"
-    chalk "^4.0.0"
-    expect "^26.6.1"
-    graceful-fs "^4.2.4"
-    jest-diff "^26.6.1"
-    jest-get-type "^26.3.0"
-    jest-haste-map "^26.6.1"
-    jest-matcher-utils "^26.6.1"
-    jest-message-util "^26.6.1"
-    jest-resolve "^26.6.1"
-    natural-compare "^1.4.0"
-    pretty-format "^26.6.1"
-    semver "^7.3.2"
+    "chalk" "^4.0.0"
+    "expect" "^26.6.1"
+    "graceful-fs" "^4.2.4"
+    "jest-diff" "^26.6.1"
+    "jest-get-type" "^26.3.0"
+    "jest-haste-map" "^26.6.1"
+    "jest-matcher-utils" "^26.6.1"
+    "jest-message-util" "^26.6.1"
+    "jest-resolve" "^26.6.1"
+    "natural-compare" "^1.4.0"
+    "pretty-format" "^26.6.1"
+    "semver" "^7.3.2"
 
-jest-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162"
+"jest-util@^24.9.0":
+  "resolved" "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
     "@jest/console" "^24.9.0"
     "@jest/fake-timers" "^24.9.0"
     "@jest/source-map" "^24.9.0"
     "@jest/test-result" "^24.9.0"
     "@jest/types" "^24.9.0"
-    callsites "^3.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.15"
-    is-ci "^2.0.0"
-    mkdirp "^0.5.1"
-    slash "^2.0.0"
-    source-map "^0.6.0"
+    "callsites" "^3.0.0"
+    "chalk" "^2.0.1"
+    "graceful-fs" "^4.1.15"
+    "is-ci" "^2.0.0"
+    "mkdirp" "^0.5.1"
+    "slash" "^2.0.0"
+    "source-map" "^0.6.0"
 
-jest-util@^26.1.0:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
-  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
+"jest-util@^26.1.0":
+  "resolved" "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz"
+  "version" "26.6.2"
   dependencies:
     "@jest/types" "^26.6.2"
     "@types/node" "*"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^2.0.0"
-    micromatch "^4.0.2"
+    "chalk" "^4.0.0"
+    "graceful-fs" "^4.2.4"
+    "is-ci" "^2.0.0"
+    "micromatch" "^4.0.2"
 
-jest-util@^26.6.0, jest-util@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.1.tgz#4cc0d09ec57f28d12d053887eec5dc976a352e9b"
+"jest-util@^26.6.0", "jest-util@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-util/-/jest-util-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
     "@types/node" "*"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^2.0.0"
-    micromatch "^4.0.2"
+    "chalk" "^4.0.0"
+    "graceful-fs" "^4.2.4"
+    "is-ci" "^2.0.0"
+    "micromatch" "^4.0.2"
 
-jest-validate@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.1.tgz#28730eb8570d60968d9d06f1a8c94d922167bd2a"
+"jest-validate@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
-    camelcase "^6.0.0"
-    chalk "^4.0.0"
-    jest-get-type "^26.3.0"
-    leven "^3.1.0"
-    pretty-format "^26.6.1"
+    "camelcase" "^6.0.0"
+    "chalk" "^4.0.0"
+    "jest-get-type" "^26.3.0"
+    "leven" "^3.1.0"
+    "pretty-format" "^26.6.1"
 
-jest-watch-typeahead@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.6.1.tgz#45221b86bb6710b7e97baaa1640ae24a07785e63"
+"jest-watch-typeahead@0.6.1":
+  "resolved" "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-0.6.1.tgz"
+  "version" "0.6.1"
   dependencies:
-    ansi-escapes "^4.3.1"
-    chalk "^4.0.0"
-    jest-regex-util "^26.0.0"
-    jest-watcher "^26.3.0"
-    slash "^3.0.0"
-    string-length "^4.0.1"
-    strip-ansi "^6.0.0"
+    "ansi-escapes" "^4.3.1"
+    "chalk" "^4.0.0"
+    "jest-regex-util" "^26.0.0"
+    "jest-watcher" "^26.3.0"
+    "slash" "^3.0.0"
+    "string-length" "^4.0.1"
+    "strip-ansi" "^6.0.0"
 
-jest-watcher@^26.3.0, jest-watcher@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.1.tgz#debfa34e9c5c3e735593403794fe53d2955bfabc"
+"jest-watcher@^26.3.0", "jest-watcher@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/test-result" "^26.6.1"
     "@jest/types" "^26.6.1"
     "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    jest-util "^26.6.1"
-    string-length "^4.0.1"
+    "ansi-escapes" "^4.2.1"
+    "chalk" "^4.0.0"
+    "jest-util" "^26.6.1"
+    "string-length" "^4.0.1"
 
-jest-worker@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
+"jest-worker@^24.9.0":
+  "resolved" "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
-    merge-stream "^2.0.0"
-    supports-color "^6.1.0"
+    "merge-stream" "^2.0.0"
+    "supports-color" "^6.1.0"
 
-jest-worker@^25.4.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1"
+"jest-worker@^25.4.0":
+  "resolved" "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz"
+  "version" "25.5.0"
   dependencies:
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
+    "merge-stream" "^2.0.0"
+    "supports-color" "^7.0.0"
 
-jest-worker@^26.5.0, jest-worker@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.1.tgz#c2ae8cde6802cc14056043f997469ec170d9c32a"
+"jest-worker@^26.5.0", "jest-worker@^26.6.1":
+  "resolved" "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
+    "merge-stream" "^2.0.0"
+    "supports-color" "^7.0.0"
 
-jest@26.6.0:
-  version "26.6.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.0.tgz#546b25a1d8c888569dbbe93cae131748086a4a25"
+"jest@^26.0.0", "jest@>=26 <27", "jest@26.6.0":
+  "resolved" "https://registry.npmjs.org/jest/-/jest-26.6.0.tgz"
+  "version" "26.6.0"
   dependencies:
     "@jest/core" "^26.6.0"
-    import-local "^3.0.2"
-    jest-cli "^26.6.0"
+    "import-local" "^3.0.2"
+    "jest-cli" "^26.6.0"
 
-js-base64@^2.1.8:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
+"js-base64@^2.1.8":
+  "resolved" "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz"
+  "version" "2.6.4"
 
-js-levenshtein@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
-  integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
+"js-levenshtein@^1.1.6":
+  "resolved" "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz"
+  "version" "1.1.6"
 
-js-sha256@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
+"js-sha256@^0.9.0":
+  "resolved" "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz"
+  "version" "0.9.0"
 
-js-string-escape@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+"js-string-escape@^1.0.1":
+  "resolved" "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz"
+  "version" "1.0.1"
 
-js-stringify@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+"js-stringify@^1.0.2":
+  "resolved" "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"
+  "version" "1.0.2"
 
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+"js-tokens@^3.0.0 || ^4.0.0", "js-tokens@^4.0.0":
+  "resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
+  "version" "4.0.0"
 
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+"js-tokens@^3.0.2":
+  "resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"
+  "version" "3.0.2"
 
-js-yaml@3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+"js-yaml@^3.13.1":
+  "resolved" "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"
+  "version" "3.14.0"
   dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
+    "argparse" "^1.0.7"
+    "esprima" "^4.0.0"
 
-js-yaml@^3.13.1:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+"js-yaml@3.13.1":
+  "resolved" "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"
+  "version" "3.13.1"
   dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
+    "argparse" "^1.0.7"
+    "esprima" "^4.0.0"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+"jsbn@~0.1.0":
+  "resolved" "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
+  "version" "0.1.1"
 
-jscodeshift@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.7.1.tgz#0236ad475d6f0770ca998a0160925d62b57d2507"
+"jscodeshift@^0.7.0":
+  "resolved" "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.1.tgz"
+  "version" "0.7.1"
   dependencies:
     "@babel/core" "^7.1.6"
     "@babel/parser" "^7.1.6"
@@ -10886,1157 +11332,1214 @@ jscodeshift@^0.7.0:
     "@babel/preset-flow" "^7.0.0"
     "@babel/preset-typescript" "^7.1.0"
     "@babel/register" "^7.0.0"
-    babel-core "^7.0.0-bridge.0"
-    colors "^1.1.2"
-    flow-parser "0.*"
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    neo-async "^2.5.0"
-    node-dir "^0.1.17"
-    recast "^0.18.1"
-    temp "^0.8.1"
-    write-file-atomic "^2.3.0"
+    "babel-core" "^7.0.0-bridge.0"
+    "colors" "^1.1.2"
+    "flow-parser" "0.*"
+    "graceful-fs" "^4.1.11"
+    "micromatch" "^3.1.10"
+    "neo-async" "^2.5.0"
+    "node-dir" "^0.1.17"
+    "recast" "^0.18.1"
+    "temp" "^0.8.1"
+    "write-file-atomic" "^2.3.0"
 
-jsdom@^16.4.0:
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
+"jsdom@^16.4.0":
+  "resolved" "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz"
+  "version" "16.4.0"
   dependencies:
-    abab "^2.0.3"
-    acorn "^7.1.1"
-    acorn-globals "^6.0.0"
-    cssom "^0.4.4"
-    cssstyle "^2.2.0"
-    data-urls "^2.0.0"
-    decimal.js "^10.2.0"
-    domexception "^2.0.1"
-    escodegen "^1.14.1"
-    html-encoding-sniffer "^2.0.1"
-    is-potential-custom-element-name "^1.0.0"
-    nwsapi "^2.2.0"
-    parse5 "5.1.1"
-    request "^2.88.2"
-    request-promise-native "^1.0.8"
-    saxes "^5.0.0"
-    symbol-tree "^3.2.4"
-    tough-cookie "^3.0.1"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.1.0"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-    ws "^7.2.3"
-    xml-name-validator "^3.0.0"
+    "abab" "^2.0.3"
+    "acorn" "^7.1.1"
+    "acorn-globals" "^6.0.0"
+    "cssom" "^0.4.4"
+    "cssstyle" "^2.2.0"
+    "data-urls" "^2.0.0"
+    "decimal.js" "^10.2.0"
+    "domexception" "^2.0.1"
+    "escodegen" "^1.14.1"
+    "html-encoding-sniffer" "^2.0.1"
+    "is-potential-custom-element-name" "^1.0.0"
+    "nwsapi" "^2.2.0"
+    "parse5" "5.1.1"
+    "request" "^2.88.2"
+    "request-promise-native" "^1.0.8"
+    "saxes" "^5.0.0"
+    "symbol-tree" "^3.2.4"
+    "tough-cookie" "^3.0.1"
+    "w3c-hr-time" "^1.0.2"
+    "w3c-xmlserializer" "^2.0.0"
+    "webidl-conversions" "^6.1.0"
+    "whatwg-encoding" "^1.0.5"
+    "whatwg-mimetype" "^2.3.0"
+    "whatwg-url" "^8.0.0"
+    "ws" "^7.2.3"
+    "xml-name-validator" "^3.0.0"
 
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+"jsesc@^2.5.1":
+  "resolved" "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
+  "version" "2.5.2"
 
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+"jsesc@~0.5.0":
+  "resolved" "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
+  "version" "0.5.0"
 
-json-fn@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/json-fn/-/json-fn-1.1.1.tgz#4293c9198a482d6697d334a6e32cd0d221121e80"
-
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-
-json-parse-even-better-errors@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-schema@^0.2.3:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.5.tgz#97997f50972dd0500214e208c407efa4b5d7063b"
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-json3@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-
-json5@2.x, json5@^2.1.1, json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+"jshint@^2.12.0":
+  "resolved" "https://registry.npmjs.org/jshint/-/jshint-2.13.0.tgz"
+  "version" "2.13.0"
   dependencies:
-    minimist "^1.2.5"
+    "cli" "~1.0.0"
+    "console-browserify" "1.1.x"
+    "exit" "0.1.x"
+    "htmlparser2" "3.8.x"
+    "lodash" "~4.17.21"
+    "minimatch" "~3.0.2"
+    "shelljs" "0.3.x"
+    "strip-json-comments" "1.0.x"
 
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+"json-fn@^1.1.1":
+  "resolved" "https://registry.npmjs.org/json-fn/-/json-fn-1.1.1.tgz"
+  "version" "1.1.1"
+
+"json-parse-better-errors@^1.0.1", "json-parse-better-errors@^1.0.2":
+  "resolved" "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"
+  "version" "1.0.2"
+
+"json-parse-even-better-errors@^2.3.0":
+  "resolved" "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
+  "version" "2.3.1"
+
+"json-schema-traverse@^0.4.1":
+  "resolved" "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+  "version" "0.4.1"
+
+"json-schema@^0.2.3":
+  "resolved" "https://registry.npmjs.org/json-schema/-/json-schema-0.2.5.tgz"
+  "version" "0.2.5"
+
+"json-schema@0.2.3":
+  "resolved" "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"
+  "version" "0.2.3"
+
+"json-stable-stringify-without-jsonify@^1.0.1":
+  "resolved" "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
+  "version" "1.0.1"
+
+"json-stringify-safe@^5.0.1", "json-stringify-safe@~5.0.1":
+  "resolved" "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+  "version" "5.0.1"
+
+"json3@^3.3.2":
+  "resolved" "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"
+  "version" "3.3.3"
+
+"json5@^1.0.1":
+  "resolved" "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    minimist "^1.2.0"
+    "minimist" "^1.2.0"
 
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+"json5@^2.1.1", "json5@^2.1.2", "json5@2.x":
+  "resolved" "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz"
+  "version" "2.1.3"
+  dependencies:
+    "minimist" "^1.2.5"
+
+"jsonfile@^2.1.0":
+  "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"
+  "version" "2.4.0"
   optionalDependencies:
-    graceful-fs "^4.1.6"
+    "graceful-fs" "^4.1.6"
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+"jsonfile@^4.0.0":
+  "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"
+  "version" "4.0.0"
   optionalDependencies:
-    graceful-fs "^4.1.6"
+    "graceful-fs" "^4.1.6"
 
-jsonfile@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
+"jsonfile@^6.0.1":
+  "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz"
+  "version" "6.0.1"
   dependencies:
-    universalify "^1.0.0"
+    "universalify" "^1.0.0"
   optionalDependencies:
-    graceful-fs "^4.1.6"
+    "graceful-fs" "^4.1.6"
 
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+"jsprim@^1.2.2":
+  "resolved" "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"
+  "version" "1.4.1"
   dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
+    "assert-plus" "1.0.0"
+    "extsprintf" "1.3.0"
+    "json-schema" "0.2.3"
+    "verror" "1.10.0"
 
-jstransformer@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+"jstransformer@1.0.0":
+  "resolved" "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    is-promise "^2.0.0"
-    promise "^7.0.1"
+    "is-promise" "^2.0.0"
+    "promise" "^7.0.1"
 
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz#642f1d7b88aa6d7eb9d8f2210e166478444fa891"
+"jsx-ast-utils@^2.4.1 || ^3.0.0", "jsx-ast-utils@^3.1.0":
+  "resolved" "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    array-includes "^3.1.1"
-    object.assign "^4.1.1"
+    "array-includes" "^3.1.1"
+    "object.assign" "^4.1.1"
 
-killable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-
-kind-of@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
+"jszip@^3.1.3":
+  "resolved" "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz"
+  "version" "3.6.0"
   dependencies:
-    is-buffer "^1.0.2"
+    "lie" "~3.3.0"
+    "pako" "~1.0.2"
+    "readable-stream" "~2.3.6"
+    "set-immediate-shim" "~1.0.1"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+"killable@^1.0.1":
+  "resolved" "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"
+  "version" "1.0.1"
+
+"kind-of@^2.0.1":
+  "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    is-buffer "^1.1.5"
+    "is-buffer" "^1.0.2"
 
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+"kind-of@^3.0.2":
+  "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
+  "version" "3.2.2"
   dependencies:
-    is-buffer "^1.1.5"
+    "is-buffer" "^1.1.5"
 
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+"kind-of@^3.0.3":
+  "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
+  "version" "3.2.2"
+  dependencies:
+    "is-buffer" "^1.1.5"
 
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+"kind-of@^3.2.0":
+  "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
+  "version" "3.2.2"
+  dependencies:
+    "is-buffer" "^1.1.5"
 
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+"kind-of@^4.0.0":
+  "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"
+  "version" "4.0.0"
+  dependencies:
+    "is-buffer" "^1.1.5"
+
+"kind-of@^5.0.0":
+  "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"
+  "version" "5.1.0"
+
+"kind-of@^6.0.0", "kind-of@^6.0.2", "kind-of@^6.0.3":
+  "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
+  "version" "6.0.3"
+
+"klaw-sync@^6.0.0":
+  "resolved" "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz"
+  "version" "6.0.0"
+  dependencies:
+    "graceful-fs" "^4.1.11"
+
+"klaw@^1.0.0":
+  "resolved" "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"
+  "version" "1.3.1"
   optionalDependencies:
-    graceful-fs "^4.1.9"
+    "graceful-fs" "^4.1.9"
 
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+"kleur@^3.0.3":
+  "resolved" "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"
+  "version" "3.0.3"
 
-language-subtag-registry@~0.3.2:
-  version "0.3.21"
-  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a"
+"language-subtag-registry@~0.3.2":
+  "resolved" "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz"
+  "version" "0.3.21"
 
-language-tags@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a"
+"language-tags@^1.0.5":
+  "resolved" "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz"
+  "version" "1.0.5"
   dependencies:
-    language-subtag-registry "~0.3.2"
+    "language-subtag-registry" "~0.3.2"
 
-last-call-webpack-plugin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555"
+"last-call-webpack-plugin@^3.0.0":
+  "resolved" "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    lodash "^4.17.5"
-    webpack-sources "^1.1.0"
+    "lodash" "^4.17.5"
+    "webpack-sources" "^1.1.0"
 
-lazy-ass@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
+"lazy-ass@^1.6.0":
+  "resolved" "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz"
+  "version" "1.6.0"
 
-lazy-cache@^0.2.3:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
+"lazy-cache@^0.2.3":
+  "resolved" "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"
+  "version" "0.2.7"
 
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+"lazy-cache@^1.0.3":
+  "resolved" "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"
+  "version" "1.0.4"
 
-lazy-universal-dotenv@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz#a6c8938414bca426ab8c9463940da451a911db38"
+"lazy-universal-dotenv@^3.0.1":
+  "resolved" "https://registry.npmjs.org/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
     "@babel/runtime" "^7.5.0"
-    app-root-dir "^1.0.2"
-    core-js "^3.0.4"
-    dotenv "^8.0.0"
-    dotenv-expand "^5.1.0"
+    "app-root-dir" "^1.0.2"
+    "core-js" "^3.0.4"
+    "dotenv" "^8.0.0"
+    "dotenv-expand" "^5.1.0"
 
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+"leven@^3.1.0":
+  "resolved" "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"
+  "version" "3.1.0"
 
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+"levenary@^1.1.1":
+  "resolved" "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
-    leven "^3.1.0"
+    "leven" "^3.1.0"
 
-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+"levn@^0.4.1":
+  "resolved" "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"
+  "version" "0.4.1"
   dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
+    "prelude-ls" "^1.2.1"
+    "type-check" "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+"levn@~0.3.0":
+  "resolved" "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"
+  "version" "0.3.0"
   dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
+    "prelude-ls" "~1.1.2"
+    "type-check" "~0.3.2"
 
-lie@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+"lie@~3.3.0":
+  "resolved" "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz"
+  "version" "3.3.0"
   dependencies:
-    immediate "~3.0.5"
+    "immediate" "~3.0.5"
 
-line-column@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
+"lie@3.1.1":
+  "resolved" "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"
+  "version" "3.1.1"
   dependencies:
-    isarray "^1.0.0"
-    isobject "^2.0.0"
+    "immediate" "~3.0.5"
 
-lines-and-columns@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
-
-lint-staged@^9.2.5:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.5.0.tgz#290ec605252af646d9b74d73a0fa118362b05a33"
+"line-column@^1.0.2":
+  "resolved" "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    chalk "^2.4.2"
-    commander "^2.20.0"
-    cosmiconfig "^5.2.1"
-    debug "^4.1.1"
-    dedent "^0.7.0"
-    del "^5.0.0"
-    execa "^2.0.3"
-    listr "^0.14.3"
-    log-symbols "^3.0.0"
-    micromatch "^4.0.2"
-    normalize-path "^3.0.0"
-    please-upgrade-node "^3.1.1"
-    string-argv "^0.3.0"
-    stringify-object "^3.3.0"
+    "isarray" "^1.0.0"
+    "isobject" "^2.0.0"
 
-listr-silent-renderer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
+"lines-and-columns@^1.1.6":
+  "resolved" "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz"
+  "version" "1.1.6"
 
-listr-update-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
+"lint-staged@^9.2.5":
+  "resolved" "https://registry.npmjs.org/lint-staged/-/lint-staged-9.5.0.tgz"
+  "version" "9.5.0"
   dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
+    "chalk" "^2.4.2"
+    "commander" "^2.20.0"
+    "cosmiconfig" "^5.2.1"
+    "debug" "^4.1.1"
+    "dedent" "^0.7.0"
+    "del" "^5.0.0"
+    "execa" "^2.0.3"
+    "listr" "^0.14.3"
+    "log-symbols" "^3.0.0"
+    "micromatch" "^4.0.2"
+    "normalize-path" "^3.0.0"
+    "please-upgrade-node" "^3.1.1"
+    "string-argv" "^0.3.0"
+    "stringify-object" "^3.3.0"
 
-listr-verbose-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
+"listr-silent-renderer@^1.1.1":
+  "resolved" "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz"
+  "version" "1.1.1"
+
+"listr-update-renderer@^0.5.0":
+  "resolved" "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz"
+  "version" "0.5.0"
   dependencies:
-    chalk "^2.4.1"
-    cli-cursor "^2.1.0"
-    date-fns "^1.27.2"
-    figures "^2.0.0"
+    "chalk" "^1.1.3"
+    "cli-truncate" "^0.2.1"
+    "elegant-spinner" "^1.0.1"
+    "figures" "^1.7.0"
+    "indent-string" "^3.0.0"
+    "log-symbols" "^1.0.2"
+    "log-update" "^2.3.0"
+    "strip-ansi" "^3.0.1"
 
-listr@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
+"listr-verbose-renderer@^0.5.0":
+  "resolved" "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz"
+  "version" "0.5.0"
+  dependencies:
+    "chalk" "^2.4.1"
+    "cli-cursor" "^2.1.0"
+    "date-fns" "^1.27.2"
+    "figures" "^2.0.0"
+
+"listr@^0.14.2", "listr@^0.14.3":
+  "resolved" "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz"
+  "version" "0.14.3"
   dependencies:
     "@samverschueren/stream-to-observable" "^0.3.0"
-    is-observable "^1.1.0"
-    is-promise "^2.1.0"
-    is-stream "^1.1.0"
-    listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.5.0"
-    listr-verbose-renderer "^0.5.0"
-    p-map "^2.0.0"
-    rxjs "^6.3.3"
+    "is-observable" "^1.1.0"
+    "is-promise" "^2.1.0"
+    "is-stream" "^1.1.0"
+    "listr-silent-renderer" "^1.1.1"
+    "listr-update-renderer" "^0.5.0"
+    "listr-verbose-renderer" "^0.5.0"
+    "p-map" "^2.0.0"
+    "rxjs" "^6.3.3"
 
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+"load-json-file@^2.0.0":
+  "resolved" "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
+    "graceful-fs" "^4.1.2"
+    "parse-json" "^2.2.0"
+    "pify" "^2.0.0"
+    "strip-bom" "^3.0.0"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+"load-json-file@^4.0.0":
+  "resolved" "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
+    "graceful-fs" "^4.1.2"
+    "parse-json" "^4.0.0"
+    "pify" "^3.0.0"
+    "strip-bom" "^3.0.0"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+"load-script@^1.0.0":
+  "resolved" "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz"
+  "version" "1.0.0"
+
+"loader-runner@^2.4.0":
+  "resolved" "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz"
+  "version" "2.4.0"
+
+"loader-utils@^1.0.0", "loader-utils@^1.0.2", "loader-utils@^1.1.0", "loader-utils@^1.2.3", "loader-utils@^1.4.0":
+  "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"
+  "version" "1.4.0"
   dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
+    "big.js" "^5.2.2"
+    "emojis-list" "^3.0.0"
+    "json5" "^1.0.1"
 
-load-script@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/load-script/-/load-script-1.0.0.tgz#0491939e0bee5643ee494a7e3da3d2bac70c6ca4"
-
-loader-runner@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
-
-loader-utils@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+"loader-utils@^2.0.0", "loader-utils@2.0.0":
+  "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
+    "big.js" "^5.2.2"
+    "emojis-list" "^3.0.0"
+    "json5" "^2.1.2"
 
-loader-utils@2.0.0, loader-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
+"loader-utils@1.2.3":
+  "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"
+  "version" "1.2.3"
   dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
+    "big.js" "^5.2.2"
+    "emojis-list" "^2.0.0"
+    "json5" "^1.0.1"
 
-loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+"localforage@^1.7.3":
+  "resolved" "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz"
+  "version" "1.9.0"
   dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
+    "lie" "3.1.1"
 
-localforage@^1.7.3:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz#f3e4d32a8300b362b4634cc4e066d9d00d2f09d1"
+"locate-path@^2.0.0":
+  "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    lie "3.1.1"
+    "p-locate" "^2.0.0"
+    "path-exists" "^3.0.0"
 
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+"locate-path@^3.0.0":
+  "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
+    "p-locate" "^3.0.0"
+    "path-exists" "^3.0.0"
 
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+"locate-path@^5.0.0":
+  "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
+    "p-locate" "^4.1.0"
 
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+"lodash-es@^4.17.21":
+  "resolved" "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"
+  "version" "4.17.21"
+
+"lodash-es@4.17.14":
+  "resolved" "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.14.tgz"
+  "version" "4.17.14"
+
+"lodash-move@^1.1.1":
+  "resolved" "https://registry.npmjs.org/lodash-move/-/lodash-move-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
-    p-locate "^4.1.0"
+    "lodash" "^4.6.1"
 
-lodash-es@4.17.14:
-  version "4.17.14"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.14.tgz#12a95a963cc5955683cee3b74e85458954f37ecc"
+"lodash._reinterpolate@^3.0.0":
+  "resolved" "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+  "version" "3.0.0"
 
-lodash-es@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
-  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+"lodash.camelcase@^4.3.0":
+  "resolved" "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"
+  "version" "4.3.0"
 
-lodash-move@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/lodash-move/-/lodash-move-1.1.1.tgz#59f76e0f1ac57e6d8683f531bec07c5b6ea4e348"
+"lodash.curry@^4.0.1":
+  "resolved" "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz"
+  "version" "4.1.1"
+
+"lodash.debounce@^4.0.8":
+  "resolved" "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
+  "version" "4.0.8"
+
+"lodash.escape@^4.0.1":
+  "resolved" "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz"
+  "version" "4.0.1"
+
+"lodash.flow@^3.3.0":
+  "resolved" "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz"
+  "version" "3.5.0"
+
+"lodash.isempty@^4.4.0":
+  "resolved" "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"
+  "version" "4.4.0"
+
+"lodash.isfunction@^3.0.8", "lodash.isfunction@^3.0.9":
+  "resolved" "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"
+  "version" "3.0.9"
+
+"lodash.isobject@^3.0.2":
+  "resolved" "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz"
+  "version" "3.0.2"
+
+"lodash.isplainobject@^4.0.6":
+  "resolved" "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"
+  "version" "4.0.6"
+
+"lodash.isstring@^4.0.1":
+  "resolved" "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"
+  "version" "4.0.1"
+
+"lodash.memoize@^4.1.2":
+  "resolved" "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
+  "version" "4.1.2"
+
+"lodash.once@^4.1.1":
+  "resolved" "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"
+  "version" "4.1.1"
+
+"lodash.sortby@^4.7.0":
+  "resolved" "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"
+  "version" "4.7.0"
+
+"lodash.template@^4.5.0":
+  "resolved" "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"
+  "version" "4.5.0"
   dependencies:
-    lodash "^4.6.1"
+    "lodash._reinterpolate" "^3.0.0"
+    "lodash.templatesettings" "^4.0.0"
 
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-
-lodash.curry@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170"
-
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-
-lodash.flow@^3.3.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a"
-
-lodash.isempty@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
-
-lodash.isfunction@^3.0.8, lodash.isfunction@^3.0.9:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
-
-lodash.isobject@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
-
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-
-lodash.once@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-
-lodash.template@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+"lodash.templatesettings@^4.0.0":
+  "resolved" "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"
+  "version" "4.2.0"
   dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.templatesettings "^4.0.0"
+    "lodash._reinterpolate" "^3.0.0"
 
-lodash.templatesettings@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+"lodash.throttle@^4.1.1":
+  "resolved" "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"
+  "version" "4.1.1"
+
+"lodash.uniq@^4.5.0", "lodash.uniq@4.5.0":
+  "resolved" "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
+  "version" "4.5.0"
+
+"lodash@^4", "lodash@^4.0.0", "lodash@^4.0.1", "lodash@^4.16.2", "lodash@^4.17.11", "lodash@^4.17.12", "lodash@^4.17.14", "lodash@^4.17.15", "lodash@^4.17.19", "lodash@^4.17.20", "lodash@^4.17.21", "lodash@^4.17.5", "lodash@^4.6.1", "lodash@>=3.5 <5", "lodash@~4.17.10", "lodash@~4.17.21", "lodash@4.x":
+  "resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
+  "version" "4.17.21"
+
+"log-symbols@^1.0.2":
+  "resolved" "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    lodash._reinterpolate "^3.0.0"
+    "chalk" "^1.0.0"
 
-lodash.throttle@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
-
-lodash.uniq@4.5.0, lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-
-lodash@4.x, lodash@^4.6.1:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-"lodash@>=3.5 <5", lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.16.2, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.5, lodash@~4.17.10:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-
-log-symbols@3.0.0, log-symbols@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
+"log-symbols@^2.1.0":
+  "resolved" "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"
+  "version" "2.2.0"
   dependencies:
-    chalk "^2.4.2"
+    "chalk" "^2.0.1"
 
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+"log-symbols@^3.0.0", "log-symbols@3.0.0":
+  "resolved" "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    chalk "^1.0.0"
+    "chalk" "^2.4.2"
 
-log-symbols@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+"log-symbols@^4.0.0":
+  "resolved" "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    chalk "^2.0.1"
+    "chalk" "^4.0.0"
 
-log-symbols@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+"log-update@^2.3.0":
+  "resolved" "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"
+  "version" "2.3.0"
   dependencies:
-    chalk "^4.0.0"
+    "ansi-escapes" "^3.0.0"
+    "cli-cursor" "^2.0.0"
+    "wrap-ansi" "^3.0.1"
 
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
+"loglevel@^1.6.7", "loglevel@^1.6.8":
+  "resolved" "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz"
+  "version" "1.7.0"
+
+"loglevelnext@^1.0.1":
+  "resolved" "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz"
+  "version" "1.0.5"
   dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
+    "es6-symbol" "^3.1.1"
+    "object.assign" "^4.1.0"
 
-loglevel@^1.6.7, loglevel@^1.6.8:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
-
-loglevelnext@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.5.tgz#36fc4f5996d6640f539ff203ba819641680d75a2"
+"loose-envify@^1.0.0", "loose-envify@^1.1.0", "loose-envify@^1.2.0", "loose-envify@^1.3.1", "loose-envify@^1.4.0":
+  "resolved" "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
+  "version" "1.4.0"
   dependencies:
-    es6-symbol "^3.1.1"
-    object.assign "^4.1.0"
+    "js-tokens" "^3.0.0 || ^4.0.0"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+"lottie-web@^5.7.4":
+  "resolved" "https://registry.npmjs.org/lottie-web/-/lottie-web-5.7.4.tgz"
+  "version" "5.7.4"
+
+"lower-case@^2.0.1":
+  "resolved" "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
+    "tslib" "^1.10.0"
 
-lottie-web@^5.7.4:
-  version "5.7.4"
-  resolved "https://registry.yarnpkg.com/lottie-web/-/lottie-web-5.7.4.tgz#3b252148e904a0aa9833879ffb64924c85a0888c"
-
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+"lowlight@~1.11.0":
+  "resolved" "https://registry.npmjs.org/lowlight/-/lowlight-1.11.0.tgz"
+  "version" "1.11.0"
   dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
+    "fault" "^1.0.2"
+    "highlight.js" "~9.13.0"
 
-lower-case@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
+"lru-cache@^4.1.5":
+  "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"
+  "version" "4.1.5"
   dependencies:
-    tslib "^1.10.0"
+    "pseudomap" "^1.0.2"
+    "yallist" "^2.1.2"
 
-lowlight@~1.11.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.11.0.tgz#1304d83005126d4e8b1dc0f07981e9b689ec2efc"
+"lru-cache@^5.1.1":
+  "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
+  "version" "5.1.1"
   dependencies:
-    fault "^1.0.2"
-    highlight.js "~9.13.0"
+    "yallist" "^3.0.2"
 
-lru-cache@^4.0.1, lru-cache@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+"lru-cache@^6.0.0":
+  "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
+    "yallist" "^4.0.0"
 
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+"lz-string@^1.4.4":
+  "resolved" "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz"
+  "version" "1.4.4"
+
+"magic-string@^0.25.0", "magic-string@^0.25.5", "magic-string@^0.25.7":
+  "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"
+  "version" "0.25.7"
   dependencies:
-    yallist "^3.0.2"
+    "sourcemap-codec" "^1.4.4"
 
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+"make-cancellable-promise@^1.0.0":
+  "resolved" "https://registry.npmjs.org/make-cancellable-promise/-/make-cancellable-promise-1.0.0.tgz"
+  "version" "1.0.0"
+
+"make-dir@^2.0.0", "make-dir@^2.1.0":
+  "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    yallist "^4.0.0"
+    "pify" "^4.0.1"
+    "semver" "^5.6.0"
 
-lz-string@^1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
-
-magic-string@^0.25.0, magic-string@^0.25.5, magic-string@^0.25.7:
-  version "0.25.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+"make-dir@^3.0.0":
+  "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    sourcemap-codec "^1.4.4"
+    "semver" "^6.0.0"
 
-make-cancellable-promise@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/make-cancellable-promise/-/make-cancellable-promise-1.0.0.tgz#826214115b0827ca7a45ba204df7c31546243870"
-
-make-dir@^2.0.0, make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+"make-dir@^3.0.2":
+  "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
+    "semver" "^6.0.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+"make-error@1.x":
+  "resolved" "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
+  "version" "1.3.6"
+
+"make-event-props@^1.1.0":
+  "resolved" "https://registry.npmjs.org/make-event-props/-/make-event-props-1.2.0.tgz"
+  "version" "1.2.0"
+
+"makeerror@1.0.x":
+  "resolved" "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz"
+  "version" "1.0.11"
   dependencies:
-    semver "^6.0.0"
+    "tmpl" "1.0.x"
 
-make-error@1.x:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+"map-cache@^0.2.2":
+  "resolved" "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"
+  "version" "0.2.2"
 
-make-event-props@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/make-event-props/-/make-event-props-1.2.0.tgz#96b87d88919533b8f8934b58b4c3d5679459a0cf"
+"map-obj@^1.0.0":
+  "resolved" "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+  "version" "1.0.1"
 
-makeerror@1.0.x:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+"map-obj@^4.0.0":
+  "resolved" "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz"
+  "version" "4.2.1"
+
+"map-or-similar@^1.5.0":
+  "resolved" "https://registry.npmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz"
+  "version" "1.5.0"
+
+"map-visit@^1.0.0":
+  "resolved" "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    tmpl "1.0.x"
+    "object-visit" "^1.0.0"
 
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+"markdown-escapes@^1.0.0":
+  "resolved" "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz"
+  "version" "1.0.4"
 
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-
-map-or-similar@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/map-or-similar/-/map-or-similar-1.5.0.tgz#6de2653174adfb5d9edc33c69d3e92a1b76faf08"
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+"markdown-to-jsx@^6.10.3", "markdown-to-jsx@^6.11.4":
+  "resolved" "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz"
+  "version" "6.11.4"
   dependencies:
-    object-visit "^1.0.0"
+    "prop-types" "^15.6.2"
+    "unquote" "^1.1.0"
 
-markdown-escapes@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
+"marked@^2.0.0":
+  "resolved" "https://registry.npmjs.org/marked/-/marked-2.0.0.tgz"
+  "version" "2.0.0"
 
-markdown-to-jsx@^6.10.3, markdown-to-jsx@^6.11.4:
-  version "6.11.4"
-  resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz#b4528b1ab668aef7fe61c1535c27e837819392c5"
+"marker-clusterer-plus@^2.1.4":
+  "resolved" "https://registry.npmjs.org/marker-clusterer-plus/-/marker-clusterer-plus-2.1.4.tgz"
+  "version" "2.1.4"
+
+"markerwithlabel@^2.0.1":
+  "resolved" "https://registry.npmjs.org/markerwithlabel/-/markerwithlabel-2.0.2.tgz"
+  "version" "2.0.2"
+
+"material-colors@^1.2.1":
+  "resolved" "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz"
+  "version" "1.2.6"
+
+"math-log2@^1.0.1":
+  "resolved" "https://registry.npmjs.org/math-log2/-/math-log2-1.0.1.tgz"
+  "version" "1.0.1"
+
+"md5.js@^1.3.4":
+  "resolved" "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"
+  "version" "1.3.5"
   dependencies:
-    prop-types "^15.6.2"
-    unquote "^1.1.0"
+    "hash-base" "^3.0.0"
+    "inherits" "^2.0.1"
+    "safe-buffer" "^5.1.2"
 
-marked@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-2.0.0.tgz#9662bbcb77ebbded0662a7be66ff929a8611cee5"
-
-marker-clusterer-plus@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/marker-clusterer-plus/-/marker-clusterer-plus-2.1.4.tgz#f8eff74d599dab3b7d0e3fed5264ea0e704f5d67"
-
-markerwithlabel@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/markerwithlabel/-/markerwithlabel-2.0.2.tgz#fa6aee4abb0ee553e24e2b708226858f58b8729e"
-
-material-colors@^1.2.1:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
-
-math-log2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/math-log2/-/math-log2-1.0.1.tgz#fb8941be5f5ebe8979e718e6273b178e58694565"
-
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+"md5@^2.1.0":
+  "resolved" "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"
+  "version" "2.3.0"
   dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
+    "charenc" "0.0.2"
+    "crypt" "0.0.2"
+    "is-buffer" "~1.1.6"
 
-md5@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
+"mdast-squeeze-paragraphs@^4.0.0":
+  "resolved" "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    charenc "0.0.2"
-    crypt "0.0.2"
-    is-buffer "~1.1.6"
+    "unist-util-remove" "^2.0.0"
 
-mdast-squeeze-paragraphs@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97"
+"mdast-util-definitions@^1.2.3":
+  "resolved" "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-1.2.5.tgz"
+  "version" "1.2.5"
   dependencies:
-    unist-util-remove "^2.0.0"
+    "unist-util-visit" "^1.0.0"
 
-mdast-util-definitions@^1.2.3:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.5.tgz#3fe622a4171c774ebd06f11e9f8af7ec53ea5c74"
+"mdast-util-definitions@^3.0.0":
+  "resolved" "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    unist-util-visit "^1.0.0"
+    "unist-util-visit" "^2.0.0"
 
-mdast-util-definitions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-3.0.1.tgz#06af6c49865fc63d6d7d30125569e2f7ae3d0a86"
-  dependencies:
-    unist-util-visit "^2.0.0"
-
-mdast-util-to-hast@9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-9.1.1.tgz#953ff12aed57464b11d7e5549a45913e561909fa"
+"mdast-util-to-hast@9.1.1":
+  "resolved" "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-9.1.1.tgz"
+  "version" "9.1.1"
   dependencies:
     "@types/mdast" "^3.0.0"
     "@types/unist" "^2.0.3"
-    mdast-util-definitions "^3.0.0"
-    mdurl "^1.0.0"
-    unist-builder "^2.0.0"
-    unist-util-generated "^1.0.0"
-    unist-util-position "^3.0.0"
-    unist-util-visit "^2.0.0"
+    "mdast-util-definitions" "^3.0.0"
+    "mdurl" "^1.0.0"
+    "unist-builder" "^2.0.0"
+    "unist-util-generated" "^1.0.0"
+    "unist-util-position" "^3.0.0"
+    "unist-util-visit" "^2.0.0"
 
-mdast-util-to-string@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527"
+"mdast-util-to-string@^1.0.0":
+  "resolved" "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz"
+  "version" "1.1.0"
 
-mdn-data@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
+"mdn-data@2.0.4":
+  "resolved" "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"
+  "version" "2.0.4"
 
-mdn-data@2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978"
+"mdn-data@2.0.6":
+  "resolved" "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz"
+  "version" "2.0.6"
 
-mdurl@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+"mdurl@^1.0.0":
+  "resolved" "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"
+  "version" "1.0.1"
 
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+"media-typer@0.3.0":
+  "resolved" "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
+  "version" "0.3.0"
 
-"memoize-one@>=3.1.1 <6", memoize-one@^5.0.0, memoize-one@^5.0.4, memoize-one@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
+"memoize-one@^5.0.0", "memoize-one@^5.0.4", "memoize-one@^5.1.1", "memoize-one@>=3.1.1 <6":
+  "resolved" "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz"
+  "version" "5.1.1"
 
-memoizerific@^1.11.3:
-  version "1.11.3"
-  resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
+"memoizerific@^1.11.3":
+  "resolved" "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz"
+  "version" "1.11.3"
   dependencies:
-    map-or-similar "^1.5.0"
+    "map-or-similar" "^1.5.0"
 
-memory-fs@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"
+"memory-fs@^0.3.0":
+  "resolved" "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"
+  "version" "0.3.0"
   dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
+    "errno" "^0.1.3"
+    "readable-stream" "^2.0.1"
 
-memory-fs@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+"memory-fs@^0.4.1":
+  "resolved" "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"
+  "version" "0.4.1"
   dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
+    "errno" "^0.1.3"
+    "readable-stream" "^2.0.1"
 
-memory-fs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+"memory-fs@^0.5.0":
+  "resolved" "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz"
+  "version" "0.5.0"
   dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
+    "errno" "^0.1.3"
+    "readable-stream" "^2.0.1"
 
-meow@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+"meow@^9.0.0":
+  "resolved" "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz"
+  "version" "9.0.0"
   dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
+    "@types/minimist" "^1.2.0"
+    "camelcase-keys" "^6.2.2"
+    "decamelize" "^1.2.0"
+    "decamelize-keys" "^1.1.0"
+    "hard-rejection" "^2.1.0"
+    "minimist-options" "4.1.0"
+    "normalize-package-data" "^3.0.0"
+    "read-pkg-up" "^7.0.1"
+    "redent" "^3.0.0"
+    "trim-newlines" "^3.0.0"
+    "type-fest" "^0.18.0"
+    "yargs-parser" "^20.2.3"
 
-merge-class-names@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/merge-class-names/-/merge-class-names-1.3.0.tgz#c4cdc1a981a81dd9afc27aa4287e912a337c5dee"
+"merge-class-names@^1.1.1":
+  "resolved" "https://registry.npmjs.org/merge-class-names/-/merge-class-names-1.3.0.tgz"
+  "version" "1.3.0"
 
-merge-deep@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2"
+"merge-deep@^3.0.2":
+  "resolved" "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz"
+  "version" "3.0.3"
   dependencies:
-    arr-union "^3.1.0"
-    clone-deep "^0.2.4"
-    kind-of "^3.0.2"
+    "arr-union" "^3.1.0"
+    "clone-deep" "^0.2.4"
+    "kind-of" "^3.0.2"
 
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+"merge-descriptors@1.0.1":
+  "resolved" "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
+  "version" "1.0.1"
 
-merge-source-map@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
+"merge-source-map@^1.1.0":
+  "resolved" "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    source-map "^0.6.1"
+    "source-map" "^0.6.1"
 
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+"merge-stream@^2.0.0":
+  "resolved" "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
+  "version" "2.0.0"
 
-merge2@^1.2.3, merge2@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+"merge2@^1.2.3", "merge2@^1.3.0":
+  "resolved" "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
+  "version" "1.4.1"
 
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+"methods@~1.1.2":
+  "resolved" "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
+  "version" "1.1.2"
 
-microevent.ts@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
+"microevent.ts@~0.1.1":
+  "resolved" "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz"
+  "version" "0.1.1"
 
-micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+"micromatch@^3.1.10", "micromatch@^3.1.4":
+  "resolved" "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"
+  "version" "3.1.10"
   dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
+    "arr-diff" "^4.0.0"
+    "array-unique" "^0.3.2"
+    "braces" "^2.3.1"
+    "define-property" "^2.0.2"
+    "extend-shallow" "^3.0.2"
+    "extglob" "^2.0.4"
+    "fragment-cache" "^0.2.1"
+    "kind-of" "^6.0.2"
+    "nanomatch" "^1.2.9"
+    "object.pick" "^1.3.0"
+    "regex-not" "^1.0.0"
+    "snapdragon" "^0.8.1"
+    "to-regex" "^3.0.2"
 
-micromatch@^4.0.0, micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+"micromatch@^4.0.0", "micromatch@^4.0.2":
+  "resolved" "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
+    "braces" "^3.0.1"
+    "picomatch" "^2.0.5"
 
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+"miller-rabin@^4.0.0":
+  "resolved" "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-mime-db@1.44.0:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+    "bn.js" "^4.0.0"
+    "brorand" "^1.0.1"
 
 "mime-db@>= 1.43.0 < 2":
-  version "1.45.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
+  "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"
+  "version" "1.45.0"
 
-mime-match@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/mime-match/-/mime-match-1.0.2.tgz#3f87c31e9af1a5fd485fb9db134428b23bbb7ba8"
+"mime-db@1.44.0":
+  "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"
+  "version" "1.44.0"
+
+"mime-match@^1.0.2":
+  "resolved" "https://registry.npmjs.org/mime-match/-/mime-match-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    wildcard "^1.1.0"
+    "wildcard" "^1.1.0"
 
-mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+"mime-types@^2.1.12", "mime-types@^2.1.27", "mime-types@~2.1.17", "mime-types@~2.1.19", "mime-types@~2.1.24":
+  "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"
+  "version" "2.1.27"
   dependencies:
-    mime-db "1.44.0"
+    "mime-db" "1.44.0"
 
-mime@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+"mime@^2.4.4":
+  "resolved" "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz"
+  "version" "2.4.6"
 
-mime@^2.4.4:
-  version "2.4.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
+"mime@1.6.0":
+  "resolved" "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
+  "version" "1.6.0"
 
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+"mimic-fn@^1.0.0":
+  "resolved" "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"
+  "version" "1.2.0"
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+"mimic-fn@^2.1.0":
+  "resolved" "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
+  "version" "2.1.0"
 
-mimic-response@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43"
+"mimic-response@^2.0.0":
+  "resolved" "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"
+  "version" "2.1.0"
 
-min-document@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+"min-document@^2.19.0":
+  "resolved" "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"
+  "version" "2.19.0"
   dependencies:
-    dom-walk "^0.1.0"
+    "dom-walk" "^0.1.0"
 
-min-indent@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+"min-indent@^1.0.0":
+  "resolved" "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"
+  "version" "1.0.1"
 
-mini-create-react-context@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz#df60501c83151db69e28eac0ef08b4002efab040"
+"mini-create-react-context@^0.4.0":
+  "resolved" "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz"
+  "version" "0.4.0"
   dependencies:
     "@babel/runtime" "^7.5.5"
-    tiny-warning "^1.0.3"
+    "tiny-warning" "^1.0.3"
 
-mini-css-extract-plugin@0.11.3:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.3.tgz#15b0910a7f32e62ffde4a7430cfefbd700724ea6"
+"mini-css-extract-plugin@^0.7.0":
+  "resolved" "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz"
+  "version" "0.7.0"
   dependencies:
-    loader-utils "^1.1.0"
-    normalize-url "1.9.1"
-    schema-utils "^1.0.0"
-    webpack-sources "^1.1.0"
+    "loader-utils" "^1.1.0"
+    "normalize-url" "1.9.1"
+    "schema-utils" "^1.0.0"
+    "webpack-sources" "^1.1.0"
 
-mini-css-extract-plugin@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz#5ba8290fbb4179a43dd27cca444ba150bee743a0"
+"mini-css-extract-plugin@0.11.3":
+  "resolved" "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.3.tgz"
+  "version" "0.11.3"
   dependencies:
-    loader-utils "^1.1.0"
-    normalize-url "1.9.1"
-    schema-utils "^1.0.0"
-    webpack-sources "^1.1.0"
+    "loader-utils" "^1.1.0"
+    "normalize-url" "1.9.1"
+    "schema-utils" "^1.0.0"
+    "webpack-sources" "^1.1.0"
 
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+"minimalistic-assert@^1.0.0", "minimalistic-assert@^1.0.1":
+  "resolved" "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"
+  "version" "1.0.1"
 
-minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+"minimalistic-crypto-utils@^1.0.1":
+  "resolved" "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
+  "version" "1.0.1"
 
-minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+"minimatch@^3.0.2", "minimatch@^3.0.3", "minimatch@^3.0.4", "minimatch@~3.0.2", "minimatch@3.0.4":
+  "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
+  "version" "3.0.4"
   dependencies:
-    brace-expansion "^1.1.7"
+    "brace-expansion" "^1.1.7"
 
-minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+"minimist-options@4.1.0":
+  "resolved" "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    minipass "^3.0.0"
+    "arrify" "^1.0.1"
+    "is-plain-obj" "^1.1.0"
+    "kind-of" "^6.0.3"
 
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+"minimist@^1.1.1", "minimist@^1.2.0", "minimist@^1.2.5":
+  "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
+  "version" "1.2.5"
+
+"minipass-collect@^1.0.2":
+  "resolved" "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    minipass "^3.0.0"
+    "minipass" "^3.0.0"
 
-minipass-pipeline@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+"minipass-flush@^1.0.5":
+  "resolved" "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"
+  "version" "1.0.5"
   dependencies:
-    minipass "^3.0.0"
+    "minipass" "^3.0.0"
 
-minipass@^3.0.0, minipass@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
+"minipass-pipeline@^1.2.2":
+  "resolved" "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"
+  "version" "1.2.4"
   dependencies:
-    yallist "^4.0.0"
+    "minipass" "^3.0.0"
 
-minizlib@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+"minipass@^3.0.0", "minipass@^3.1.1":
+  "resolved" "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz"
+  "version" "3.1.3"
   dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
+    "yallist" "^4.0.0"
 
-mississippi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+"minizlib@^2.1.1":
+  "resolved" "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"
+  "version" "2.1.2"
   dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^3.0.0"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
+    "minipass" "^3.0.0"
+    "yallist" "^4.0.0"
 
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+"mississippi@^3.0.0":
+  "resolved" "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
+    "concat-stream" "^1.5.0"
+    "duplexify" "^3.4.2"
+    "end-of-stream" "^1.1.0"
+    "flush-write-stream" "^1.0.0"
+    "from2" "^2.1.0"
+    "parallel-transform" "^1.1.0"
+    "pump" "^3.0.0"
+    "pumpify" "^1.3.3"
+    "stream-each" "^1.1.0"
+    "through2" "^2.0.0"
 
-mixin-object@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+"mixin-deep@^1.2.0":
+  "resolved" "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"
+  "version" "1.3.2"
   dependencies:
-    for-in "^0.1.3"
-    is-extendable "^0.1.1"
+    "for-in" "^1.0.2"
+    "is-extendable" "^1.0.1"
 
-mkdirp@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-
-mkdirp@0.5.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+"mixin-object@^2.0.1":
+  "resolved" "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    minimist "^1.2.5"
+    "for-in" "^0.1.3"
+    "is-extendable" "^0.1.1"
 
-mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-
-mocha-junit-reporter@^1.23.3:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz#941e219dd759ed732f8641e165918aa8b167c981"
+"mkdirp@^0.5.1", "mkdirp@^0.5.3", "mkdirp@^0.5.4", "mkdirp@^0.5.5", "mkdirp@~0.5.1", "mkdirp@0.5.5":
+  "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"
+  "version" "0.5.5"
   dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
+    "minimist" "^1.2.5"
 
-mocha@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.2.0.tgz#01cc227b00d875ab1eed03a75106689cfed5a604"
+"mkdirp@^1.0.3":
+  "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
+  "version" "1.0.4"
+
+"mkdirp@^1.0.4":
+  "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
+  "version" "1.0.4"
+
+"mkdirp@0.3.0":
+  "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
+  "version" "0.3.0"
+
+"mkdirp@1.x":
+  "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
+  "version" "1.0.4"
+
+"mocha-junit-reporter@^1.23.3":
+  "resolved" "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz"
+  "version" "1.23.3"
   dependencies:
-    ansi-colors "3.2.3"
-    browser-stdout "1.3.1"
-    chokidar "3.3.0"
-    debug "3.2.6"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    find-up "3.0.0"
-    glob "7.1.3"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "3.13.1"
-    log-symbols "3.0.0"
-    minimatch "3.0.4"
-    mkdirp "0.5.5"
-    ms "2.1.1"
-    node-environment-flags "1.0.6"
-    object.assign "4.1.0"
-    strip-json-comments "2.0.1"
-    supports-color "6.0.0"
-    which "1.3.1"
-    wide-align "1.1.3"
-    yargs "13.3.2"
-    yargs-parser "13.1.2"
-    yargs-unparser "1.6.0"
+    "debug" "^2.2.0"
+    "md5" "^2.1.0"
+    "mkdirp" "~0.5.1"
+    "strip-ansi" "^4.0.0"
+    "xml" "^1.0.0"
 
-mochawesome-report-generator@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mochawesome-report-generator/-/mochawesome-report-generator-4.1.0.tgz#f303e6acb5b30fd900f2ed8a0ba2054a034c9c39"
+"mocha@^7.1.0", "mocha@>=2.2.5", "mocha@>=3.1.2", "mocha@>=7":
+  "resolved" "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"
+  "version" "7.2.0"
   dependencies:
-    chalk "^2.4.2"
-    dateformat "^3.0.2"
-    fs-extra "^7.0.0"
-    fsu "^1.0.2"
-    lodash.isfunction "^3.0.8"
-    opener "^1.4.2"
-    prop-types "^15.7.2"
-    react "^16.8.5"
-    react-dom "^16.8.5"
-    tcomb "^3.2.17"
-    tcomb-validation "^3.3.0"
-    validator "^10.11.0"
-    yargs "^13.2.2"
+    "ansi-colors" "3.2.3"
+    "browser-stdout" "1.3.1"
+    "chokidar" "3.3.0"
+    "debug" "3.2.6"
+    "diff" "3.5.0"
+    "escape-string-regexp" "1.0.5"
+    "find-up" "3.0.0"
+    "glob" "7.1.3"
+    "growl" "1.10.5"
+    "he" "1.2.0"
+    "js-yaml" "3.13.1"
+    "log-symbols" "3.0.0"
+    "minimatch" "3.0.4"
+    "mkdirp" "0.5.5"
+    "ms" "2.1.1"
+    "node-environment-flags" "1.0.6"
+    "object.assign" "4.1.0"
+    "strip-json-comments" "2.0.1"
+    "supports-color" "6.0.0"
+    "which" "1.3.1"
+    "wide-align" "1.1.3"
+    "yargs" "13.3.2"
+    "yargs-parser" "13.1.2"
+    "yargs-unparser" "1.6.0"
 
-mochawesome@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/mochawesome/-/mochawesome-5.0.0.tgz#eb3d96e589ccdd30146bbde581fb3deec01bcbec"
+"mochawesome-report-generator@^4.1.0":
+  "resolved" "https://registry.npmjs.org/mochawesome-report-generator/-/mochawesome-report-generator-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    chalk "^3.0.0"
-    diff "^4.0.1"
-    json-stringify-safe "^5.0.1"
-    lodash.isempty "^4.4.0"
-    lodash.isfunction "^3.0.9"
-    lodash.isobject "^3.0.2"
-    lodash.isstring "^4.0.1"
-    mochawesome-report-generator "^4.1.0"
-    strip-ansi "^6.0.0"
-    uuid "^7.0.0"
+    "chalk" "^2.4.2"
+    "dateformat" "^3.0.2"
+    "fs-extra" "^7.0.0"
+    "fsu" "^1.0.2"
+    "lodash.isfunction" "^3.0.8"
+    "opener" "^1.4.2"
+    "prop-types" "^15.7.2"
+    "react" "^16.8.5"
+    "react-dom" "^16.8.5"
+    "tcomb" "^3.2.17"
+    "tcomb-validation" "^3.3.0"
+    "validator" "^10.11.0"
+    "yargs" "^13.2.2"
 
-moment-timezone@*, moment-timezone@^0.5.27, moment-timezone@^0.5.31:
-  version "0.5.31"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.31.tgz#9c40d8c5026f0c7ab46eda3d63e49c155148de05"
+"mochawesome@^5.0.0":
+  "resolved" "https://registry.npmjs.org/mochawesome/-/mochawesome-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    moment ">= 2.9.0"
+    "chalk" "^3.0.0"
+    "diff" "^4.0.1"
+    "json-stringify-safe" "^5.0.1"
+    "lodash.isempty" "^4.4.0"
+    "lodash.isfunction" "^3.0.9"
+    "lodash.isobject" "^3.0.2"
+    "lodash.isstring" "^4.0.1"
+    "mochawesome-report-generator" "^4.1.0"
+    "strip-ansi" "^6.0.0"
+    "uuid" "^7.0.0"
 
-"moment@>= 2.9.0", moment@^2.24.0, moment@^2.27.0, moment@^2.29.0:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-
-moo-color@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/moo-color/-/moo-color-1.0.2.tgz#837c40758d2d58763825d1359a84e330531eca64"
-  integrity sha512-5iXz5n9LWQzx/C2WesGFfpE6RLamzdHwsn3KpfzShwbfIqs7stnoEpaNErf/7+3mbxwZ4s8Foq7I0tPxw7BWHg==
+"moment-timezone@*", "moment-timezone@^0.5.27", "moment-timezone@^0.5.31":
+  "resolved" "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.31.tgz"
+  "version" "0.5.31"
   dependencies:
-    color-name "^1.1.4"
+    "moment" ">= 2.9.0"
 
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+"moment@^2.24.0", "moment@^2.27.0", "moment@^2.29.0", "moment@>= 2.9.0":
+  "resolved" "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"
+  "version" "2.29.1"
+
+"moo-color@^1.0.2":
+  "resolved" "https://registry.npmjs.org/moo-color/-/moo-color-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    aproba "^1.1.1"
-    copy-concurrently "^1.0.0"
-    fs-write-stream-atomic "^1.0.8"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.3"
+    "color-name" "^1.1.4"
 
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+"move-concurrently@^1.0.1":
+  "resolved" "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"
+  "version" "1.0.1"
+  dependencies:
+    "aproba" "^1.1.1"
+    "copy-concurrently" "^1.0.0"
+    "fs-write-stream-atomic" "^1.0.8"
+    "mkdirp" "^0.5.1"
+    "rimraf" "^2.5.4"
+    "run-queue" "^1.0.3"
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+"ms@^2.1.1":
+  "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  "version" "2.1.2"
 
-ms@2.1.2, ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+"ms@2.0.0":
+  "resolved" "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+  "version" "2.0.0"
 
-msw@^0.28.0:
-  version "0.28.0"
-  resolved "https://registry.yarnpkg.com/msw/-/msw-0.28.0.tgz#abed17416f59241a2100fe6c8740cc1c9a32339b"
-  integrity sha512-Hh+dPp613tethIFwNg90lvAzrW9T0U39D6AYzV8qIOAWskP49CErrqVWZnmPDQC87o69GzZ9Hl3RGz/65mms3A==
+"ms@2.1.1":
+  "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"
+  "version" "2.1.1"
+
+"ms@2.1.2":
+  "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  "version" "2.1.2"
+
+"msw@^0.28.0":
+  "resolved" "https://registry.npmjs.org/msw/-/msw-0.28.0.tgz"
+  "version" "0.28.0"
   dependencies:
     "@mswjs/cookies" "^0.1.4"
     "@mswjs/interceptors" "^0.8.0"
@@ -12044,4300 +12547,4442 @@ msw@^0.28.0:
     "@types/cookie" "^0.4.0"
     "@types/inquirer" "^7.3.1"
     "@types/js-levenshtein" "^1.1.0"
-    chalk "^4.1.0"
-    chokidar "^3.4.2"
-    cookie "^0.4.1"
-    graphql "^15.4.0"
-    headers-utils "^3.0.2"
-    inquirer "^7.3.3"
-    js-levenshtein "^1.1.6"
-    node-fetch "^2.6.1"
-    node-match-path "^0.6.1"
-    statuses "^2.0.0"
-    strict-event-emitter "^0.1.0"
-    yargs "^16.2.0"
+    "chalk" "^4.1.0"
+    "chokidar" "^3.4.2"
+    "cookie" "^0.4.1"
+    "graphql" "^15.4.0"
+    "headers-utils" "^3.0.2"
+    "inquirer" "^7.3.3"
+    "js-levenshtein" "^1.1.6"
+    "node-fetch" "^2.6.1"
+    "node-match-path" "^0.6.1"
+    "statuses" "^2.0.0"
+    "strict-event-emitter" "^0.1.0"
+    "yargs" "^16.2.0"
 
-multicast-dns-service-types@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+"multicast-dns-service-types@^1.1.0":
+  "resolved" "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"
+  "version" "1.1.0"
 
-multicast-dns@^6.0.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+"multicast-dns@^6.0.1":
+  "resolved" "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"
+  "version" "6.2.3"
   dependencies:
-    dns-packet "^1.3.1"
-    thunky "^1.0.2"
+    "dns-packet" "^1.3.1"
+    "thunky" "^1.0.2"
 
-murmurhash@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/murmurhash/-/murmurhash-0.0.2.tgz#6f07bd8a1105e709c26fc89420cb5930c24585fe"
+"murmurhash@0.0.2":
+  "resolved" "https://registry.npmjs.org/murmurhash/-/murmurhash-0.0.2.tgz"
+  "version" "0.0.2"
 
-mutationobserver-shim@^0.3.5:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz#8bf633b0c0b0291a1107255ed32c13088a8c5bf3"
+"mutationobserver-shim@^0.3.5":
+  "resolved" "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz"
+  "version" "0.3.7"
 
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+"mute-stream@0.0.7":
+  "resolved" "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"
+  "version" "0.0.7"
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+"mute-stream@0.0.8":
+  "resolved" "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
+  "version" "0.0.8"
 
-namespace-emitter@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz#978d51361c61313b4e6b8cf6f3853d08dfa2b17c"
+"namespace-emitter@^2.0.1":
+  "resolved" "https://registry.npmjs.org/namespace-emitter/-/namespace-emitter-2.0.1.tgz"
+  "version" "2.0.1"
 
-nan@^2.12.1, nan@^2.13.2:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+"nan@^2.12.1", "nan@^2.13.2":
+  "resolved" "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"
+  "version" "2.14.2"
 
-nanoid@^2.0.4:
-  version "2.1.11"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
+"nanoid@^2.0.4":
+  "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz"
+  "version" "2.1.11"
 
-nanoid@^3.1.15:
-  version "3.1.16"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.16.tgz#b21f0a7d031196faf75314d7c65d36352beeef64"
+"nanoid@^3.1.15":
+  "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.1.16.tgz"
+  "version" "3.1.16"
 
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+"nanomatch@^1.2.9":
+  "resolved" "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"
+  "version" "1.2.13"
   dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+    "arr-diff" "^4.0.0"
+    "array-unique" "^0.3.2"
+    "define-property" "^2.0.2"
+    "extend-shallow" "^3.0.2"
+    "fragment-cache" "^0.2.1"
+    "is-windows" "^1.0.2"
+    "kind-of" "^6.0.2"
+    "object.pick" "^1.3.0"
+    "regex-not" "^1.0.0"
+    "snapdragon" "^0.8.1"
+    "to-regex" "^3.0.1"
 
-native-url@^0.2.6:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.6.tgz#ca1258f5ace169c716ff44eccbddb674e10399ae"
+"native-url@^0.2.6":
+  "resolved" "https://registry.npmjs.org/native-url/-/native-url-0.2.6.tgz"
+  "version" "0.2.6"
   dependencies:
-    querystring "^0.2.0"
+    "querystring" "^0.2.0"
 
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+"natural-compare-lite@^1.4.0":
+  "resolved" "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"
+  "version" "1.4.0"
 
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+"natural-compare@^1.4.0":
+  "resolved" "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
+  "version" "1.4.0"
 
-neo-async@^2.5.0, neo-async@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+"negotiator@0.6.2":
+  "resolved" "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"
+  "version" "0.6.2"
 
-next-tick@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+"neo-async@^2.5.0", "neo-async@^2.6.1":
+  "resolved" "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
+  "version" "2.6.2"
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+"next-tick@~1.0.0":
+  "resolved" "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"
+  "version" "1.0.0"
 
-no-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
+"nice-try@^1.0.4":
+  "resolved" "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"
+  "version" "1.0.5"
+
+"no-case@^3.0.3":
+  "resolved" "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz"
+  "version" "3.0.3"
   dependencies:
-    lower-case "^2.0.1"
-    tslib "^1.10.0"
+    "lower-case" "^2.0.1"
+    "tslib" "^1.10.0"
 
-node-dir@^0.1.10, node-dir@^0.1.17:
-  version "0.1.17"
-  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
+"node-dir@^0.1.10", "node-dir@^0.1.17":
+  "resolved" "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz"
+  "version" "0.1.17"
   dependencies:
-    minimatch "^3.0.2"
+    "minimatch" "^3.0.2"
 
-node-ensure@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7"
+"node-ensure@^0.0.0":
+  "resolved" "https://registry.npmjs.org/node-ensure/-/node-ensure-0.0.0.tgz"
+  "version" "0.0.0"
 
-node-environment-flags@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
+"node-environment-flags@1.0.6":
+  "resolved" "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"
+  "version" "1.0.6"
   dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-    semver "^5.7.0"
+    "object.getownpropertydescriptors" "^2.0.3"
+    "semver" "^5.7.0"
 
-node-fetch@2.6.1, node-fetch@^2.6.0, node-fetch@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
-
-node-fetch@^1.0.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+"node-fetch@^1.0.1":
+  "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz"
+  "version" "1.7.3"
   dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
+    "encoding" "^0.1.11"
+    "is-stream" "^1.0.1"
 
-node-forge@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
+"node-fetch@^2.6.0", "node-fetch@^2.6.1", "node-fetch@2.6.1":
+  "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"
+  "version" "2.6.1"
 
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+"node-forge@^0.10.0":
+  "resolved" "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"
+  "version" "0.10.0"
+
+"node-gyp@^7.1.0":
+  "resolved" "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz"
+  "version" "7.1.2"
   dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
+    "env-paths" "^2.2.0"
+    "glob" "^7.1.4"
+    "graceful-fs" "^4.2.3"
+    "nopt" "^5.0.0"
+    "npmlog" "^4.1.2"
+    "request" "^2.88.2"
+    "rimraf" "^3.0.2"
+    "semver" "^7.3.2"
+    "tar" "^6.0.2"
+    "which" "^2.0.2"
 
-node-int64@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+"node-int64@^0.4.0":
+  "resolved" "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"
+  "version" "0.4.0"
 
-node-libs-browser@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+"node-libs-browser@^2.2.1":
+  "resolved" "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz"
+  "version" "2.2.1"
   dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^3.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.1"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.11.0"
-    vm-browserify "^1.0.1"
+    "assert" "^1.1.1"
+    "browserify-zlib" "^0.2.0"
+    "buffer" "^4.3.0"
+    "console-browserify" "^1.1.0"
+    "constants-browserify" "^1.0.0"
+    "crypto-browserify" "^3.11.0"
+    "domain-browser" "^1.1.1"
+    "events" "^3.0.0"
+    "https-browserify" "^1.0.0"
+    "os-browserify" "^0.3.0"
+    "path-browserify" "0.0.1"
+    "process" "^0.11.10"
+    "punycode" "^1.2.4"
+    "querystring-es3" "^0.2.0"
+    "readable-stream" "^2.3.3"
+    "stream-browserify" "^2.0.1"
+    "stream-http" "^2.7.2"
+    "string_decoder" "^1.0.0"
+    "timers-browserify" "^2.0.4"
+    "tty-browserify" "0.0.0"
+    "url" "^0.11.0"
+    "util" "^0.11.0"
+    "vm-browserify" "^1.0.1"
 
-node-match-path@^0.6.1:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/node-match-path/-/node-match-path-0.6.2.tgz#29a05ed7eda4d325f29d7abb088c12bbf1578e87"
-  integrity sha512-2VYsUKiovaCZDq1t/3kEqh09743H91WE6B3RzSdjsKh+S/a5z+LQoujMI1JI/RYXqNKFvoqMfye1H0g3Dg9u+g==
+"node-match-path@^0.6.1":
+  "resolved" "https://registry.npmjs.org/node-match-path/-/node-match-path-0.6.2.tgz"
+  "version" "0.6.2"
 
-node-modules-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+"node-modules-regexp@^1.0.0":
+  "resolved" "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"
+  "version" "1.0.0"
 
-node-notifier@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1"
+"node-notifier@^8.0.0":
+  "resolved" "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz"
+  "version" "8.0.1"
   dependencies:
-    growly "^1.3.0"
-    is-wsl "^2.2.0"
-    semver "^7.3.2"
-    shellwords "^0.1.1"
-    uuid "^8.3.0"
-    which "^2.0.2"
+    "growly" "^1.3.0"
+    "is-wsl" "^2.2.0"
+    "semver" "^7.3.2"
+    "shellwords" "^0.1.1"
+    "uuid" "^8.3.0"
+    "which" "^2.0.2"
 
-node-releases@^1.1.29, node-releases@^1.1.61:
-  version "1.1.61"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
+"node-releases@^1.1.29", "node-releases@^1.1.61":
+  "resolved" "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz"
+  "version" "1.1.61"
 
-node-sass@^4.11.0:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
+"node-sass@^4.0.0", "node-sass@^6.0.1":
+  "resolved" "https://registry.npmjs.org/node-sass/-/node-sass-6.0.1.tgz"
+  "version" "6.0.1"
   dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash "^4.17.15"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.13.2"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "^2.88.0"
-    sass-graph "2.2.5"
-    stdout-stream "^1.4.0"
+    "async-foreach" "^0.1.3"
+    "chalk" "^1.1.1"
+    "cross-spawn" "^7.0.3"
+    "gaze" "^1.0.0"
+    "get-stdin" "^4.0.1"
+    "glob" "^7.0.3"
+    "lodash" "^4.17.15"
+    "meow" "^9.0.0"
+    "nan" "^2.13.2"
+    "node-gyp" "^7.1.0"
+    "npmlog" "^4.0.0"
+    "request" "^2.88.0"
+    "sass-graph" "2.2.5"
+    "stdout-stream" "^1.4.0"
     "true-case-path" "^1.0.2"
 
-nopt@1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
+"nopt@^5.0.0":
+  "resolved" "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    abbrev "1"
+    "abbrev" "1"
 
-"nopt@2 || 3":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+"nopt@1.0.10":
+  "resolved" "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"
+  "version" "1.0.10"
   dependencies:
-    abbrev "1"
+    "abbrev" "1"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+"normalize-package-data@^2.3.2", "normalize-package-data@^2.5.0":
+  "resolved" "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
+  "version" "2.5.0"
   dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
+    "hosted-git-info" "^2.1.4"
+    "resolve" "^1.10.0"
+    "semver" "2 || 3 || 4 || 5"
+    "validate-npm-package-license" "^3.0.1"
 
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+"normalize-package-data@^3.0.0":
+  "resolved" "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    remove-trailing-separator "^1.0.1"
+    "hosted-git-info" "^4.0.1"
+    "resolve" "^1.20.0"
+    "semver" "^7.3.4"
+    "validate-npm-package-license" "^3.0.1"
 
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-
-normalize-url@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+"normalize-path@^2.1.1":
+  "resolved" "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"
+  "version" "2.1.1"
   dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
+    "remove-trailing-separator" "^1.0.1"
 
-normalize-url@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
+"normalize-path@^3.0.0", "normalize-path@~3.0.0":
+  "resolved" "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
+  "version" "3.0.0"
 
-normalize.css@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
+"normalize-range@^0.1.2":
+  "resolved" "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
+  "version" "0.1.2"
 
-normalizr@^3.3.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/normalizr/-/normalizr-3.6.0.tgz#b8bbc4546ffe43c1c2200503041642915fcd3e1c"
+"normalize-url@^3.0.0":
+  "resolved" "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz"
+  "version" "3.3.0"
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+"normalize-url@1.9.1":
+  "resolved" "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz"
+  "version" "1.9.1"
   dependencies:
-    path-key "^2.0.0"
+    "object-assign" "^4.0.1"
+    "prepend-http" "^1.0.0"
+    "query-string" "^4.1.0"
+    "sort-keys" "^1.0.0"
 
-npm-run-path@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
+"normalize.css@^8.0.1":
+  "resolved" "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz"
+  "version" "8.0.1"
+
+"normalizr@^3.3.0":
+  "resolved" "https://registry.npmjs.org/normalizr/-/normalizr-3.6.0.tgz"
+  "version" "3.6.0"
+
+"npm-run-path@^2.0.0":
+  "resolved" "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    path-key "^3.0.0"
+    "path-key" "^2.0.0"
 
-npm-run-path@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+"npm-run-path@^3.0.0":
+  "resolved" "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    path-key "^3.0.0"
+    "path-key" "^3.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+"npm-run-path@^4.0.0":
+  "resolved" "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
+    "path-key" "^3.0.0"
 
-nth-check@^1.0.2, nth-check@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+"npmlog@^4.0.0", "npmlog@^4.1.2":
+  "resolved" "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"
+  "version" "4.1.2"
   dependencies:
-    boolbase "~1.0.0"
+    "are-we-there-yet" "~1.1.2"
+    "console-control-strings" "~1.1.0"
+    "gauge" "~2.7.3"
+    "set-blocking" "~2.0.0"
 
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+"nth-check@^1.0.2", "nth-check@~1.0.1":
+  "resolved" "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
+    "boolbase" "~1.0.0"
 
-object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
+"num2fraction@^1.2.2":
+  "resolved" "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"
+  "version" "1.2.2"
 
-object-is@^1.0.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
+"number-is-nan@^1.0.0":
+  "resolved" "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+  "version" "1.0.1"
+
+"nwsapi@^2.2.0":
+  "resolved" "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"
+  "version" "2.2.0"
+
+"oauth-sign@~0.9.0":
+  "resolved" "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"
+  "version" "0.9.0"
+
+"object-assign@^4.0.1", "object-assign@^4.1.0", "object-assign@^4.1.1":
+  "resolved" "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+  "version" "4.1.1"
+
+"object-copy@^0.1.0":
+  "resolved" "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"
+  "version" "0.1.0"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
+    "copy-descriptor" "^0.1.0"
+    "define-property" "^0.2.5"
+    "kind-of" "^3.0.3"
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+"object-inspect@^1.8.0":
+  "resolved" "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"
+  "version" "1.8.0"
 
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+"object-is@^1.0.1":
+  "resolved" "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz"
+  "version" "1.1.3"
   dependencies:
-    isobject "^3.0.0"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.18.0-next.1"
 
-object.assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+"object-keys@^1.0.11", "object-keys@^1.0.12", "object-keys@^1.1.1":
+  "resolved" "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"
+  "version" "1.1.1"
+
+"object-visit@^1.0.0":
+  "resolved" "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
+    "isobject" "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
+"object.assign@^4.1.0", "object.assign@^4.1.1":
+  "resolved" "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz"
+  "version" "4.1.1"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.0"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.18.0-next.0"
+    "has-symbols" "^1.0.1"
+    "object-keys" "^1.1.1"
 
-object.entries@^1.1.0, object.entries@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
+"object.assign@4.1.0":
+  "resolved" "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    has "^1.0.3"
+    "define-properties" "^1.1.2"
+    "function-bind" "^1.1.1"
+    "has-symbols" "^1.0.0"
+    "object-keys" "^1.0.11"
 
-"object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
+"object.entries@^1.1.0", "object.entries@^1.1.2":
+  "resolved" "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz"
+  "version" "1.1.2"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.5"
+    "has" "^1.0.3"
 
-object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
+"object.fromentries@^2.0.0 || ^1.0.0", "object.fromentries@^2.0.2":
+  "resolved" "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
+    "function-bind" "^1.1.1"
+    "has" "^1.0.3"
 
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+"object.getownpropertydescriptors@^2.0.3", "object.getownpropertydescriptors@^2.1.0":
+  "resolved" "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    isobject "^3.0.1"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
 
-object.values@^1.1.0, object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
+"object.pick@^1.3.0":
+  "resolved" "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"
+  "version" "1.3.0"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    "isobject" "^3.0.1"
 
-objectorarray@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.4.tgz#d69b2f0ff7dc2701903d308bb85882f4ddb49483"
-
-obuf@^1.0.0, obuf@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+"object.values@^1.1.0", "object.values@^1.1.1":
+  "resolved" "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
-    ee-first "1.1.1"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
+    "function-bind" "^1.1.1"
+    "has" "^1.0.3"
 
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+"objectorarray@^1.0.4":
+  "resolved" "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz"
+  "version" "1.0.4"
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+"obuf@^1.0.0", "obuf@^1.1.2":
+  "resolved" "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"
+  "version" "1.1.2"
+
+"on-finished@~2.3.0":
+  "resolved" "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"
+  "version" "2.3.0"
   dependencies:
-    wrappy "1"
+    "ee-first" "1.1.1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+"on-headers@~1.0.2":
+  "resolved" "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"
+  "version" "1.0.2"
 
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+"once@^1.3.0", "once@^1.3.1", "once@^1.4.0":
+  "resolved" "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  "version" "1.4.0"
   dependencies:
-    mimic-fn "^1.0.0"
+    "wrappy" "1"
 
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+"onetime@^1.0.0":
+  "resolved" "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"
+  "version" "1.1.0"
+
+"onetime@^2.0.0":
+  "resolved" "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    mimic-fn "^2.1.0"
+    "mimic-fn" "^1.0.0"
 
-open@^6.3.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
+"onetime@^5.1.0":
+  "resolved" "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
-    is-wsl "^1.1.0"
+    "mimic-fn" "^2.1.0"
 
-open@^7.0.0, open@^7.0.2, open@^7.1.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69"
+"open@^6.3.0":
+  "resolved" "https://registry.npmjs.org/open/-/open-6.4.0.tgz"
+  "version" "6.4.0"
   dependencies:
-    is-docker "^2.0.0"
-    is-wsl "^2.1.1"
+    "is-wsl" "^1.1.0"
 
-opencollective-postinstall@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
-
-opener@^1.4.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
-
-opn@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+"open@^7.0.0", "open@^7.0.2", "open@^7.1.0":
+  "resolved" "https://registry.npmjs.org/open/-/open-7.3.0.tgz"
+  "version" "7.3.0"
   dependencies:
-    is-wsl "^1.1.0"
+    "is-docker" "^2.0.0"
+    "is-wsl" "^2.1.1"
 
-optimize-css-assets-webpack-plugin@5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz#85883c6528aaa02e30bbad9908c92926bb52dc90"
+"open@^7.4.2":
+  "resolved" "https://registry.npmjs.org/open/-/open-7.4.2.tgz"
+  "version" "7.4.2"
   dependencies:
-    cssnano "^4.1.10"
-    last-call-webpack-plugin "^3.0.0"
+    "is-docker" "^2.0.0"
+    "is-wsl" "^2.1.1"
 
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+"opencollective-postinstall@^2.0.2":
+  "resolved" "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"
+  "version" "2.0.3"
+
+"opener@^1.4.2":
+  "resolved" "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"
+  "version" "1.5.2"
+
+"opn@^5.5.0":
+  "resolved" "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"
+  "version" "5.5.0"
   dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
+    "is-wsl" "^1.1.0"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+"optimize-css-assets-webpack-plugin@5.0.4":
+  "resolved" "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz"
+  "version" "5.0.4"
   dependencies:
-    deep-is "^0.1.3"
-    fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-    word-wrap "^1.2.3"
+    "cssnano" "^4.1.10"
+    "last-call-webpack-plugin" "^3.0.0"
 
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+"optionator@^0.8.1":
+  "resolved" "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"
+  "version" "0.8.3"
   dependencies:
-    url-parse "^1.4.3"
+    "deep-is" "~0.1.3"
+    "fast-levenshtein" "~2.0.6"
+    "levn" "~0.3.0"
+    "prelude-ls" "~1.1.2"
+    "type-check" "~0.3.2"
+    "word-wrap" "~1.2.3"
 
-os-browserify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-
-osenv@0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+"optionator@^0.9.1":
+  "resolved" "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
+  "version" "0.9.1"
   dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
+    "deep-is" "^0.1.3"
+    "fast-levenshtein" "^2.0.6"
+    "levn" "^0.4.1"
+    "prelude-ls" "^1.2.1"
+    "type-check" "^0.4.0"
+    "word-wrap" "^1.2.3"
 
-ospath@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
-
-p-each-series@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48"
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-
-p-finally@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
-
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+"original@^1.0.0":
+  "resolved" "https://registry.npmjs.org/original/-/original-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    p-try "^1.0.0"
+    "url-parse" "^1.4.3"
 
-p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+"os-browserify@^0.3.0":
+  "resolved" "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"
+  "version" "0.3.0"
+
+"os-tmpdir@~1.0.2":
+  "resolved" "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+  "version" "1.0.2"
+
+"ospath@^1.2.2":
+  "resolved" "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz"
+  "version" "1.2.2"
+
+"p-each-series@^2.1.0":
+  "resolved" "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz"
+  "version" "2.1.0"
+
+"p-finally@^1.0.0":
+  "resolved" "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"
+  "version" "1.0.0"
+
+"p-finally@^2.0.0":
+  "resolved" "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz"
+  "version" "2.0.1"
+
+"p-limit@^1.1.0":
+  "resolved" "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"
+  "version" "1.3.0"
   dependencies:
-    p-try "^2.0.0"
+    "p-try" "^1.0.0"
 
-p-limit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
+"p-limit@^2.0.0", "p-limit@^2.2.0", "p-limit@^2.3.0":
+  "resolved" "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
+  "version" "2.3.0"
   dependencies:
-    p-try "^2.0.0"
+    "p-try" "^2.0.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+"p-limit@^3.0.2":
+  "resolved" "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    p-limit "^1.1.0"
+    "p-try" "^2.0.0"
 
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+"p-locate@^2.0.0":
+  "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    p-limit "^2.0.0"
+    "p-limit" "^1.1.0"
 
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+"p-locate@^3.0.0":
+  "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    p-limit "^2.2.0"
+    "p-limit" "^2.0.0"
 
-p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-
-p-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
+"p-locate@^4.1.0":
+  "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    aggregate-error "^3.0.0"
+    "p-limit" "^2.2.0"
 
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+"p-map@^2.0.0":
+  "resolved" "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"
+  "version" "2.1.0"
+
+"p-map@^3.0.0":
+  "resolved" "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    aggregate-error "^3.0.0"
+    "aggregate-error" "^3.0.0"
 
-p-retry@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
+"p-map@^4.0.0":
+  "resolved" "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    retry "^0.12.0"
+    "aggregate-error" "^3.0.0"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-
-paging-algorithm@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/paging-algorithm/-/paging-algorithm-1.0.1.tgz#18abe482a6a202bfaab4b023a407c8cc2072cb8a"
-
-pako@~1.0.5:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
-
-parallel-transform@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+"p-retry@^3.0.1":
+  "resolved" "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    cyclist "^1.0.1"
-    inherits "^2.0.3"
-    readable-stream "^2.1.5"
+    "retry" "^0.12.0"
 
-param-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238"
+"p-try@^1.0.0":
+  "resolved" "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"
+  "version" "1.0.0"
+
+"p-try@^2.0.0":
+  "resolved" "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
+  "version" "2.2.0"
+
+"paging-algorithm@^1.0.1":
+  "resolved" "https://registry.npmjs.org/paging-algorithm/-/paging-algorithm-1.0.1.tgz"
+  "version" "1.0.1"
+
+"pako@~1.0.2", "pako@~1.0.5":
+  "resolved" "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"
+  "version" "1.0.11"
+
+"parallel-transform@^1.1.0":
+  "resolved" "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
-    dot-case "^3.0.3"
-    tslib "^1.10.0"
+    "cyclist" "^1.0.1"
+    "inherits" "^2.0.3"
+    "readable-stream" "^2.1.5"
 
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+"param-case@^3.0.3":
+  "resolved" "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz"
+  "version" "3.0.3"
   dependencies:
-    callsites "^3.0.0"
+    "dot-case" "^3.0.3"
+    "tslib" "^1.10.0"
 
-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
+"parent-module@^1.0.0":
+  "resolved" "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    asn1.js "^5.2.0"
-    browserify-aes "^1.0.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-    safe-buffer "^5.1.1"
+    "callsites" "^3.0.0"
 
-parse-entities@^1.1.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50"
+"parse-asn1@^5.0.0", "parse-asn1@^5.1.5":
+  "resolved" "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"
+  "version" "5.1.6"
   dependencies:
-    character-entities "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    character-reference-invalid "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-hexadecimal "^1.0.0"
+    "asn1.js" "^5.2.0"
+    "browserify-aes" "^1.0.0"
+    "evp_bytestokey" "^1.0.0"
+    "pbkdf2" "^3.0.3"
+    "safe-buffer" "^5.1.1"
 
-parse-entities@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
+"parse-entities@^1.1.2":
+  "resolved" "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz"
+  "version" "1.2.2"
   dependencies:
-    character-entities "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    character-reference-invalid "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-hexadecimal "^1.0.0"
+    "character-entities" "^1.0.0"
+    "character-entities-legacy" "^1.0.0"
+    "character-reference-invalid" "^1.0.0"
+    "is-alphanumerical" "^1.0.0"
+    "is-decimal" "^1.0.0"
+    "is-hexadecimal" "^1.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+"parse-entities@^2.0.0":
+  "resolved" "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    error-ex "^1.2.0"
+    "character-entities" "^1.0.0"
+    "character-entities-legacy" "^1.0.0"
+    "character-reference-invalid" "^1.0.0"
+    "is-alphanumerical" "^1.0.0"
+    "is-decimal" "^1.0.0"
+    "is-hexadecimal" "^1.0.0"
 
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+"parse-json@^2.2.0":
+  "resolved" "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
+  "version" "2.2.0"
   dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
+    "error-ex" "^1.2.0"
 
-parse-json@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
+"parse-json@^4.0.0":
+  "resolved" "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"
+  "version" "4.0.0"
+  dependencies:
+    "error-ex" "^1.3.1"
+    "json-parse-better-errors" "^1.0.1"
+
+"parse-json@^5.0.0":
+  "resolved" "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz"
+  "version" "5.1.0"
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
+    "error-ex" "^1.3.1"
+    "json-parse-even-better-errors" "^2.3.0"
+    "lines-and-columns" "^1.1.6"
 
-parse5@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+"parse5@^6.0.0":
+  "resolved" "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
+  "version" "6.0.1"
 
-parse5@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+"parse5@5.1.1":
+  "resolved" "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"
+  "version" "5.1.1"
 
-parseqs@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
-  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
+"parseqs@0.0.6":
+  "resolved" "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz"
+  "version" "0.0.6"
 
-parseuri@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
-  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
+"parseuri@0.0.6":
+  "resolved" "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz"
+  "version" "0.0.6"
 
-parseurl@~1.3.2, parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+"parseurl@~1.3.2", "parseurl@~1.3.3":
+  "resolved" "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
+  "version" "1.3.3"
 
-pascal-case@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f"
+"pascal-case@^3.1.1":
+  "resolved" "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz"
+  "version" "3.1.1"
   dependencies:
-    no-case "^3.0.3"
-    tslib "^1.10.0"
+    "no-case" "^3.0.3"
+    "tslib" "^1.10.0"
 
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+"pascalcase@^0.1.1":
+  "resolved" "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"
+  "version" "0.1.1"
 
-path-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+"patch-package@^6.4.7":
+  "resolved" "https://registry.npmjs.org/patch-package/-/patch-package-6.4.7.tgz"
+  "version" "6.4.7"
   dependencies:
-    pinkie-promise "^2.0.0"
+    "@yarnpkg/lockfile" "^1.1.0"
+    "chalk" "^2.4.2"
+    "cross-spawn" "^6.0.5"
+    "find-yarn-workspace-root" "^2.0.0"
+    "fs-extra" "^7.0.1"
+    "is-ci" "^2.0.0"
+    "klaw-sync" "^6.0.0"
+    "minimist" "^1.2.0"
+    "open" "^7.4.2"
+    "rimraf" "^2.6.3"
+    "semver" "^5.6.0"
+    "slash" "^2.0.0"
+    "tmp" "^0.0.33"
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+"path-browserify@0.0.1":
+  "resolved" "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"
+  "version" "0.0.1"
 
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+"path-dirname@^1.0.0":
+  "resolved" "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"
+  "version" "1.0.2"
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+"path-exists@^3.0.0":
+  "resolved" "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"
+  "version" "3.0.0"
 
-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+"path-exists@^4.0.0":
+  "resolved" "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
+  "version" "4.0.0"
 
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+"path-is-absolute@^1.0.0":
+  "resolved" "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+  "version" "1.0.1"
 
-path-key@^3.0.0, path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+"path-is-inside@^1.0.2":
+  "resolved" "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"
+  "version" "1.0.2"
 
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+"path-key@^2.0.0", "path-key@^2.0.1":
+  "resolved" "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
+  "version" "2.0.1"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+"path-key@^3.0.0", "path-key@^3.1.0":
+  "resolved" "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
+  "version" "3.1.1"
 
-path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
+"path-parse@^1.0.6":
+  "resolved" "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"
+  "version" "1.0.6"
+
+"path-to-regexp@^1.7.0":
+  "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz"
+  "version" "1.8.0"
   dependencies:
-    isarray "0.0.1"
+    "isarray" "0.0.1"
 
-path-to-regexp@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.0.tgz#f7b3803336104c346889adece614669230645f38"
+"path-to-regexp@^6.2.0":
+  "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.0.tgz"
+  "version" "6.2.0"
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+"path-to-regexp@0.1.7":
+  "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
+  "version" "0.1.7"
+
+"path-type@^2.0.0":
+  "resolved" "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
+    "pify" "^2.0.0"
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+"path-type@^3.0.0":
+  "resolved" "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    pify "^2.0.0"
+    "pify" "^3.0.0"
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+"path-type@^4.0.0":
+  "resolved" "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
+  "version" "4.0.0"
+
+"pbkdf2@^3.0.3":
+  "resolved" "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz"
+  "version" "3.1.1"
   dependencies:
-    pify "^3.0.0"
+    "create-hash" "^1.1.2"
+    "create-hmac" "^1.1.4"
+    "ripemd160" "^2.0.1"
+    "safe-buffer" "^5.0.1"
+    "sha.js" "^2.4.8"
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-
-pbkdf2@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
+"pdfjs-dist@2.1.266":
+  "resolved" "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.1.266.tgz"
+  "version" "2.1.266"
   dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
+    "node-ensure" "^0.0.0"
+    "worker-loader" "^2.0.0"
 
-pdfjs-dist@2.1.266:
-  version "2.1.266"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.1.266.tgz#cded02268b389559e807f410d2a729db62160026"
+"pend@~1.2.0":
+  "resolved" "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
+  "version" "1.2.0"
+
+"performance-now@^2.1.0":
+  "resolved" "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"
+  "version" "2.1.0"
+
+"picomatch@^2.0.4", "picomatch@^2.0.5", "picomatch@^2.2.1", "picomatch@^2.2.2":
+  "resolved" "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"
+  "version" "2.2.2"
+
+"pify@^2.0.0", "pify@^2.2.0":
+  "resolved" "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+  "version" "2.3.0"
+
+"pify@^3.0.0":
+  "resolved" "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
+  "version" "3.0.0"
+
+"pify@^4.0.1":
+  "resolved" "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"
+  "version" "4.0.1"
+
+"pinkie-promise@^2.0.0":
+  "resolved" "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    node-ensure "^0.0.0"
-    worker-loader "^2.0.0"
+    "pinkie" "^2.0.0"
 
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+"pinkie@^2.0.0":
+  "resolved" "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
+  "version" "2.0.4"
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-
-pify@^2.0.0, pify@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+"pirates@^4.0.0", "pirates@^4.0.1":
+  "resolved" "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    pinkie "^2.0.0"
+    "node-modules-regexp" "^1.0.0"
 
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-pirates@^4.0.0, pirates@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+"pkg-dir@^2.0.0":
+  "resolved" "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    node-modules-regexp "^1.0.0"
+    "find-up" "^2.1.0"
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+"pkg-dir@^3.0.0":
+  "resolved" "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    find-up "^2.1.0"
+    "find-up" "^3.0.0"
 
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+"pkg-dir@^4.1.0", "pkg-dir@^4.2.0":
+  "resolved" "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"
+  "version" "4.2.0"
   dependencies:
-    find-up "^3.0.0"
+    "find-up" "^4.0.0"
 
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+"pkg-up@2.0.0":
+  "resolved" "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    find-up "^4.0.0"
+    "find-up" "^2.1.0"
 
-pkg-up@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+"pkg-up@3.1.0":
+  "resolved" "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    find-up "^2.1.0"
+    "find-up" "^3.0.0"
 
-pkg-up@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
+"please-upgrade-node@^3.1.1", "please-upgrade-node@^3.2.0":
+  "resolved" "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"
+  "version" "3.2.0"
   dependencies:
-    find-up "^3.0.0"
+    "semver-compare" "^1.0.0"
 
-please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
+"pnp-webpack-plugin@^1.6.4", "pnp-webpack-plugin@1.6.4":
+  "resolved" "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz"
+  "version" "1.6.4"
   dependencies:
-    semver-compare "^1.0.0"
+    "ts-pnp" "^1.1.6"
 
-pnp-webpack-plugin@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz#62a1cd3068f46d564bb33c56eb250e4d586676eb"
+"pnp-webpack-plugin@1.5.0":
+  "resolved" "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz"
+  "version" "1.5.0"
   dependencies:
-    ts-pnp "^1.1.2"
+    "ts-pnp" "^1.1.2"
 
-pnp-webpack-plugin@1.6.4, pnp-webpack-plugin@^1.6.4:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149"
-  dependencies:
-    ts-pnp "^1.1.6"
-
-polished@^3.3.1:
-  version "3.6.7"
-  resolved "https://registry.yarnpkg.com/polished/-/polished-3.6.7.tgz#44cbd0047f3187d83db0c479ef0c7d5583af5fb6"
+"polished@^3.3.1":
+  "resolved" "https://registry.npmjs.org/polished/-/polished-3.6.7.tgz"
+  "version" "3.6.7"
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-popper.js@^1.14.4, popper.js@^1.14.7, popper.js@^1.15.0, popper.js@^1.16.1:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
+"popper.js@^1.14.4", "popper.js@^1.14.7", "popper.js@^1.15.0", "popper.js@^1.16.1":
+  "resolved" "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz"
+  "version" "1.16.1"
 
-portfinder@^1.0.26:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
+"portfinder@^1.0.26":
+  "resolved" "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz"
+  "version" "1.0.28"
   dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.5"
+    "async" "^2.6.2"
+    "debug" "^3.1.1"
+    "mkdirp" "^0.5.5"
 
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+"posix-character-classes@^0.1.0":
+  "resolved" "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"
+  "version" "0.1.1"
 
-postcss-attribute-case-insensitive@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880"
+"postcss-attribute-case-insensitive@^4.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^6.0.2"
+    "postcss" "^7.0.2"
+    "postcss-selector-parser" "^6.0.2"
 
-postcss-browser-comments@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-3.0.0.tgz#1248d2d935fb72053c8e1f61a84a57292d9f65e9"
+"postcss-browser-comments@^3.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    postcss "^7"
+    "postcss" "^7"
 
-postcss-calc@^7.0.1:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e"
+"postcss-calc@^7.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz"
+  "version" "7.0.5"
   dependencies:
-    postcss "^7.0.27"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.2"
+    "postcss" "^7.0.27"
+    "postcss-selector-parser" "^6.0.2"
+    "postcss-value-parser" "^4.0.2"
 
-postcss-color-functional-notation@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz#5efd37a88fbabeb00a2966d1e53d98ced93f74e0"
+"postcss-color-functional-notation@^2.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    "postcss" "^7.0.2"
+    "postcss-values-parser" "^2.0.0"
 
-postcss-color-gray@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz#532a31eb909f8da898ceffe296fdc1f864be8547"
+"postcss-color-gray@^5.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
     "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.5"
-    postcss-values-parser "^2.0.0"
+    "postcss" "^7.0.5"
+    "postcss-values-parser" "^2.0.0"
 
-postcss-color-hex-alpha@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz#a8d9ca4c39d497c9661e374b9c51899ef0f87388"
+"postcss-color-hex-alpha@^5.0.3":
+  "resolved" "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz"
+  "version" "5.0.3"
   dependencies:
-    postcss "^7.0.14"
-    postcss-values-parser "^2.0.1"
+    "postcss" "^7.0.14"
+    "postcss-values-parser" "^2.0.1"
 
-postcss-color-mod-function@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz#816ba145ac11cc3cb6baa905a75a49f903e4d31d"
+"postcss-color-mod-function@^3.0.3":
+  "resolved" "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz"
+  "version" "3.0.3"
   dependencies:
     "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    "postcss" "^7.0.2"
+    "postcss-values-parser" "^2.0.0"
 
-postcss-color-rebeccapurple@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz#c7a89be872bb74e45b1e3022bfe5748823e6de77"
+"postcss-color-rebeccapurple@^4.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    "postcss" "^7.0.2"
+    "postcss-values-parser" "^2.0.0"
 
-postcss-colormin@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381"
+"postcss-colormin@^4.0.3":
+  "resolved" "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    browserslist "^4.0.0"
-    color "^3.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "browserslist" "^4.0.0"
+    "color" "^3.0.0"
+    "has" "^1.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-convert-values@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f"
+"postcss-convert-values@^4.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-custom-media@^7.0.8:
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c"
+"postcss-custom-media@^7.0.8":
+  "resolved" "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz"
+  "version" "7.0.8"
   dependencies:
-    postcss "^7.0.14"
+    "postcss" "^7.0.14"
 
-postcss-custom-properties@^8.0.11:
-  version "8.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz#2d61772d6e92f22f5e0d52602df8fae46fa30d97"
+"postcss-custom-properties@^8.0.11":
+  "resolved" "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz"
+  "version" "8.0.11"
   dependencies:
-    postcss "^7.0.17"
-    postcss-values-parser "^2.0.1"
+    "postcss" "^7.0.17"
+    "postcss-values-parser" "^2.0.1"
 
-postcss-custom-selectors@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz#64858c6eb2ecff2fb41d0b28c9dd7b3db4de7fba"
+"postcss-custom-selectors@^5.1.2":
+  "resolved" "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
+    "postcss" "^7.0.2"
+    "postcss-selector-parser" "^5.0.0-rc.3"
 
-postcss-dir-pseudo-class@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz#6e3a4177d0edb3abcc85fdb6fbb1c26dabaeaba2"
+"postcss-dir-pseudo-class@^5.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
+    "postcss" "^7.0.2"
+    "postcss-selector-parser" "^5.0.0-rc.3"
 
-postcss-discard-comments@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033"
+"postcss-discard-comments@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    postcss "^7.0.0"
+    "postcss" "^7.0.0"
 
-postcss-discard-duplicates@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb"
+"postcss-discard-duplicates@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    postcss "^7.0.0"
+    "postcss" "^7.0.0"
 
-postcss-discard-empty@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765"
+"postcss-discard-empty@^4.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    postcss "^7.0.0"
+    "postcss" "^7.0.0"
 
-postcss-discard-overridden@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57"
+"postcss-discard-overridden@^4.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    postcss "^7.0.0"
+    "postcss" "^7.0.0"
 
-postcss-double-position-gradients@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz#fc927d52fddc896cb3a2812ebc5df147e110522e"
+"postcss-double-position-gradients@^1.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    postcss "^7.0.5"
-    postcss-values-parser "^2.0.0"
+    "postcss" "^7.0.5"
+    "postcss-values-parser" "^2.0.0"
 
-postcss-env-function@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-2.0.2.tgz#0f3e3d3c57f094a92c2baf4b6241f0b0da5365d7"
+"postcss-env-function@^2.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    "postcss" "^7.0.2"
+    "postcss-values-parser" "^2.0.0"
 
-postcss-flexbugs-fixes@4.2.1, postcss-flexbugs-fixes@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz#9218a65249f30897deab1033aced8578562a6690"
+"postcss-flexbugs-fixes@^4.1.0", "postcss-flexbugs-fixes@4.2.1":
+  "resolved" "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz"
+  "version" "4.2.1"
   dependencies:
-    postcss "^7.0.26"
+    "postcss" "^7.0.26"
 
-postcss-focus-visible@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz#477d107113ade6024b14128317ade2bd1e17046e"
+"postcss-focus-visible@^4.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    postcss "^7.0.2"
+    "postcss" "^7.0.2"
 
-postcss-focus-within@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz#763b8788596cee9b874c999201cdde80659ef680"
+"postcss-focus-within@^3.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    postcss "^7.0.2"
+    "postcss" "^7.0.2"
 
-postcss-font-variant@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz#71dd3c6c10a0d846c5eda07803439617bbbabacc"
+"postcss-font-variant@^4.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    postcss "^7.0.2"
+    "postcss" "^7.0.2"
 
-postcss-gap-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715"
+"postcss-gap-properties@^2.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    postcss "^7.0.2"
+    "postcss" "^7.0.2"
 
-postcss-image-set-function@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz#28920a2f29945bed4c3198d7df6496d410d3f288"
+"postcss-image-set-function@^3.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    "postcss" "^7.0.2"
+    "postcss-values-parser" "^2.0.0"
 
-postcss-initial@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz#f018563694b3c16ae8eaabe3c585ac6319637b2d"
+"postcss-initial@^3.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    lodash.template "^4.5.0"
-    postcss "^7.0.2"
+    "lodash.template" "^4.5.0"
+    "postcss" "^7.0.2"
 
-postcss-lab-function@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e"
+"postcss-lab-function@^2.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
     "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    "postcss" "^7.0.2"
+    "postcss-values-parser" "^2.0.0"
 
-postcss-load-config@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
+"postcss-load-config@^2.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz"
+  "version" "2.1.2"
   dependencies:
-    cosmiconfig "^5.0.0"
-    import-cwd "^2.0.0"
+    "cosmiconfig" "^5.0.0"
+    "import-cwd" "^2.0.0"
 
-postcss-loader@3.0.0, postcss-loader@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
+"postcss-loader@^3.0.0", "postcss-loader@3.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    loader-utils "^1.1.0"
-    postcss "^7.0.0"
-    postcss-load-config "^2.0.0"
-    schema-utils "^1.0.0"
+    "loader-utils" "^1.1.0"
+    "postcss" "^7.0.0"
+    "postcss-load-config" "^2.0.0"
+    "schema-utils" "^1.0.0"
 
-postcss-logical@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5"
+"postcss-logical@^3.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    postcss "^7.0.2"
+    "postcss" "^7.0.2"
 
-postcss-media-minmax@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz#b75bb6cbc217c8ac49433e12f22048814a4f5ed5"
+"postcss-media-minmax@^4.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    postcss "^7.0.2"
+    "postcss" "^7.0.2"
 
-postcss-merge-longhand@^4.0.11:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24"
+"postcss-merge-longhand@^4.0.11":
+  "resolved" "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"
+  "version" "4.0.11"
   dependencies:
-    css-color-names "0.0.4"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-    stylehacks "^4.0.0"
+    "css-color-names" "0.0.4"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
+    "stylehacks" "^4.0.0"
 
-postcss-merge-rules@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650"
+"postcss-merge-rules@^4.0.3":
+  "resolved" "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    browserslist "^4.0.0"
-    caniuse-api "^3.0.0"
-    cssnano-util-same-parent "^4.0.0"
-    postcss "^7.0.0"
-    postcss-selector-parser "^3.0.0"
-    vendors "^1.0.0"
+    "browserslist" "^4.0.0"
+    "caniuse-api" "^3.0.0"
+    "cssnano-util-same-parent" "^4.0.0"
+    "postcss" "^7.0.0"
+    "postcss-selector-parser" "^3.0.0"
+    "vendors" "^1.0.0"
 
-postcss-minify-font-values@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6"
+"postcss-minify-font-values@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-minify-gradients@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471"
+"postcss-minify-gradients@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    is-color-stop "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "cssnano-util-get-arguments" "^4.0.0"
+    "is-color-stop" "^1.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-minify-params@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874"
+"postcss-minify-params@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    alphanum-sort "^1.0.0"
-    browserslist "^4.0.0"
-    cssnano-util-get-arguments "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-    uniqs "^2.0.0"
+    "alphanum-sort" "^1.0.0"
+    "browserslist" "^4.0.0"
+    "cssnano-util-get-arguments" "^4.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
+    "uniqs" "^2.0.0"
 
-postcss-minify-selectors@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"
+"postcss-minify-selectors@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    alphanum-sort "^1.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-selector-parser "^3.0.0"
+    "alphanum-sort" "^1.0.0"
+    "has" "^1.0.0"
+    "postcss" "^7.0.0"
+    "postcss-selector-parser" "^3.0.0"
 
-postcss-modules-extract-imports@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
+"postcss-modules-extract-imports@^2.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    postcss "^7.0.5"
+    "postcss" "^7.0.5"
 
-postcss-modules-local-by-default@^3.0.2, postcss-modules-local-by-default@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"
+"postcss-modules-local-by-default@^3.0.2", "postcss-modules-local-by-default@^3.0.3":
+  "resolved" "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"
+  "version" "3.0.3"
   dependencies:
-    icss-utils "^4.1.1"
-    postcss "^7.0.32"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.1.0"
+    "icss-utils" "^4.1.1"
+    "postcss" "^7.0.32"
+    "postcss-selector-parser" "^6.0.2"
+    "postcss-value-parser" "^4.1.0"
 
-postcss-modules-scope@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee"
+"postcss-modules-scope@^2.2.0":
+  "resolved" "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"
+  "version" "2.2.0"
   dependencies:
-    postcss "^7.0.6"
-    postcss-selector-parser "^6.0.0"
+    "postcss" "^7.0.6"
+    "postcss-selector-parser" "^6.0.0"
 
-postcss-modules-values@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10"
+"postcss-modules-values@^3.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    icss-utils "^4.0.0"
-    postcss "^7.0.6"
+    "icss-utils" "^4.0.0"
+    "postcss" "^7.0.6"
 
-postcss-modules@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-3.2.2.tgz#ee390de0f9f18e761e1778dfb9be26685c02c51f"
+"postcss-modules@^3.2.2":
+  "resolved" "https://registry.npmjs.org/postcss-modules/-/postcss-modules-3.2.2.tgz"
+  "version" "3.2.2"
   dependencies:
-    generic-names "^2.0.1"
-    icss-replace-symbols "^1.1.0"
-    lodash.camelcase "^4.3.0"
-    postcss "^7.0.32"
-    postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^3.0.2"
-    postcss-modules-scope "^2.2.0"
-    postcss-modules-values "^3.0.0"
-    string-hash "^1.1.1"
+    "generic-names" "^2.0.1"
+    "icss-replace-symbols" "^1.1.0"
+    "lodash.camelcase" "^4.3.0"
+    "postcss" "^7.0.32"
+    "postcss-modules-extract-imports" "^2.0.0"
+    "postcss-modules-local-by-default" "^3.0.2"
+    "postcss-modules-scope" "^2.2.0"
+    "postcss-modules-values" "^3.0.0"
+    "string-hash" "^1.1.1"
 
-postcss-nesting@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052"
+"postcss-nesting@^7.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz"
+  "version" "7.0.1"
   dependencies:
-    postcss "^7.0.2"
+    "postcss" "^7.0.2"
 
-postcss-normalize-charset@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4"
+"postcss-normalize-charset@^4.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    postcss "^7.0.0"
+    "postcss" "^7.0.0"
 
-postcss-normalize-display-values@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a"
+"postcss-normalize-display-values@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    cssnano-util-get-match "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "cssnano-util-get-match" "^4.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-normalize-positions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f"
+"postcss-normalize-positions@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "cssnano-util-get-arguments" "^4.0.0"
+    "has" "^1.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-normalize-repeat-style@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c"
+"postcss-normalize-repeat-style@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    cssnano-util-get-match "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "cssnano-util-get-arguments" "^4.0.0"
+    "cssnano-util-get-match" "^4.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-normalize-string@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"
+"postcss-normalize-string@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "has" "^1.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-normalize-timing-functions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"
+"postcss-normalize-timing-functions@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    cssnano-util-get-match "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "cssnano-util-get-match" "^4.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-normalize-unicode@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"
+"postcss-normalize-unicode@^4.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    browserslist "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "browserslist" "^4.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-normalize-url@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1"
+"postcss-normalize-url@^4.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    is-absolute-url "^2.0.0"
-    normalize-url "^3.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "is-absolute-url" "^2.0.0"
+    "normalize-url" "^3.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-normalize-whitespace@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"
+"postcss-normalize-whitespace@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-normalize@8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-8.0.1.tgz#90e80a7763d7fdf2da6f2f0f82be832ce4f66776"
+"postcss-normalize@8.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-8.0.1.tgz"
+  "version" "8.0.1"
   dependencies:
     "@csstools/normalize.css" "^10.1.0"
-    browserslist "^4.6.2"
-    postcss "^7.0.17"
-    postcss-browser-comments "^3.0.0"
-    sanitize.css "^10.0.0"
+    "browserslist" "^4.6.2"
+    "postcss" "^7.0.17"
+    "postcss-browser-comments" "^3.0.0"
+    "sanitize.css" "^10.0.0"
 
-postcss-ordered-values@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee"
+"postcss-ordered-values@^4.1.2":
+  "resolved" "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"
+  "version" "4.1.2"
   dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "cssnano-util-get-arguments" "^4.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-overflow-shorthand@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz#31ecf350e9c6f6ddc250a78f0c3e111f32dd4c30"
+"postcss-overflow-shorthand@^2.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    postcss "^7.0.2"
+    "postcss" "^7.0.2"
 
-postcss-page-break@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-2.0.0.tgz#add52d0e0a528cabe6afee8b46e2abb277df46bf"
+"postcss-page-break@^2.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    postcss "^7.0.2"
+    "postcss" "^7.0.2"
 
-postcss-place@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-4.0.1.tgz#e9f39d33d2dc584e46ee1db45adb77ca9d1dcc62"
+"postcss-place@^4.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    "postcss" "^7.0.2"
+    "postcss-values-parser" "^2.0.0"
 
-postcss-preset-env@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz#c34ddacf8f902383b35ad1e030f178f4cdf118a5"
+"postcss-preset-env@6.7.0":
+  "resolved" "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz"
+  "version" "6.7.0"
   dependencies:
-    autoprefixer "^9.6.1"
-    browserslist "^4.6.4"
-    caniuse-lite "^1.0.30000981"
-    css-blank-pseudo "^0.1.4"
-    css-has-pseudo "^0.10.0"
-    css-prefers-color-scheme "^3.1.1"
-    cssdb "^4.4.0"
-    postcss "^7.0.17"
-    postcss-attribute-case-insensitive "^4.0.1"
-    postcss-color-functional-notation "^2.0.1"
-    postcss-color-gray "^5.0.0"
-    postcss-color-hex-alpha "^5.0.3"
-    postcss-color-mod-function "^3.0.3"
-    postcss-color-rebeccapurple "^4.0.1"
-    postcss-custom-media "^7.0.8"
-    postcss-custom-properties "^8.0.11"
-    postcss-custom-selectors "^5.1.2"
-    postcss-dir-pseudo-class "^5.0.0"
-    postcss-double-position-gradients "^1.0.0"
-    postcss-env-function "^2.0.2"
-    postcss-focus-visible "^4.0.0"
-    postcss-focus-within "^3.0.0"
-    postcss-font-variant "^4.0.0"
-    postcss-gap-properties "^2.0.0"
-    postcss-image-set-function "^3.0.1"
-    postcss-initial "^3.0.0"
-    postcss-lab-function "^2.0.1"
-    postcss-logical "^3.0.0"
-    postcss-media-minmax "^4.0.0"
-    postcss-nesting "^7.0.0"
-    postcss-overflow-shorthand "^2.0.0"
-    postcss-page-break "^2.0.0"
-    postcss-place "^4.0.1"
-    postcss-pseudo-class-any-link "^6.0.0"
-    postcss-replace-overflow-wrap "^3.0.0"
-    postcss-selector-matches "^4.0.0"
-    postcss-selector-not "^4.0.0"
+    "autoprefixer" "^9.6.1"
+    "browserslist" "^4.6.4"
+    "caniuse-lite" "^1.0.30000981"
+    "css-blank-pseudo" "^0.1.4"
+    "css-has-pseudo" "^0.10.0"
+    "css-prefers-color-scheme" "^3.1.1"
+    "cssdb" "^4.4.0"
+    "postcss" "^7.0.17"
+    "postcss-attribute-case-insensitive" "^4.0.1"
+    "postcss-color-functional-notation" "^2.0.1"
+    "postcss-color-gray" "^5.0.0"
+    "postcss-color-hex-alpha" "^5.0.3"
+    "postcss-color-mod-function" "^3.0.3"
+    "postcss-color-rebeccapurple" "^4.0.1"
+    "postcss-custom-media" "^7.0.8"
+    "postcss-custom-properties" "^8.0.11"
+    "postcss-custom-selectors" "^5.1.2"
+    "postcss-dir-pseudo-class" "^5.0.0"
+    "postcss-double-position-gradients" "^1.0.0"
+    "postcss-env-function" "^2.0.2"
+    "postcss-focus-visible" "^4.0.0"
+    "postcss-focus-within" "^3.0.0"
+    "postcss-font-variant" "^4.0.0"
+    "postcss-gap-properties" "^2.0.0"
+    "postcss-image-set-function" "^3.0.1"
+    "postcss-initial" "^3.0.0"
+    "postcss-lab-function" "^2.0.1"
+    "postcss-logical" "^3.0.0"
+    "postcss-media-minmax" "^4.0.0"
+    "postcss-nesting" "^7.0.0"
+    "postcss-overflow-shorthand" "^2.0.0"
+    "postcss-page-break" "^2.0.0"
+    "postcss-place" "^4.0.1"
+    "postcss-pseudo-class-any-link" "^6.0.0"
+    "postcss-replace-overflow-wrap" "^3.0.0"
+    "postcss-selector-matches" "^4.0.0"
+    "postcss-selector-not" "^4.0.0"
 
-postcss-pseudo-class-any-link@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz#2ed3eed393b3702879dec4a87032b210daeb04d1"
+"postcss-pseudo-class-any-link@^6.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
+    "postcss" "^7.0.2"
+    "postcss-selector-parser" "^5.0.0-rc.3"
 
-postcss-reduce-initial@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df"
+"postcss-reduce-initial@^4.0.3":
+  "resolved" "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    browserslist "^4.0.0"
-    caniuse-api "^3.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
+    "browserslist" "^4.0.0"
+    "caniuse-api" "^3.0.0"
+    "has" "^1.0.0"
+    "postcss" "^7.0.0"
 
-postcss-reduce-transforms@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29"
+"postcss-reduce-transforms@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    cssnano-util-get-match "^4.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+    "cssnano-util-get-match" "^4.0.0"
+    "has" "^1.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
 
-postcss-replace-overflow-wrap@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz#61b360ffdaedca84c7c918d2b0f0d0ea559ab01c"
+"postcss-replace-overflow-wrap@^3.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    postcss "^7.0.2"
+    "postcss" "^7.0.2"
 
-postcss-safe-parser@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-5.0.2.tgz#459dd27df6bc2ba64608824ba39e45dacf5e852d"
+"postcss-safe-parser@5.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-5.0.2.tgz"
+  "version" "5.0.2"
   dependencies:
-    postcss "^8.1.0"
+    "postcss" "^8.1.0"
 
-postcss-selector-matches@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff"
+"postcss-selector-matches@^4.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.2"
+    "balanced-match" "^1.0.0"
+    "postcss" "^7.0.2"
 
-postcss-selector-not@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz#c68ff7ba96527499e832724a2674d65603b645c0"
+"postcss-selector-not@^4.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.2"
+    "balanced-match" "^1.0.0"
+    "postcss" "^7.0.2"
 
-postcss-selector-parser@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
+"postcss-selector-parser@^3.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"
+  "version" "3.1.2"
   dependencies:
-    dot-prop "^5.2.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
+    "dot-prop" "^5.2.0"
+    "indexes-of" "^1.0.1"
+    "uniq" "^1.0.1"
 
-postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
+"postcss-selector-parser@^5.0.0-rc.3":
+  "resolved" "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    cssesc "^2.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
+    "cssesc" "^2.0.0"
+    "indexes-of" "^1.0.1"
+    "uniq" "^1.0.1"
 
-postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
+"postcss-selector-parser@^5.0.0-rc.4":
+  "resolved" "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-    util-deprecate "^1.0.2"
+    "cssesc" "^2.0.0"
+    "indexes-of" "^1.0.1"
+    "uniq" "^1.0.1"
 
-postcss-svgo@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258"
+"postcss-selector-parser@^6.0.0", "postcss-selector-parser@^6.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"
+  "version" "6.0.4"
   dependencies:
-    is-svg "^3.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-    svgo "^1.0.0"
+    "cssesc" "^3.0.0"
+    "indexes-of" "^1.0.1"
+    "uniq" "^1.0.1"
+    "util-deprecate" "^1.0.2"
 
-postcss-unique-selectors@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac"
+"postcss-svgo@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    alphanum-sort "^1.0.0"
-    postcss "^7.0.0"
-    uniqs "^2.0.0"
+    "is-svg" "^3.0.0"
+    "postcss" "^7.0.0"
+    "postcss-value-parser" "^3.0.0"
+    "svgo" "^1.0.0"
 
-postcss-value-parser@^3.0.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
-
-postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
-
-postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
+"postcss-unique-selectors@^4.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    flatten "^1.0.2"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
+    "alphanum-sort" "^1.0.0"
+    "postcss" "^7.0.0"
+    "uniqs" "^2.0.0"
 
-postcss@7.0.21:
-  version "7.0.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
+"postcss-value-parser@^3.0.0":
+  "resolved" "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"
+  "version" "3.3.1"
+
+"postcss-value-parser@^4.0.2":
+  "resolved" "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"
+  "version" "4.1.0"
+
+"postcss-value-parser@^4.1.0":
+  "resolved" "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"
+  "version" "4.1.0"
+
+"postcss-values-parser@^2.0.0", "postcss-values-parser@^2.0.1":
+  "resolved" "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
+    "flatten" "^1.0.2"
+    "indexes-of" "^1.0.1"
+    "uniq" "^1.0.1"
 
-postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
+"postcss@^7", "postcss@^7.0.0", "postcss@^7.0.1", "postcss@^7.0.14", "postcss@^7.0.17", "postcss@^7.0.2", "postcss@^7.0.26", "postcss@^7.0.27", "postcss@^7.0.32", "postcss@^7.0.5", "postcss@^7.0.6":
+  "resolved" "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"
+  "version" "7.0.35"
   dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
+    "chalk" "^2.4.2"
+    "source-map" "^0.6.1"
+    "supports-color" "^6.1.0"
 
-postcss@^8.1.0:
-  version "8.1.4"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.4.tgz#356dfef367a70f3d04347f74560c85846e20e4c1"
+"postcss@^8.1.0":
+  "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.1.4.tgz"
+  "version" "8.1.4"
   dependencies:
-    colorette "^1.2.1"
-    line-column "^1.0.2"
-    nanoid "^3.1.15"
-    source-map "^0.6.1"
+    "colorette" "^1.2.1"
+    "line-column" "^1.0.2"
+    "nanoid" "^3.1.15"
+    "source-map" "^0.6.1"
 
-preact@8.2.9:
-  version "8.2.9"
-  resolved "https://registry.yarnpkg.com/preact/-/preact-8.2.9.tgz#813ba9dd45e5d97c5ea0d6c86d375b3be711cc40"
-
-preact@^10.0.0:
-  version "10.5.4"
-  resolved "https://registry.yarnpkg.com/preact/-/preact-10.5.4.tgz#1e4d148f949fa54656df6c9bc9218bd4e12016e3"
-
-prefix-style@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/prefix-style/-/prefix-style-2.0.1.tgz#66bba9a870cfda308a5dc20e85e9120932c95a06"
-
-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-
-prepend-http@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-
-prettier-linter-helpers@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+"postcss@7.0.21":
+  "resolved" "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz"
+  "version" "7.0.21"
   dependencies:
-    fast-diff "^1.1.2"
+    "chalk" "^2.4.2"
+    "source-map" "^0.6.1"
+    "supports-color" "^6.1.0"
 
-prettier@^1.16.4, prettier@^1.18.2:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+"postinstall-postinstall@^2.1.0":
+  "resolved" "https://registry.npmjs.org/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz"
+  "version" "2.1.0"
 
-pretty-bytes@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz#cd89f79bbcef21e3d21eb0da68ffe93f803e884b"
+"preact@*", "preact@8.2.9":
+  "resolved" "https://registry.npmjs.org/preact/-/preact-8.2.9.tgz"
+  "version" "8.2.9"
 
-pretty-bytes@^5.4.1:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.5.0.tgz#0cecda50a74a941589498011cf23275aa82b339e"
+"preact@^10.0.0":
+  "resolved" "https://registry.npmjs.org/preact/-/preact-10.5.4.tgz"
+  "version" "10.5.4"
 
-pretty-error@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
+"prefix-style@2.0.1":
+  "resolved" "https://registry.npmjs.org/prefix-style/-/prefix-style-2.0.1.tgz"
+  "version" "2.0.1"
+
+"prelude-ls@^1.2.1":
+  "resolved" "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
+  "version" "1.2.1"
+
+"prelude-ls@~1.1.2":
+  "resolved" "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
+  "version" "1.1.2"
+
+"prepend-http@^1.0.0":
+  "resolved" "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"
+  "version" "1.0.4"
+
+"prettier-linter-helpers@^1.0.0":
+  "resolved" "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    renderkid "^2.0.1"
-    utila "~0.4"
+    "fast-diff" "^1.1.2"
 
-pretty-format@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
+"prettier@^1.16.4", "prettier@^1.18.2", "prettier@>=1.13.0":
+  "resolved" "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz"
+  "version" "1.19.1"
+
+"pretty-bytes@^5.3.0":
+  "resolved" "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.4.1.tgz"
+  "version" "5.4.1"
+
+"pretty-bytes@^5.4.1":
+  "resolved" "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz"
+  "version" "5.5.0"
+
+"pretty-error@^2.1.1":
+  "resolved" "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz"
+  "version" "2.1.1"
+  dependencies:
+    "renderkid" "^2.0.1"
+    "utila" "~0.4"
+
+"pretty-format@^24.9.0":
+  "resolved" "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz"
+  "version" "24.9.0"
   dependencies:
     "@jest/types" "^24.9.0"
-    ansi-regex "^4.0.0"
-    ansi-styles "^3.2.0"
-    react-is "^16.8.4"
+    "ansi-regex" "^4.0.0"
+    "ansi-styles" "^3.2.0"
+    "react-is" "^16.8.4"
 
-pretty-format@^25.2.1, pretty-format@^25.5.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
+"pretty-format@^25.2.1", "pretty-format@^25.5.0":
+  "resolved" "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz"
+  "version" "25.5.0"
   dependencies:
     "@jest/types" "^25.5.0"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^16.12.0"
+    "ansi-regex" "^5.0.0"
+    "ansi-styles" "^4.0.0"
+    "react-is" "^16.12.0"
 
-pretty-format@^26.6.0, pretty-format@^26.6.1:
-  version "26.6.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.1.tgz#af9a2f63493a856acddeeb11ba6bcf61989660a8"
+"pretty-format@^26.6.0", "pretty-format@^26.6.1":
+  "resolved" "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.1.tgz"
+  "version" "26.6.1"
   dependencies:
     "@jest/types" "^26.6.1"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^17.0.1"
+    "ansi-regex" "^5.0.0"
+    "ansi-styles" "^4.0.0"
+    "react-is" "^17.0.1"
 
-pretty-format@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
-  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
+"pretty-format@^26.6.2":
+  "resolved" "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz"
+  "version" "26.6.2"
   dependencies:
     "@jest/types" "^26.6.2"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^17.0.1"
+    "ansi-regex" "^5.0.0"
+    "ansi-styles" "^4.0.0"
+    "react-is" "^17.0.1"
 
-pretty-hrtime@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+"pretty-hrtime@^1.0.3":
+  "resolved" "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"
+  "version" "1.0.3"
 
-prismjs@^1.23.0, prismjs@^1.8.4:
-  version "1.23.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33"
+"prismjs@^1.24.0", "prismjs@^1.8.4":
+  "resolved" "https://registry.npmjs.org/prismjs/-/prismjs-1.24.0.tgz"
+  "version" "1.24.0"
+
+"prismjs@~1.17.0":
+  "resolved" "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz"
+  "version" "1.17.1"
   optionalDependencies:
-    clipboard "^2.0.0"
+    "clipboard" "^2.0.0"
 
-prismjs@~1.17.0:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.17.1.tgz#e669fcbd4cdd873c35102881c33b14d0d68519be"
-  optionalDependencies:
-    clipboard "^2.0.0"
+"private@^0.1.8":
+  "resolved" "https://registry.npmjs.org/private/-/private-0.1.8.tgz"
+  "version" "0.1.8"
 
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+"process-nextick-args@~2.0.0":
+  "resolved" "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
+  "version" "2.0.1"
 
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+"process@^0.11.10":
+  "resolved" "https://registry.npmjs.org/process/-/process-0.11.10.tgz"
+  "version" "0.11.10"
 
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+"progress@^2.0.0", "progress@^2.0.3":
+  "resolved" "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
+  "version" "2.0.3"
 
-progress@^2.0.0, progress@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+"promise-inflight@^1.0.1":
+  "resolved" "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"
+  "version" "1.0.1"
 
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+"promise-polyfill@^8.1.3":
+  "resolved" "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.3.tgz"
+  "version" "8.1.3"
 
-promise-polyfill@^8.1.3:
-  version "8.1.3"
-  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116"
-
-promise.allsettled@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.2.tgz#d66f78fbb600e83e863d893e98b3d4376a9c47c9"
+"promise.allsettled@^1.0.0":
+  "resolved" "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    array.prototype.map "^1.0.1"
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    iterate-value "^1.0.0"
+    "array.prototype.map" "^1.0.1"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
+    "function-bind" "^1.1.1"
+    "iterate-value" "^1.0.0"
 
-promise.prototype.finally@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz#b8af89160c9c673cefe3b4c4435b53cfd0287067"
+"promise.prototype.finally@^3.1.0":
+  "resolved" "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz"
+  "version" "3.1.2"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.0"
-    function-bind "^1.1.1"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.0"
+    "function-bind" "^1.1.1"
 
-promise@^7.0.1, promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+"promise@^7.0.1", "promise@^7.1.1":
+  "resolved" "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"
+  "version" "7.3.1"
   dependencies:
-    asap "~2.0.3"
+    "asap" "~2.0.3"
 
-promise@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e"
+"promise@^8.0.3":
+  "resolved" "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz"
+  "version" "8.1.0"
   dependencies:
-    asap "~2.0.6"
+    "asap" "~2.0.6"
 
-prompts@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
+"promise@^8.1.0":
+  "resolved" "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz"
+  "version" "8.1.0"
   dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
+    "asap" "~2.0.6"
 
-prompts@^2.0.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"
+"prompts@^2.0.1":
+  "resolved" "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz"
+  "version" "2.3.2"
   dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.4"
+    "kleur" "^3.0.3"
+    "sisteransi" "^1.0.4"
 
-prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.0, prop-types@^15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
+"prompts@2.4.0":
+  "resolved" "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz"
+  "version" "2.4.0"
   dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
+    "kleur" "^3.0.3"
+    "sisteransi" "^1.0.5"
 
-property-information@^5.0.0, property-information@^5.3.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69"
+"prop-types@^15.0.0", "prop-types@^15.5.0", "prop-types@^15.5.10", "prop-types@^15.5.4", "prop-types@^15.5.8", "prop-types@^15.6.0", "prop-types@^15.6.1", "prop-types@^15.6.2", "prop-types@^15.7.0", "prop-types@^15.7.2", "prop-types@>=15":
+  "resolved" "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz"
+  "version" "15.7.2"
   dependencies:
-    xtend "^4.0.0"
+    "loose-envify" "^1.4.0"
+    "object-assign" "^4.1.1"
+    "react-is" "^16.8.1"
 
-proxy-addr@~2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+"property-information@^5.0.0", "property-information@^5.3.0":
+  "resolved" "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz"
+  "version" "5.6.0"
   dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.9.1"
+    "xtend" "^4.0.0"
 
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-
-public-encrypt@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+"proxy-addr@~2.0.5":
+  "resolved" "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"
+  "version" "2.0.6"
   dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-    safe-buffer "^5.1.2"
+    "forwarded" "~0.1.2"
+    "ipaddr.js" "1.9.1"
 
-pug-attrs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-3.0.0.tgz#b10451e0348165e31fad1cc23ebddd9dc7347c41"
+"proxy-from-env@^1.1.0":
+  "resolved" "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
+  "version" "1.1.0"
+
+"prr@~1.0.1":
+  "resolved" "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"
+  "version" "1.0.1"
+
+"pseudomap@^1.0.2":
+  "resolved" "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
+  "version" "1.0.2"
+
+"psl@^1.1.28":
+  "resolved" "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"
+  "version" "1.8.0"
+
+"public-encrypt@^4.0.0":
+  "resolved" "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    constantinople "^4.0.1"
-    js-stringify "^1.0.2"
-    pug-runtime "^3.0.0"
+    "bn.js" "^4.1.0"
+    "browserify-rsa" "^4.0.0"
+    "create-hash" "^1.1.0"
+    "parse-asn1" "^5.0.0"
+    "randombytes" "^2.0.1"
+    "safe-buffer" "^5.1.2"
 
-pug-code-gen@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.1.tgz#ff3b337b100c494ea63ef766091d27f7d73acb7e"
+"pug-attrs@^3.0.0":
+  "resolved" "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    constantinople "^4.0.1"
-    doctypes "^1.1.0"
-    js-stringify "^1.0.2"
-    pug-attrs "^3.0.0"
-    pug-error "^2.0.0"
-    pug-runtime "^3.0.0"
-    void-elements "^3.1.0"
-    with "^7.0.0"
+    "constantinople" "^4.0.1"
+    "js-stringify" "^1.0.2"
+    "pug-runtime" "^3.0.0"
 
-pug-error@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5"
-
-pug-filters@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-4.0.0.tgz#d3e49af5ba8472e9b7a66d980e707ce9d2cc9b5e"
+"pug-code-gen@^3.0.0":
+  "resolved" "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    constantinople "^4.0.1"
-    jstransformer "1.0.0"
-    pug-error "^2.0.0"
-    pug-walk "^2.0.0"
-    resolve "^1.15.1"
+    "constantinople" "^4.0.1"
+    "doctypes" "^1.1.0"
+    "js-stringify" "^1.0.2"
+    "pug-attrs" "^3.0.0"
+    "pug-error" "^2.0.0"
+    "pug-runtime" "^3.0.0"
+    "void-elements" "^3.1.0"
+    "with" "^7.0.0"
 
-pug-lexer@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-5.0.0.tgz#0b779e7d8cbf0f103803675be96351942fd9a727"
+"pug-error@^2.0.0":
+  "resolved" "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz"
+  "version" "2.0.0"
+
+"pug-filters@^4.0.0":
+  "resolved" "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    character-parser "^2.2.0"
-    is-expression "^4.0.0"
-    pug-error "^2.0.0"
+    "constantinople" "^4.0.1"
+    "jstransformer" "1.0.0"
+    "pug-error" "^2.0.0"
+    "pug-walk" "^2.0.0"
+    "resolve" "^1.15.1"
 
-pug-linker@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-4.0.0.tgz#12cbc0594fc5a3e06b9fc59e6f93c146962a7708"
+"pug-lexer@^5.0.0":
+  "resolved" "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    pug-error "^2.0.0"
-    pug-walk "^2.0.0"
+    "character-parser" "^2.2.0"
+    "is-expression" "^4.0.0"
+    "pug-error" "^2.0.0"
 
-pug-load@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-3.0.0.tgz#9fd9cda52202b08adb11d25681fb9f34bd41b662"
+"pug-linker@^4.0.0":
+  "resolved" "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    object-assign "^4.1.1"
-    pug-walk "^2.0.0"
+    "pug-error" "^2.0.0"
+    "pug-walk" "^2.0.0"
 
-pug-parser@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-6.0.0.tgz#a8fdc035863a95b2c1dc5ebf4ecf80b4e76a1260"
+"pug-load@^3.0.0":
+  "resolved" "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    pug-error "^2.0.0"
-    token-stream "1.0.0"
+    "object-assign" "^4.1.1"
+    "pug-walk" "^2.0.0"
 
-pug-runtime@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-3.0.0.tgz#d523025fdc0a1efe70929d1fd3a2d24121ffffb6"
-
-pug-strip-comments@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz#f94b07fd6b495523330f490a7f554b4ff876303e"
+"pug-parser@^6.0.0":
+  "resolved" "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    pug-error "^2.0.0"
+    "pug-error" "^2.0.0"
+    "token-stream" "1.0.0"
 
-pug-walk@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-2.0.0.tgz#417aabc29232bb4499b5b5069a2b2d2a24d5f5fe"
+"pug-runtime@^3.0.0":
+  "resolved" "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.0.tgz"
+  "version" "3.0.0"
 
-pug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.0.tgz#101eecd7a236cd9906e420e17799d4d57f2b7d93"
+"pug-strip-comments@^2.0.0":
+  "resolved" "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    pug-code-gen "^3.0.0"
-    pug-filters "^4.0.0"
-    pug-lexer "^5.0.0"
-    pug-linker "^4.0.0"
-    pug-load "^3.0.0"
-    pug-parser "^6.0.0"
-    pug-runtime "^3.0.0"
-    pug-strip-comments "^2.0.0"
+    "pug-error" "^2.0.0"
 
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+"pug-walk@^2.0.0":
+  "resolved" "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz"
+  "version" "2.0.0"
+
+"pug@^3.0.0":
+  "resolved" "https://registry.npmjs.org/pug/-/pug-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
+    "pug-code-gen" "^3.0.0"
+    "pug-filters" "^4.0.0"
+    "pug-lexer" "^5.0.0"
+    "pug-linker" "^4.0.0"
+    "pug-load" "^3.0.0"
+    "pug-parser" "^6.0.0"
+    "pug-runtime" "^3.0.0"
+    "pug-strip-comments" "^2.0.0"
 
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+"pump@^2.0.0":
+  "resolved" "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
+    "end-of-stream" "^1.1.0"
+    "once" "^1.3.1"
 
-pumpify@^1.3.3:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+"pump@^3.0.0":
+  "resolved" "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
+    "end-of-stream" "^1.1.0"
+    "once" "^1.3.1"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
-punycode@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-
-pure-color@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e"
-
-q@^1.1.2:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-
-qs-stringify@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/qs-stringify/-/qs-stringify-1.2.1.tgz#9b39ef6b816bd83309628fc9dad435fc0eccc28b"
-
-qs@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-
-qs@^6.5.1, qs@^6.6.0:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+"pumpify@^1.3.3":
+  "resolved" "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"
+  "version" "1.5.1"
   dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
+    "duplexify" "^3.6.0"
+    "inherits" "^2.0.3"
+    "pump" "^2.0.0"
 
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+"punycode@^1.2.4":
+  "resolved" "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
+  "version" "1.4.1"
 
-querystring@0.2.0, querystring@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+"punycode@^2.1.0", "punycode@^2.1.1":
+  "resolved" "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
+  "version" "2.1.1"
 
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+"punycode@1.3.2":
+  "resolved" "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+  "version" "1.3.2"
 
-raf-schd@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.2.tgz#bd44c708188f2e84c810bf55fcea9231bcaed8a0"
+"pure-color@^1.2.0":
+  "resolved" "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz"
+  "version" "1.3.0"
 
-raf@^3.1.0, raf@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
+"q@^1.1.2":
+  "resolved" "https://registry.npmjs.org/q/-/q-1.5.1.tgz"
+  "version" "1.5.1"
+
+"qs-stringify@^1.1.0":
+  "resolved" "https://registry.npmjs.org/qs-stringify/-/qs-stringify-1.2.1.tgz"
+  "version" "1.2.1"
+
+"qs@^6.5.1", "qs@^6.6.0":
+  "resolved" "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz"
+  "version" "6.9.4"
+
+"qs@~6.5.2":
+  "resolved" "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"
+  "version" "6.5.2"
+
+"qs@6.7.0":
+  "resolved" "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"
+  "version" "6.7.0"
+
+"query-string@^4.1.0":
+  "resolved" "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz"
+  "version" "4.3.4"
   dependencies:
-    performance-now "^2.1.0"
+    "object-assign" "^4.1.0"
+    "strict-uri-encode" "^1.0.0"
 
-ramda@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.21.0.tgz#a001abedb3ff61077d4ff1d577d44de77e8d0a35"
+"querystring-es3@^0.2.0":
+  "resolved" "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
+  "version" "0.2.1"
 
-ramda@^0.25.0:
-  version "0.25.0"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.25.0.tgz#8fdf68231cffa90bc2f9460390a0cb74a29b29a9"
+"querystring@^0.2.0", "querystring@0.2.0":
+  "resolved" "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+  "version" "0.2.0"
 
-ramda@~0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
+"querystringify@^2.1.1":
+  "resolved" "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"
+  "version" "2.2.0"
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+"quick-lru@^4.0.1":
+  "resolved" "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"
+  "version" "4.0.1"
+
+"raf-schd@^4.0.2":
+  "resolved" "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.2.tgz"
+  "version" "4.0.2"
+
+"raf@^3.1.0", "raf@^3.4.1":
+  "resolved" "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz"
+  "version" "3.4.1"
   dependencies:
-    safe-buffer "^5.1.0"
+    "performance-now" "^2.1.0"
 
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+"ramda@^0.21.0":
+  "resolved" "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz"
+  "version" "0.21.0"
+
+"ramda@^0.25.0":
+  "resolved" "https://registry.npmjs.org/ramda/-/ramda-0.25.0.tgz"
+  "version" "0.25.0"
+
+"ramda@~0.26.1":
+  "resolved" "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz"
+  "version" "0.26.1"
+
+"randombytes@^2.0.0", "randombytes@^2.0.1", "randombytes@^2.0.5", "randombytes@^2.1.0":
+  "resolved" "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
+    "safe-buffer" "^5.1.0"
 
-range-parser@^1.2.1, range-parser@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+"randomfill@^1.0.3":
+  "resolved" "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"
+  "version" "1.0.4"
   dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
+    "randombytes" "^2.0.5"
+    "safe-buffer" "^5.1.0"
 
-raw-loader@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz#5e9d399a5a222cc0de18f42c3bc5e49677532b3f"
+"range-parser@^1.2.1", "range-parser@~1.2.1":
+  "resolved" "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
+  "version" "1.2.1"
+
+"raw-body@2.4.0":
+  "resolved" "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"
+  "version" "2.4.0"
   dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^2.0.1"
+    "bytes" "3.1.0"
+    "http-errors" "1.7.2"
+    "iconv-lite" "0.4.24"
+    "unpipe" "1.0.0"
 
-raw-loader@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
+"raw-loader@^3.1.0":
+  "resolved" "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
+    "loader-utils" "^1.1.0"
+    "schema-utils" "^2.0.1"
 
-rc-pagination@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.3.tgz#afd779839fefab2cb14248d5e7b74027960bb48b"
-  integrity sha512-Z7CdC4xGkedfAwcUHPtfqNhYwVyDgkmhkvfsmoByCOwAd89p42t5O5T3ORar1wRmVWf3jxk/Bf4k0atenNvlFA==
+"raw-loader@^4.0.2":
+  "resolved" "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz"
+  "version" "4.0.2"
+  dependencies:
+    "loader-utils" "^2.0.0"
+    "schema-utils" "^3.0.0"
+
+"rc-pagination@^3.1.3":
+  "resolved" "https://registry.npmjs.org/rc-pagination/-/rc-pagination-3.1.3.tgz"
+  "version" "3.1.3"
   dependencies:
     "@babel/runtime" "^7.10.1"
-    classnames "^2.2.1"
+    "classnames" "^2.2.1"
 
-re-reselect@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/re-reselect/-/re-reselect-3.4.0.tgz#0f2303f3c84394f57f0cd31fea08a1ca4840a7cd"
+"re-reselect@^3.4.0":
+  "resolved" "https://registry.npmjs.org/re-reselect/-/re-reselect-3.4.0.tgz"
+  "version" "3.4.0"
 
-react-app-polyfill@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-2.0.0.tgz#a0bea50f078b8a082970a9d853dc34b6dcc6a3cf"
+"react-app-polyfill@^1.0.6":
+  "resolved" "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz"
+  "version" "1.0.6"
   dependencies:
-    core-js "^3.6.5"
-    object-assign "^4.1.1"
-    promise "^8.1.0"
-    raf "^3.4.1"
-    regenerator-runtime "^0.13.7"
-    whatwg-fetch "^3.4.1"
+    "core-js" "^3.5.0"
+    "object-assign" "^4.1.1"
+    "promise" "^8.0.3"
+    "raf" "^3.4.1"
+    "regenerator-runtime" "^0.13.3"
+    "whatwg-fetch" "^3.0.0"
 
-react-base-table@^1.9.1:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/react-base-table/-/react-base-table-1.12.0.tgz#3fc39f1cc7d1a4b349572e1d2b283626987d5dcc"
+"react-app-polyfill@^2.0.0":
+  "resolved" "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-2.0.0.tgz"
+  "version" "2.0.0"
+  dependencies:
+    "core-js" "^3.6.5"
+    "object-assign" "^4.1.1"
+    "promise" "^8.1.0"
+    "raf" "^3.4.1"
+    "regenerator-runtime" "^0.13.7"
+    "whatwg-fetch" "^3.4.1"
+
+"react-async-script@^1.1.1":
+  "resolved" "https://registry.npmjs.org/react-async-script/-/react-async-script-1.2.0.tgz"
+  "version" "1.2.0"
+  dependencies:
+    "hoist-non-react-statics" "^3.3.0"
+    "prop-types" "^15.5.0"
+
+"react-base-table@^1.9.1":
+  "resolved" "https://registry.npmjs.org/react-base-table/-/react-base-table-1.12.0.tgz"
+  "version" "1.12.0"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    classnames "^2.2.5"
-    memoize-one "^5.0.0"
-    prop-types "^15.7.0"
-    react-virtualized-auto-sizer "^1.0.2"
-    react-window "^1.8.2"
+    "classnames" "^2.2.5"
+    "memoize-one" "^5.0.0"
+    "prop-types" "^15.7.0"
+    "react-virtualized-auto-sizer" "^1.0.2"
+    "react-window" "^1.8.2"
 
-react-base16-styling@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.6.0.tgz#ef2156d66cf4139695c8a167886cb69ea660792c"
+"react-base16-styling@^0.6.0":
+  "resolved" "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz"
+  "version" "0.6.0"
   dependencies:
-    base16 "^1.0.0"
-    lodash.curry "^4.0.1"
-    lodash.flow "^3.3.0"
-    pure-color "^1.2.0"
+    "base16" "^1.0.0"
+    "lodash.curry" "^4.0.1"
+    "lodash.flow" "^3.3.0"
+    "pure-color" "^1.2.0"
 
-react-beautiful-dnd@^12.2.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-12.2.0.tgz#e5f6222f9e7934c6ed4ee09024547f9e353ae423"
+"react-beautiful-dnd@^12.2.0":
+  "resolved" "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-12.2.0.tgz"
+  "version" "12.2.0"
   dependencies:
     "@babel/runtime-corejs2" "^7.6.3"
-    css-box-model "^1.2.0"
-    memoize-one "^5.1.1"
-    raf-schd "^4.0.2"
-    react-redux "^7.1.1"
-    redux "^4.0.4"
-    use-memo-one "^1.1.1"
+    "css-box-model" "^1.2.0"
+    "memoize-one" "^5.1.1"
+    "raf-schd" "^4.0.2"
+    "react-redux" "^7.1.1"
+    "redux" "^4.0.4"
+    "use-memo-one" "^1.1.1"
 
-react-clientside-effect@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz#6212fb0e07b204e714581dd51992603d1accc837"
+"react-clientside-effect@^1.2.2":
+  "resolved" "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz"
+  "version" "1.2.2"
   dependencies:
     "@babel/runtime" "^7.0.0"
 
-react-color@^2.17.0:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.18.1.tgz#2cda8cc8e06a9e2c52ad391a30ddad31972472f4"
+"react-color@^2.17.0":
+  "resolved" "https://registry.npmjs.org/react-color/-/react-color-2.18.1.tgz"
+  "version" "2.18.1"
   dependencies:
     "@icons/material" "^0.2.4"
-    lodash "^4.17.11"
-    material-colors "^1.2.1"
-    prop-types "^15.5.10"
-    reactcss "^1.2.0"
-    tinycolor2 "^1.4.1"
+    "lodash" "^4.17.11"
+    "material-colors" "^1.2.1"
+    "prop-types" "^15.5.10"
+    "reactcss" "^1.2.0"
+    "tinycolor2" "^1.4.1"
 
-react-custom-scrollbars@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/react-custom-scrollbars/-/react-custom-scrollbars-4.2.1.tgz#830fd9502927e97e8a78c2086813899b2a8b66db"
+"react-custom-scrollbars@^4.2.1":
+  "resolved" "https://registry.npmjs.org/react-custom-scrollbars/-/react-custom-scrollbars-4.2.1.tgz"
+  "version" "4.2.1"
   dependencies:
-    dom-css "^2.0.0"
-    prop-types "^15.5.10"
-    raf "^3.1.0"
+    "dom-css" "^2.0.0"
+    "prop-types" "^15.5.10"
+    "raf" "^3.1.0"
 
-react-day-picker@7.4.8:
-  version "7.4.8"
-  resolved "https://registry.yarnpkg.com/react-day-picker/-/react-day-picker-7.4.8.tgz#675625240d3fae1b41c0a9d5177c968c8517c1d4"
+"react-day-picker@7.4.8":
+  "resolved" "https://registry.npmjs.org/react-day-picker/-/react-day-picker-7.4.8.tgz"
+  "version" "7.4.8"
   dependencies:
-    prop-types "^15.6.2"
+    "prop-types" "^15.6.2"
 
-react-dev-utils@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.1.tgz#30106c2055acfd6b047d2dc478a85c356e66fe45"
+"react-dev-utils@^11.0.1":
+  "resolved" "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.1.tgz"
+  "version" "11.0.1"
   dependencies:
     "@babel/code-frame" "7.10.4"
-    address "1.1.2"
-    browserslist "4.14.2"
-    chalk "2.4.2"
-    cross-spawn "7.0.3"
-    detect-port-alt "1.1.6"
-    escape-string-regexp "2.0.0"
-    filesize "6.1.0"
-    find-up "4.1.0"
-    fork-ts-checker-webpack-plugin "4.1.6"
-    global-modules "2.0.0"
-    globby "11.0.1"
-    gzip-size "5.1.1"
-    immer "7.0.9"
-    is-root "2.1.0"
-    loader-utils "2.0.0"
-    open "^7.0.2"
-    pkg-up "3.1.0"
-    prompts "2.4.0"
-    react-error-overlay "^6.0.8"
-    recursive-readdir "2.2.2"
-    shell-quote "1.7.2"
-    strip-ansi "6.0.0"
-    text-table "0.2.0"
+    "address" "1.1.2"
+    "browserslist" "4.14.2"
+    "chalk" "2.4.2"
+    "cross-spawn" "7.0.3"
+    "detect-port-alt" "1.1.6"
+    "escape-string-regexp" "2.0.0"
+    "filesize" "6.1.0"
+    "find-up" "4.1.0"
+    "fork-ts-checker-webpack-plugin" "4.1.6"
+    "global-modules" "2.0.0"
+    "globby" "11.0.1"
+    "gzip-size" "5.1.1"
+    "immer" "7.0.9"
+    "is-root" "2.1.0"
+    "loader-utils" "2.0.0"
+    "open" "^7.0.2"
+    "pkg-up" "3.1.0"
+    "prompts" "2.4.0"
+    "react-error-overlay" "^6.0.8"
+    "recursive-readdir" "2.2.2"
+    "shell-quote" "1.7.2"
+    "strip-ansi" "6.0.0"
+    "text-table" "0.2.0"
 
-react-dev-utils@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.1.0.tgz#3ad2bb8848a32319d760d0a84c56c14bdaae5e81"
+"react-dev-utils@^9.0.0":
+  "resolved" "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-9.1.0.tgz"
+  "version" "9.1.0"
   dependencies:
     "@babel/code-frame" "7.5.5"
-    address "1.1.2"
-    browserslist "4.7.0"
-    chalk "2.4.2"
-    cross-spawn "6.0.5"
-    detect-port-alt "1.1.6"
-    escape-string-regexp "1.0.5"
-    filesize "3.6.1"
-    find-up "3.0.0"
-    fork-ts-checker-webpack-plugin "1.5.0"
-    global-modules "2.0.0"
-    globby "8.0.2"
-    gzip-size "5.1.1"
-    immer "1.10.0"
-    inquirer "6.5.0"
-    is-root "2.1.0"
-    loader-utils "1.2.3"
-    open "^6.3.0"
-    pkg-up "2.0.0"
-    react-error-overlay "^6.0.3"
-    recursive-readdir "2.2.2"
-    shell-quote "1.7.2"
-    sockjs-client "1.4.0"
-    strip-ansi "5.2.0"
-    text-table "0.2.0"
+    "address" "1.1.2"
+    "browserslist" "4.7.0"
+    "chalk" "2.4.2"
+    "cross-spawn" "6.0.5"
+    "detect-port-alt" "1.1.6"
+    "escape-string-regexp" "1.0.5"
+    "filesize" "3.6.1"
+    "find-up" "3.0.0"
+    "fork-ts-checker-webpack-plugin" "1.5.0"
+    "global-modules" "2.0.0"
+    "globby" "8.0.2"
+    "gzip-size" "5.1.1"
+    "immer" "1.10.0"
+    "inquirer" "6.5.0"
+    "is-root" "2.1.0"
+    "loader-utils" "1.2.3"
+    "open" "^6.3.0"
+    "pkg-up" "2.0.0"
+    "react-error-overlay" "^6.0.3"
+    "recursive-readdir" "2.2.2"
+    "shell-quote" "1.7.2"
+    "sockjs-client" "1.4.0"
+    "strip-ansi" "5.2.0"
+    "text-table" "0.2.0"
 
-react-dnd-html5-backend@^9.3.4:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-9.5.1.tgz#e6a0aed3ece800c1abe004f9ed9991513e2e644c"
+"react-dnd-html5-backend@^9.3.4":
+  "resolved" "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-9.5.1.tgz"
+  "version" "9.5.1"
   dependencies:
-    dnd-core "^9.5.1"
+    "dnd-core" "^9.5.1"
 
-react-dnd-touch-backend@^9.4.0:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/react-dnd-touch-backend/-/react-dnd-touch-backend-9.5.1.tgz#cc0a35f61acc920d91aad267a415db5f702129a3"
+"react-dnd-touch-backend@^9.4.0":
+  "resolved" "https://registry.npmjs.org/react-dnd-touch-backend/-/react-dnd-touch-backend-9.5.1.tgz"
+  "version" "9.5.1"
   dependencies:
     "@types/invariant" "^2.2.30"
-    dnd-core "^9.5.1"
-    invariant "^2.2.4"
+    "dnd-core" "^9.5.1"
+    "invariant" "^2.2.4"
 
-react-dnd@^9.3.4:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-9.5.1.tgz#907e55c791d6c50cbed1a4021c14b989b86ac467"
+"react-dnd@^9.3.4":
+  "resolved" "https://registry.npmjs.org/react-dnd/-/react-dnd-9.5.1.tgz"
+  "version" "9.5.1"
   dependencies:
     "@types/hoist-non-react-statics" "^3.3.1"
     "@types/shallowequal" "^1.1.1"
-    dnd-core "^9.5.1"
-    hoist-non-react-statics "^3.3.0"
-    shallowequal "^1.1.0"
+    "dnd-core" "^9.5.1"
+    "hoist-non-react-statics" "^3.3.0"
+    "shallowequal" "^1.1.0"
 
-react-docgen-typescript-loader@^3.6.0, react-docgen-typescript-loader@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/react-docgen-typescript-loader/-/react-docgen-typescript-loader-3.7.2.tgz#45cb2305652c0602767242a8700ad1ebd66bbbbd"
+"react-docgen-typescript-loader@^3.6.0", "react-docgen-typescript-loader@^3.7.2":
+  "resolved" "https://registry.npmjs.org/react-docgen-typescript-loader/-/react-docgen-typescript-loader-3.7.2.tgz"
+  "version" "3.7.2"
   dependencies:
     "@webpack-contrib/schema-utils" "^1.0.0-beta.0"
-    loader-utils "^1.2.3"
-    react-docgen-typescript "^1.15.0"
+    "loader-utils" "^1.2.3"
+    "react-docgen-typescript" "^1.15.0"
 
-react-docgen-typescript-plugin@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-0.5.2.tgz#2b294d75ef3145c36303da82be5d447cb67dc0dc"
+"react-docgen-typescript-plugin@^0.5.0":
+  "resolved" "https://registry.npmjs.org/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-0.5.2.tgz"
+  "version" "0.5.2"
   dependencies:
-    debug "^4.1.1"
-    endent "^2.0.1"
-    micromatch "^4.0.2"
-    react-docgen-typescript "^1.20.1"
-    react-docgen-typescript-loader "^3.7.2"
-    tslib "^2.0.0"
+    "debug" "^4.1.1"
+    "endent" "^2.0.1"
+    "micromatch" "^4.0.2"
+    "react-docgen-typescript" "^1.20.1"
+    "react-docgen-typescript-loader" "^3.7.2"
+    "tslib" "^2.0.0"
 
-react-docgen-typescript@^1.15.0, react-docgen-typescript@^1.20.1:
-  version "1.20.5"
-  resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-1.20.5.tgz#fb8d78a707243498436c2952bd3f6f488a68d4f3"
+"react-docgen-typescript@^1.15.0", "react-docgen-typescript@^1.20.1":
+  "resolved" "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-1.20.5.tgz"
+  "version" "1.20.5"
 
-react-docgen@^5.0.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-5.3.0.tgz#9aabde5e69f1993c8ba839fd9a86696504654589"
+"react-docgen@^5.0.0":
+  "resolved" "https://registry.npmjs.org/react-docgen/-/react-docgen-5.3.0.tgz"
+  "version" "5.3.0"
   dependencies:
     "@babel/core" "^7.7.5"
     "@babel/runtime" "^7.7.6"
-    ast-types "^0.13.2"
-    commander "^2.19.0"
-    doctrine "^3.0.0"
-    neo-async "^2.6.1"
-    node-dir "^0.1.10"
-    strip-indent "^3.0.0"
+    "ast-types" "^0.13.2"
+    "commander" "^2.19.0"
+    "doctrine" "^3.0.0"
+    "neo-async" "^2.6.1"
+    "node-dir" "^0.1.10"
+    "strip-indent" "^3.0.0"
 
-react-dom@^16.7.0, react-dom@^16.8.3, react-dom@^16.8.5:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
+"react-dom@*", "react-dom@^0.14.0 || ^15.0.0 || ^16.0.0", "react-dom@^0.14.0 || ^15.0.0-0 || ^16.0.0", "react-dom@^0.14.8 || ^15.0.1 || ^16.0.0", "react-dom@^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0", "react-dom@^15.0.0 || ^16.0.0", "react-dom@^15.0.0 || ^16.0.0 || ^17.0.0", "react-dom@^15.3.0 || ^16.0.0-alpha", "react-dom@^15.3.0 || 16", "react-dom@^15.3.0 || 16 || 17", "react-dom@^16.0.0", "react-dom@^16.0.0 || ^15.5.4", "react-dom@^16.3.0", "react-dom@^16.6.0", "react-dom@^16.7.0", "react-dom@^16.8.0", "react-dom@^16.8.3", "react-dom@^16.8.5", "react-dom@>= 16.3.0 < 17", "react-dom@>= 16.8", "react-dom@>= 16.8.0", "react-dom@>=0.14.0", "react-dom@>=15.0.0", "react-dom@>=16.3.0", "react-dom@>=16.6.0", "react-dom@>=16.8.0", "react-dom@>=16.8.3", "react-dom@>=16.9.0", "react-dom@15.x || 16.x || 16.4.0-alpha.0911da3":
+  "resolved" "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz"
+  "version" "16.13.1"
   dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    scheduler "^0.19.1"
+    "loose-envify" "^1.1.0"
+    "object-assign" "^4.1.1"
+    "prop-types" "^15.6.2"
+    "scheduler" "^0.19.1"
 
-react-draggable@^4.0.3:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"
+"react-draggable@^4.0.3":
+  "resolved" "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.3.tgz"
+  "version" "4.4.3"
   dependencies:
-    classnames "^2.2.5"
-    prop-types "^15.6.0"
+    "classnames" "^2.2.5"
+    "prop-types" "^15.6.0"
 
-react-element-to-jsx-string@^14.1.0:
-  version "14.3.1"
-  resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-14.3.1.tgz#a08fa6e46eb76061aca7eabc2e70f433583cb203"
+"react-element-to-jsx-string@^14.1.0":
+  "resolved" "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-14.3.1.tgz"
+  "version" "14.3.1"
   dependencies:
     "@base2/pretty-print-object" "1.0.0"
-    is-plain-object "3.0.0"
+    "is-plain-object" "3.0.0"
 
-react-error-overlay@^6.0.3:
-  version "6.0.7"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108"
+"react-error-overlay@^6.0.3":
+  "resolved" "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz"
+  "version" "6.0.7"
 
-react-error-overlay@^6.0.8:
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.8.tgz#474ed11d04fc6bda3af643447d85e9127ed6b5de"
+"react-error-overlay@^6.0.8":
+  "resolved" "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.8.tgz"
+  "version" "6.0.8"
 
-react-fast-compare@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
+"react-fast-compare@^2.0.2":
+  "resolved" "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz"
+  "version" "2.0.4"
 
-react-fast-compare@^3.0.0, react-fast-compare@^3.0.1, react-fast-compare@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
+"react-fast-compare@^3.0.0", "react-fast-compare@^3.0.1", "react-fast-compare@^3.2.0":
+  "resolved" "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz"
+  "version" "3.2.0"
 
-react-focus-lock@^2.1.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.4.1.tgz#e842cc93da736b5c5d331799012544295cbcee4f"
+"react-focus-lock@^2.1.0":
+  "resolved" "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.4.1.tgz"
+  "version" "2.4.1"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    focus-lock "^0.7.0"
-    prop-types "^15.6.2"
-    react-clientside-effect "^1.2.2"
-    use-callback-ref "^1.2.1"
-    use-sidecar "^1.0.1"
+    "focus-lock" "^0.7.0"
+    "prop-types" "^15.6.2"
+    "react-clientside-effect" "^1.2.2"
+    "use-callback-ref" "^1.2.1"
+    "use-sidecar" "^1.0.1"
 
-react-google-maps@^9.4.5:
-  version "9.4.5"
-  resolved "https://registry.yarnpkg.com/react-google-maps/-/react-google-maps-9.4.5.tgz#920c199bdc925e0ce93880edffb09428d263aafa"
+"react-google-maps@^9.4.5":
+  "resolved" "https://registry.npmjs.org/react-google-maps/-/react-google-maps-9.4.5.tgz"
+  "version" "9.4.5"
   dependencies:
-    babel-runtime "^6.11.6"
-    can-use-dom "^0.1.0"
-    google-maps-infobox "^2.0.0"
-    invariant "^2.2.1"
-    lodash "^4.16.2"
-    marker-clusterer-plus "^2.1.4"
-    markerwithlabel "^2.0.1"
-    prop-types "^15.5.8"
-    recompose "^0.26.0"
-    scriptjs "^2.5.8"
-    warning "^3.0.0"
+    "babel-runtime" "^6.11.6"
+    "can-use-dom" "^0.1.0"
+    "google-maps-infobox" "^2.0.0"
+    "invariant" "^2.2.1"
+    "lodash" "^4.16.2"
+    "marker-clusterer-plus" "^2.1.4"
+    "markerwithlabel" "^2.0.1"
+    "prop-types" "^15.5.8"
+    "recompose" "^0.26.0"
+    "scriptjs" "^2.5.8"
+    "warning" "^3.0.0"
 
-react-helmet-async@^1.0.2:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.0.7.tgz#b988fbc3abdc4b704982bb74b9cb4a08fcf062c1"
+"react-google-recaptcha@^2.1.0":
+  "resolved" "https://registry.npmjs.org/react-google-recaptcha/-/react-google-recaptcha-2.1.0.tgz"
+  "version" "2.1.0"
+  dependencies:
+    "prop-types" "^15.5.0"
+    "react-async-script" "^1.1.1"
+
+"react-helmet-async@^1.0.2":
+  "resolved" "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.0.7.tgz"
+  "version" "1.0.7"
   dependencies:
     "@babel/runtime" "^7.11.2"
-    invariant "^2.2.4"
-    prop-types "^15.7.2"
-    react-fast-compare "^3.2.0"
-    shallowequal "^1.1.0"
+    "invariant" "^2.2.4"
+    "prop-types" "^15.7.2"
+    "react-fast-compare" "^3.2.0"
+    "shallowequal" "^1.1.0"
 
-react-helmet@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.2.1.tgz#16a7192fdd09951f8e0fe22ffccbf9bb3e591ffa"
+"react-helmet@^5.2.1":
+  "resolved" "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz"
+  "version" "5.2.1"
   dependencies:
-    object-assign "^4.1.1"
-    prop-types "^15.5.4"
-    react-fast-compare "^2.0.2"
-    react-side-effect "^1.1.0"
+    "object-assign" "^4.1.1"
+    "prop-types" "^15.5.4"
+    "react-fast-compare" "^2.0.2"
+    "react-side-effect" "^1.1.0"
 
-react-hotkeys@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-2.0.0.tgz#a7719c7340cbba888b0e9184f806a9ec0ac2c53f"
+"react-hotkeys@2.0.0":
+  "resolved" "https://registry.npmjs.org/react-hotkeys/-/react-hotkeys-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    prop-types "^15.6.1"
+    "prop-types" "^15.6.1"
 
-react-infinite-scroller@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.2.4.tgz#f67eaec4940a4ce6417bebdd6e3433bfc38826e9"
+"react-infinite-scroller@^1.2.4":
+  "resolved" "https://registry.npmjs.org/react-infinite-scroller/-/react-infinite-scroller-1.2.4.tgz"
+  "version" "1.2.4"
   dependencies:
-    prop-types "^15.5.8"
+    "prop-types" "^15.5.8"
 
-react-input-autosize@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.2.tgz#fcaa7020568ec206bc04be36f4eb68e647c4d8c2"
+"react-input-autosize@^2.2.2":
+  "resolved" "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz"
+  "version" "2.2.2"
   dependencies:
-    prop-types "^15.5.8"
+    "prop-types" "^15.5.8"
 
-react-inspector@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-4.0.1.tgz#0f888f78ff7daccbc7be5d452b20c96dc6d5fbb8"
+"react-inspector@^4.0.0":
+  "resolved" "https://registry.npmjs.org/react-inspector/-/react-inspector-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
     "@babel/runtime" "^7.6.3"
-    is-dom "^1.0.9"
-    prop-types "^15.6.1"
+    "is-dom" "^1.0.9"
+    "prop-types" "^15.6.1"
 
-react-instantsearch-core@^6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/react-instantsearch-core/-/react-instantsearch-core-6.7.0.tgz#a4784bbf0a031b7c04830312fa6bc51f10e612ee"
+"react-instantsearch-core@^6.7.0":
+  "resolved" "https://registry.npmjs.org/react-instantsearch-core/-/react-instantsearch-core-6.7.0.tgz"
+  "version" "6.7.0"
   dependencies:
     "@babel/runtime" "^7.1.2"
-    algoliasearch-helper "^3.1.0"
-    prop-types "^15.5.10"
-    react-fast-compare "^3.0.0"
+    "algoliasearch-helper" "^3.1.0"
+    "prop-types" "^15.5.10"
+    "react-fast-compare" "^3.0.0"
 
-react-instantsearch-dom@^6.4.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/react-instantsearch-dom/-/react-instantsearch-dom-6.7.0.tgz#1163aa813dfe2e6c5cac77c6f912eeb5b389ba60"
+"react-instantsearch-dom@^6.4.0":
+  "resolved" "https://registry.npmjs.org/react-instantsearch-dom/-/react-instantsearch-dom-6.7.0.tgz"
+  "version" "6.7.0"
   dependencies:
     "@babel/runtime" "^7.1.2"
-    algoliasearch-helper "^3.1.0"
-    classnames "^2.2.5"
-    prop-types "^15.5.10"
-    react-instantsearch-core "^6.7.0"
+    "algoliasearch-helper" "^3.1.0"
+    "classnames" "^2.2.5"
+    "prop-types" "^15.5.10"
+    "react-instantsearch-core" "^6.7.0"
 
-react-is@^16.12.0, react-is@^16.4.2, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+"react-is@^16.12.0", "react-is@^16.4.2", "react-is@^16.6.0", "react-is@^16.7.0", "react-is@^16.8.0", "react-is@^16.8.1", "react-is@^16.8.4", "react-is@^16.8.6", "react-is@^16.9.0", "react-is@>= 16.8.0":
+  "resolved" "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
+  "version" "16.13.1"
 
-react-is@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
+"react-is@^17.0.1":
+  "resolved" "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz"
+  "version" "17.0.1"
 
-react-json-view@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.19.1.tgz#95d8e59e024f08a25e5dc8f076ae304eed97cf5c"
+"react-json-view@^1.19.1":
+  "resolved" "https://registry.npmjs.org/react-json-view/-/react-json-view-1.19.1.tgz"
+  "version" "1.19.1"
   dependencies:
-    flux "^3.1.3"
-    react-base16-styling "^0.6.0"
-    react-lifecycles-compat "^3.0.4"
-    react-textarea-autosize "^6.1.0"
+    "flux" "^3.1.3"
+    "react-base16-styling" "^0.6.0"
+    "react-lifecycles-compat" "^3.0.4"
+    "react-textarea-autosize" "^6.1.0"
 
-react-lifecycles-compat@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
+"react-lifecycles-compat@^3.0.4":
+  "resolved" "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"
+  "version" "3.0.4"
 
-react-mentions@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/react-mentions/-/react-mentions-4.1.1.tgz#9f74928f7a33d587151e95dc7ef303f2002790de"
-  integrity sha512-+BK8dQzXPZUBFYfbv1hwbve9lp0lGYHOUyb1hk9s13mzvmVD9S+l9oszo1CaumVjYdb9olJ4NMJW2jBRGck9Rw==
+"react-mentions@^4.1.1":
+  "resolved" "https://registry.npmjs.org/react-mentions/-/react-mentions-4.1.1.tgz"
+  "version" "4.1.1"
   dependencies:
     "@babel/runtime" "7.4.5"
-    invariant "^2.2.4"
-    prop-types "^15.5.8"
-    substyle "^9.1.0"
+    "invariant" "^2.2.4"
+    "prop-types" "^15.5.8"
+    "substyle" "^9.1.0"
 
-react-paginating@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/react-paginating/-/react-paginating-1.4.0.tgz#f19c4871d60428a7a2a0d49981da0e1df148e129"
+"react-paginating@^1.4.0":
+  "resolved" "https://registry.npmjs.org/react-paginating/-/react-paginating-1.4.0.tgz"
+  "version" "1.4.0"
   dependencies:
-    paging-algorithm "^1.0.1"
+    "paging-algorithm" "^1.0.1"
 
-react-pdf@^4.0.5:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/react-pdf/-/react-pdf-4.2.0.tgz#b83a01eb070912522075b7a51aee7d63b2c912ed"
+"react-pdf@^4.0.5":
+  "resolved" "https://registry.npmjs.org/react-pdf/-/react-pdf-4.2.0.tgz"
+  "version" "4.2.0"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    make-cancellable-promise "^1.0.0"
-    make-event-props "^1.1.0"
-    merge-class-names "^1.1.1"
-    pdfjs-dist "2.1.266"
-    prop-types "^15.6.2"
+    "make-cancellable-promise" "^1.0.0"
+    "make-event-props" "^1.1.0"
+    "merge-class-names" "^1.1.1"
+    "pdfjs-dist" "2.1.266"
+    "prop-types" "^15.6.2"
 
-react-player@^2.3.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/react-player/-/react-player-2.6.2.tgz#d41fe842f5bd6a2b1d3ce1ba9ed82c3eb26e0df4"
+"react-player@^2.3.1":
+  "resolved" "https://registry.npmjs.org/react-player/-/react-player-2.6.2.tgz"
+  "version" "2.6.2"
   dependencies:
-    deepmerge "^4.0.0"
-    load-script "^1.0.0"
-    memoize-one "^5.1.1"
-    prop-types "^15.7.2"
-    react-fast-compare "^3.0.1"
+    "deepmerge" "^4.0.0"
+    "load-script" "^1.0.0"
+    "memoize-one" "^5.1.1"
+    "prop-types" "^15.7.2"
+    "react-fast-compare" "^3.0.1"
 
-react-popper-tooltip@^2.8.3:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-2.11.1.tgz#3c4bdfd8bc10d1c2b9a162e859bab8958f5b2644"
+"react-popper-tooltip@^2.8.3":
+  "resolved" "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-2.11.1.tgz"
+  "version" "2.11.1"
   dependencies:
     "@babel/runtime" "^7.9.2"
-    react-popper "^1.3.7"
+    "react-popper" "^1.3.7"
 
-react-popper@^1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz#f6a3471362ef1f0d10a4963673789de1baca2324"
+"react-popper@^1.3.7":
+  "resolved" "https://registry.npmjs.org/react-popper/-/react-popper-1.3.7.tgz"
+  "version" "1.3.7"
   dependencies:
     "@babel/runtime" "^7.1.2"
-    create-react-context "^0.3.0"
-    deep-equal "^1.1.1"
-    popper.js "^1.14.4"
-    prop-types "^15.6.1"
-    typed-styles "^0.0.7"
-    warning "^4.0.2"
+    "create-react-context" "^0.3.0"
+    "deep-equal" "^1.1.1"
+    "popper.js" "^1.14.4"
+    "prop-types" "^15.6.1"
+    "typed-styles" "^0.0.7"
+    "warning" "^4.0.2"
 
-react-popper@^2.2.4:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.5.tgz#1214ef3cec86330a171671a4fbcbeeb65ee58e96"
-  integrity sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==
+"react-popper@^2.2.4":
+  "resolved" "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz"
+  "version" "2.2.5"
   dependencies:
-    react-fast-compare "^3.0.1"
-    warning "^4.0.2"
+    "react-fast-compare" "^3.0.1"
+    "warning" "^4.0.2"
 
-react-redux@^7.1.1, react-redux@^7.1.3:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.1.tgz#8dedf784901014db2feca1ab633864dee68ad985"
+"react-popper@^2.2.5":
+  "resolved" "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz"
+  "version" "2.2.5"
+  dependencies:
+    "react-fast-compare" "^3.0.1"
+    "warning" "^4.0.2"
+
+"react-rating@^2.0.5":
+  "resolved" "https://registry.npmjs.org/react-rating/-/react-rating-2.0.5.tgz"
+  "version" "2.0.5"
+  dependencies:
+    "@types/lodash" "^4.14.105"
+    "@types/react" "^16.0.40"
+
+"react-redux@^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", "react-redux@^6.0.1 || ^7.0.0", "react-redux@^7.1.1", "react-redux@^7.1.3":
+  "resolved" "https://registry.npmjs.org/react-redux/-/react-redux-7.2.1.tgz"
+  "version" "7.2.1"
   dependencies:
     "@babel/runtime" "^7.5.5"
-    hoist-non-react-statics "^3.3.0"
-    loose-envify "^1.4.0"
-    prop-types "^15.7.2"
-    react-is "^16.9.0"
+    "hoist-non-react-statics" "^3.3.0"
+    "loose-envify" "^1.4.0"
+    "prop-types" "^15.7.2"
+    "react-is" "^16.9.0"
 
-react-refresh@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"
+"react-refresh@^0.8.3":
+  "resolved" "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz"
+  "version" "0.8.3"
 
-react-router-dom@^5.1.2:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
+"react-router-dom@^5.1.2":
+  "resolved" "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz"
+  "version" "5.2.0"
   dependencies:
     "@babel/runtime" "^7.1.2"
-    history "^4.9.0"
-    loose-envify "^1.3.1"
-    prop-types "^15.6.2"
-    react-router "5.2.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
+    "history" "^4.9.0"
+    "loose-envify" "^1.3.1"
+    "prop-types" "^15.6.2"
+    "react-router" "5.2.0"
+    "tiny-invariant" "^1.0.2"
+    "tiny-warning" "^1.0.0"
 
-react-router@5.2.0, react-router@^5.1.2:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293"
+"react-router@^5.1.2", "react-router@5.2.0":
+  "resolved" "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz"
+  "version" "5.2.0"
   dependencies:
     "@babel/runtime" "^7.1.2"
-    history "^4.9.0"
-    hoist-non-react-statics "^3.1.0"
-    loose-envify "^1.3.1"
-    mini-create-react-context "^0.4.0"
-    path-to-regexp "^1.7.0"
-    prop-types "^15.6.2"
-    react-is "^16.6.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
+    "history" "^4.9.0"
+    "hoist-non-react-statics" "^3.1.0"
+    "loose-envify" "^1.3.1"
+    "mini-create-react-context" "^0.4.0"
+    "path-to-regexp" "^1.7.0"
+    "prop-types" "^15.6.2"
+    "react-is" "^16.6.0"
+    "tiny-invariant" "^1.0.2"
+    "tiny-warning" "^1.0.0"
 
-react-scripts@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-4.0.1.tgz#34974c0f4cfdf1655906c95df6a04d80db8b88f0"
+"react-scripts@*", "react-scripts@>=3.0.0", "react-scripts@4.0.1":
+  "resolved" "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
     "@babel/core" "7.12.3"
     "@pmmmwh/react-refresh-webpack-plugin" "0.4.2"
     "@svgr/webpack" "5.4.0"
     "@typescript-eslint/eslint-plugin" "^4.5.0"
     "@typescript-eslint/parser" "^4.5.0"
-    babel-eslint "^10.1.0"
-    babel-jest "^26.6.0"
-    babel-loader "8.1.0"
-    babel-plugin-named-asset-import "^0.3.7"
-    babel-preset-react-app "^10.0.0"
-    bfj "^7.0.2"
-    camelcase "^6.1.0"
-    case-sensitive-paths-webpack-plugin "2.3.0"
-    css-loader "4.3.0"
-    dotenv "8.2.0"
-    dotenv-expand "5.1.0"
-    eslint "^7.11.0"
-    eslint-config-react-app "^6.0.0"
-    eslint-plugin-flowtype "^5.2.0"
-    eslint-plugin-import "^2.22.1"
-    eslint-plugin-jest "^24.1.0"
-    eslint-plugin-jsx-a11y "^6.3.1"
-    eslint-plugin-react "^7.21.5"
-    eslint-plugin-react-hooks "^4.2.0"
-    eslint-plugin-testing-library "^3.9.2"
-    eslint-webpack-plugin "^2.1.0"
-    file-loader "6.1.1"
-    fs-extra "^9.0.1"
-    html-webpack-plugin "4.5.0"
-    identity-obj-proxy "3.0.0"
-    jest "26.6.0"
-    jest-circus "26.6.0"
-    jest-resolve "26.6.0"
-    jest-watch-typeahead "0.6.1"
-    mini-css-extract-plugin "0.11.3"
-    optimize-css-assets-webpack-plugin "5.0.4"
-    pnp-webpack-plugin "1.6.4"
-    postcss-flexbugs-fixes "4.2.1"
-    postcss-loader "3.0.0"
-    postcss-normalize "8.0.1"
-    postcss-preset-env "6.7.0"
-    postcss-safe-parser "5.0.2"
-    prompts "2.4.0"
-    react-app-polyfill "^2.0.0"
-    react-dev-utils "^11.0.1"
-    react-refresh "^0.8.3"
-    resolve "1.18.1"
-    resolve-url-loader "^3.1.2"
-    sass-loader "8.0.2"
-    semver "7.3.2"
-    style-loader "1.3.0"
-    terser-webpack-plugin "4.2.3"
-    ts-pnp "1.2.0"
-    url-loader "4.1.1"
-    webpack "4.44.2"
-    webpack-dev-server "3.11.0"
-    webpack-manifest-plugin "2.2.0"
-    workbox-webpack-plugin "5.1.4"
+    "babel-eslint" "^10.1.0"
+    "babel-jest" "^26.6.0"
+    "babel-loader" "8.1.0"
+    "babel-plugin-named-asset-import" "^0.3.7"
+    "babel-preset-react-app" "^10.0.0"
+    "bfj" "^7.0.2"
+    "camelcase" "^6.1.0"
+    "case-sensitive-paths-webpack-plugin" "2.3.0"
+    "css-loader" "4.3.0"
+    "dotenv" "8.2.0"
+    "dotenv-expand" "5.1.0"
+    "eslint" "^7.11.0"
+    "eslint-config-react-app" "^6.0.0"
+    "eslint-plugin-flowtype" "^5.2.0"
+    "eslint-plugin-import" "^2.22.1"
+    "eslint-plugin-jest" "^24.1.0"
+    "eslint-plugin-jsx-a11y" "^6.3.1"
+    "eslint-plugin-react" "^7.21.5"
+    "eslint-plugin-react-hooks" "^4.2.0"
+    "eslint-plugin-testing-library" "^3.9.2"
+    "eslint-webpack-plugin" "^2.1.0"
+    "file-loader" "6.1.1"
+    "fs-extra" "^9.0.1"
+    "html-webpack-plugin" "4.5.0"
+    "identity-obj-proxy" "3.0.0"
+    "jest" "26.6.0"
+    "jest-circus" "26.6.0"
+    "jest-resolve" "26.6.0"
+    "jest-watch-typeahead" "0.6.1"
+    "mini-css-extract-plugin" "0.11.3"
+    "optimize-css-assets-webpack-plugin" "5.0.4"
+    "pnp-webpack-plugin" "1.6.4"
+    "postcss-flexbugs-fixes" "4.2.1"
+    "postcss-loader" "3.0.0"
+    "postcss-normalize" "8.0.1"
+    "postcss-preset-env" "6.7.0"
+    "postcss-safe-parser" "5.0.2"
+    "prompts" "2.4.0"
+    "react-app-polyfill" "^2.0.0"
+    "react-dev-utils" "^11.0.1"
+    "react-refresh" "^0.8.3"
+    "resolve" "1.18.1"
+    "resolve-url-loader" "^3.1.2"
+    "sass-loader" "8.0.2"
+    "semver" "7.3.2"
+    "style-loader" "1.3.0"
+    "terser-webpack-plugin" "4.2.3"
+    "ts-pnp" "1.2.0"
+    "url-loader" "4.1.1"
+    "webpack" "4.44.2"
+    "webpack-dev-server" "3.11.0"
+    "webpack-manifest-plugin" "2.2.0"
+    "workbox-webpack-plugin" "5.1.4"
   optionalDependencies:
-    fsevents "^2.1.3"
+    "fsevents" "^2.1.3"
 
-react-select@^3.0.8:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.1.0.tgz#ab098720b2e9fe275047c993f0d0caf5ded17c27"
+"react-select@^3.0.8":
+  "resolved" "https://registry.npmjs.org/react-select/-/react-select-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/cache" "^10.0.9"
     "@emotion/core" "^10.0.9"
     "@emotion/css" "^10.0.9"
-    memoize-one "^5.0.0"
-    prop-types "^15.6.0"
-    react-input-autosize "^2.2.2"
-    react-transition-group "^4.3.0"
+    "memoize-one" "^5.0.0"
+    "prop-types" "^15.6.0"
+    "react-input-autosize" "^2.2.2"
+    "react-transition-group" "^4.3.0"
 
-react-side-effect@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-1.2.0.tgz#0e940c78faba0c73b9b0eba9cd3dda8dfb7e7dae"
+"react-side-effect@^1.1.0":
+  "resolved" "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
-    shallowequal "^1.0.1"
+    "shallowequal" "^1.0.1"
 
-react-sizeme@^2.6.7:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e"
+"react-sizeme@^2.6.7":
+  "resolved" "https://registry.npmjs.org/react-sizeme/-/react-sizeme-2.6.12.tgz"
+  "version" "2.6.12"
   dependencies:
-    element-resize-detector "^1.2.1"
-    invariant "^2.2.4"
-    shallowequal "^1.1.0"
-    throttle-debounce "^2.1.0"
+    "element-resize-detector" "^1.2.1"
+    "invariant" "^2.2.4"
+    "shallowequal" "^1.1.0"
+    "throttle-debounce" "^2.1.0"
 
-react-spring@^8.0.27:
-  version "8.0.27"
-  resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-8.0.27.tgz#97d4dee677f41e0b2adcb696f3839680a3aa356a"
+"react-spring@^8.0.27":
+  "resolved" "https://registry.npmjs.org/react-spring/-/react-spring-8.0.27.tgz"
+  "version" "8.0.27"
   dependencies:
     "@babel/runtime" "^7.3.1"
-    prop-types "^15.5.8"
+    "prop-types" "^15.5.8"
 
-react-syntax-highlighter@^11.0.2:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-11.0.2.tgz#4e3f376e752b20d2f54e4c55652fd663149e4029"
+"react-syntax-highlighter@^11.0.2":
+  "resolved" "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-11.0.2.tgz"
+  "version" "11.0.2"
   dependencies:
     "@babel/runtime" "^7.3.1"
-    highlight.js "~9.13.0"
-    lowlight "~1.11.0"
-    prismjs "^1.8.4"
-    refractor "^2.4.1"
+    "highlight.js" "~9.13.0"
+    "lowlight" "~1.11.0"
+    "prismjs" "^1.8.4"
+    "refractor" "^2.4.1"
 
-react-table@^7.0.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.6.0.tgz#83d765b96505b5332d108a2e0c27ab653f5a78c3"
+"react-table@^7.0.0":
+  "resolved" "https://registry.npmjs.org/react-table/-/react-table-7.6.0.tgz"
+  "version" "7.6.0"
 
-react-tabs@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/react-tabs/-/react-tabs-3.1.1.tgz#b363a239f76046bb2158875a1e5921b11064052f"
+"react-tabs@^3.0.0":
+  "resolved" "https://registry.npmjs.org/react-tabs/-/react-tabs-3.1.1.tgz"
+  "version" "3.1.1"
   dependencies:
-    clsx "^1.1.0"
-    prop-types "^15.5.0"
+    "clsx" "^1.1.0"
+    "prop-types" "^15.5.0"
 
-react-test-renderer@^16.11.0:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz#de25ea358d9012606de51e012d9742e7f0deabc1"
+"react-test-renderer@^16.11.0":
+  "resolved" "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.13.1.tgz"
+  "version" "16.13.1"
   dependencies:
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    react-is "^16.8.6"
-    scheduler "^0.19.1"
+    "object-assign" "^4.1.1"
+    "prop-types" "^15.6.2"
+    "react-is" "^16.8.6"
+    "scheduler" "^0.19.1"
 
-react-textarea-autosize@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz#df91387f8a8f22020b77e3833c09829d706a09a5"
+"react-textarea-autosize@^6.1.0":
+  "resolved" "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz"
+  "version" "6.1.0"
   dependencies:
-    prop-types "^15.6.0"
+    "prop-types" "^15.6.0"
 
-react-textarea-autosize@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-7.1.2.tgz#70fdb333ef86bcca72717e25e623e90c336e2cda"
+"react-textarea-autosize@^7.1.0":
+  "resolved" "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-7.1.2.tgz"
+  "version" "7.1.2"
   dependencies:
     "@babel/runtime" "^7.1.2"
-    prop-types "^15.6.0"
+    "prop-types" "^15.6.0"
 
-react-toastify@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-5.5.0.tgz#f55de44f6b5e3ce3b13b69e5bb4427f2c9404822"
+"react-toastify@^5.5.0":
+  "resolved" "https://registry.npmjs.org/react-toastify/-/react-toastify-5.5.0.tgz"
+  "version" "5.5.0"
   dependencies:
     "@babel/runtime" "^7.4.2"
-    classnames "^2.2.6"
-    prop-types "^15.7.2"
-    react-transition-group "^4"
+    "classnames" "^2.2.6"
+    "prop-types" "^15.7.2"
+    "react-transition-group" "^4"
 
-react-transition-group@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
+"react-transition-group@^2.9.0":
+  "resolved" "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz"
+  "version" "2.9.0"
   dependencies:
-    dom-helpers "^3.4.0"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.4"
+    "dom-helpers" "^3.4.0"
+    "loose-envify" "^1.4.0"
+    "prop-types" "^15.6.2"
+    "react-lifecycles-compat" "^3.0.4"
 
-react-transition-group@^4, react-transition-group@^4.3.0:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
+"react-transition-group@^4", "react-transition-group@^4.3.0":
+  "resolved" "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz"
+  "version" "4.4.1"
   dependencies:
     "@babel/runtime" "^7.5.5"
-    dom-helpers "^5.0.1"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
+    "dom-helpers" "^5.0.1"
+    "loose-envify" "^1.4.0"
+    "prop-types" "^15.6.2"
 
-react-use-gesture@^7.0.4:
-  version "7.0.16"
-  resolved "https://registry.yarnpkg.com/react-use-gesture/-/react-use-gesture-7.0.16.tgz#501985261ef9c815a377b6ff9be6df5a85fbb54f"
+"react-use-gesture@^7.0.4":
+  "resolved" "https://registry.npmjs.org/react-use-gesture/-/react-use-gesture-7.0.16.tgz"
+  "version" "7.0.16"
 
-react-virtualized-auto-sizer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.2.tgz#a61dd4f756458bbf63bd895a92379f9b70f803bd"
+"react-virtualized-auto-sizer@^1.0.2":
+  "resolved" "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.2.tgz"
+  "version" "1.0.2"
 
-react-window@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz#a56b39307e79979721021f5d06a67742ecca52d1"
+"react-virtuoso@^1.9.0":
+  "resolved" "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-1.9.0.tgz"
+  "version" "1.9.0"
+  dependencies:
+    "@virtuoso.dev/react-urx" "^0.2.5"
+    "@virtuoso.dev/urx" "^0.2.5"
+    "react-app-polyfill" "^1.0.6"
+    "resize-observer-polyfill" "^1.5.1"
+
+"react-window@^1.8.2":
+  "resolved" "https://registry.npmjs.org/react-window/-/react-window-1.8.5.tgz"
+  "version" "1.8.5"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    memoize-one ">=3.1.1 <6"
+    "memoize-one" ">=3.1.1 <6"
 
-react-window@^1.8.6:
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz#d011950ac643a994118632665aad0c6382e2a112"
+"react-window@^1.8.6":
+  "resolved" "https://registry.npmjs.org/react-window/-/react-window-1.8.6.tgz"
+  "version" "1.8.6"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    memoize-one ">=3.1.1 <6"
+    "memoize-one" ">=3.1.1 <6"
 
-react-zoom-pan-pinch@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/react-zoom-pan-pinch/-/react-zoom-pan-pinch-1.6.1.tgz#da16267c258ab37e8ebcdc7c252794a9633e91ec"
+"react-zoom-pan-pinch@^1.6.1":
+  "resolved" "https://registry.npmjs.org/react-zoom-pan-pinch/-/react-zoom-pan-pinch-1.6.1.tgz"
+  "version" "1.6.1"
 
-react@^16.12.0, react@^16.8.3, react@^16.8.5:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
+"react@*", "react@^0.13.0 || ^0.14.0 || ^15.0.0 || ^16.0.0", "react@^0.14.0 || ^15.0.0 || ^16.0.0", "react@^0.14.0 || ^15.0.0-0 || ^16.0.0", "react@^0.14.0 || ^15.0.0-0 || ^16.0.0 || ^17.0.0", "react@^0.14.8 || ^15.0.1 || ^16.0.0", "react@^0.14.9 || ^15.3.0 || ^16.0.0", "react@^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0", "react@^15.0.0 || ^16.0.0", "react@^15.0.0 || ^16.0.0 || ^17.0.0", "react@^15.0.2 || ^16.0.0-beta || ^16.0.0", "react@^15.3.0 || ^16.0.0", "react@^15.3.0 || ^16.0.0-alpha", "react@^15.3.0 || 16", "react@^15.3.0 || 16 || 17", "react@^16.0.0", "react@^16.0.0 || ^15.5.4", "react@^16.12.0", "react@^16.13.1", "react@^16.3.0", "react@^16.3.0 || ^17.0.0", "react@^16.4.2", "react@^16.6.0", "react@^16.8.0", "react@^16.8.0 || ^17", "react@^16.8.0 || ^17.0.0", "react@^16.8.3", "react@^16.8.4", "react@^16.8.5", "react@^16.8.6", "react@>= 0.14.0", "react@>= 16.3.0 < 17", "react@>= 16.8", "react@>= 16.8.0", "react@>=0.14.0", "react@>=0.14.0 <17.0.0", "react@>=15", "react@>=15.0.0", "react@>=16", "react@>=16.13", "react@>=16.3.0", "react@>=16.4.1", "react@>=16.6.0", "react@>=16.8.0", "react@>=16.8.3", "react@>=16.9.0", "react@~0.13.x || ~0.14.x || ^15.0.0 || ^16.0.0", "react@0.14.x || ^15.0.0 || ^16.0.0", "react@15.x || 16.x || 16.4.0-alpha.0911da3", "react@15.x || 16.x || 17.x":
+  "resolved" "https://registry.npmjs.org/react/-/react-16.13.1.tgz"
+  "version" "16.13.1"
   dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
+    "loose-envify" "^1.1.0"
+    "object-assign" "^4.1.1"
+    "prop-types" "^15.6.2"
 
-reactcss@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
+"reactcss@^1.2.0":
+  "resolved" "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz"
+  "version" "1.2.3"
   dependencies:
-    lodash "^4.0.1"
+    "lodash" "^4.0.1"
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+"read-pkg-up@^2.0.0":
+  "resolved" "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
+    "find-up" "^2.0.0"
+    "read-pkg" "^2.0.0"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+"read-pkg-up@^4.0.0":
+  "resolved" "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
+    "find-up" "^3.0.0"
+    "read-pkg" "^3.0.0"
 
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+"read-pkg-up@^7.0.1":
+  "resolved" "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"
+  "version" "7.0.1"
   dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
+    "find-up" "^4.1.0"
+    "read-pkg" "^5.2.0"
+    "type-fest" "^0.8.1"
 
-read-pkg-up@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+"read-pkg@^2.0.0":
+  "resolved" "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    find-up "^4.1.0"
-    read-pkg "^5.2.0"
-    type-fest "^0.8.1"
+    "load-json-file" "^2.0.0"
+    "normalize-package-data" "^2.3.2"
+    "path-type" "^2.0.0"
 
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+"read-pkg@^3.0.0":
+  "resolved" "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
+    "load-json-file" "^4.0.0"
+    "normalize-package-data" "^2.3.2"
+    "path-type" "^3.0.0"
 
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
-read-pkg@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+"read-pkg@^5.2.0":
+  "resolved" "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"
+  "version" "5.2.0"
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^2.5.0"
-    parse-json "^5.0.0"
-    type-fest "^0.6.0"
+    "normalize-package-data" "^2.5.0"
+    "parse-json" "^5.0.0"
+    "type-fest" "^0.6.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+"readable-stream@^2.0.0", "readable-stream@^2.0.1", "readable-stream@^2.0.2", "readable-stream@^2.0.6", "readable-stream@^2.1.5", "readable-stream@^2.2.2", "readable-stream@^2.3.3", "readable-stream@^2.3.6", "readable-stream@~2.3.6", "readable-stream@1 || 2":
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"
+  "version" "2.3.7"
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
+    "core-util-is" "~1.0.0"
+    "inherits" "~2.0.3"
+    "isarray" "~1.0.0"
+    "process-nextick-args" "~2.0.0"
+    "safe-buffer" "~5.1.1"
+    "string_decoder" "~1.1.1"
+    "util-deprecate" "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+"readable-stream@^3.0.6":
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
+  "version" "3.6.0"
   dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
+    "inherits" "^2.0.3"
+    "string_decoder" "^1.1.1"
+    "util-deprecate" "^1.0.1"
 
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+"readable-stream@^3.1.1":
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
+  "version" "3.6.0"
   dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
+    "inherits" "^2.0.3"
+    "string_decoder" "^1.1.1"
+    "util-deprecate" "^1.0.1"
 
-readdirp@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
+"readable-stream@^3.6.0":
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
+  "version" "3.6.0"
   dependencies:
-    picomatch "^2.0.4"
+    "inherits" "^2.0.3"
+    "string_decoder" "^1.1.1"
+    "util-deprecate" "^1.0.1"
 
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+"readable-stream@1.1":
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
+  "version" "1.1.13"
   dependencies:
-    picomatch "^2.2.1"
+    "core-util-is" "~1.0.0"
+    "inherits" "~2.0.1"
+    "isarray" "0.0.1"
+    "string_decoder" "~0.10.x"
 
-realpath-native@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
+"readdirp@^2.2.1":
+  "resolved" "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"
+  "version" "2.2.1"
   dependencies:
-    util.promisify "^1.0.0"
+    "graceful-fs" "^4.1.11"
+    "micromatch" "^3.1.10"
+    "readable-stream" "^2.0.2"
 
-recast@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.19.1.tgz#555f3612a5a10c9f44b9a923875c51ff775de6c8"
+"readdirp@~3.2.0":
+  "resolved" "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"
+  "version" "3.2.0"
   dependencies:
-    ast-types "0.13.3"
-    esprima "~4.0.0"
-    private "^0.1.8"
-    source-map "~0.6.1"
+    "picomatch" "^2.0.4"
 
-recast@^0.18.1:
-  version "0.18.10"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
+"readdirp@~3.5.0":
+  "resolved" "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"
+  "version" "3.5.0"
   dependencies:
-    ast-types "0.13.3"
-    esprima "~4.0.0"
-    private "^0.1.8"
-    source-map "~0.6.1"
+    "picomatch" "^2.2.1"
 
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+"realpath-native@^1.1.0":
+  "resolved" "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    resolve "^1.1.6"
+    "util.promisify" "^1.0.0"
 
-recompose@^0.26.0:
-  version "0.26.0"
-  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.26.0.tgz#9babff039cb72ba5bd17366d55d7232fbdfb2d30"
+"recast@^0.18.1":
+  "resolved" "https://registry.npmjs.org/recast/-/recast-0.18.10.tgz"
+  "version" "0.18.10"
   dependencies:
-    change-emitter "^0.1.2"
-    fbjs "^0.8.1"
-    hoist-non-react-statics "^2.3.1"
-    symbol-observable "^1.0.4"
+    "ast-types" "0.13.3"
+    "esprima" "~4.0.0"
+    "private" "^0.1.8"
+    "source-map" "~0.6.1"
 
-recursive-readdir@2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
+"recast@0.19.1":
+  "resolved" "https://registry.npmjs.org/recast/-/recast-0.19.1.tgz"
+  "version" "0.19.1"
   dependencies:
-    minimatch "3.0.4"
+    "ast-types" "0.13.3"
+    "esprima" "~4.0.0"
+    "private" "^0.1.8"
+    "source-map" "~0.6.1"
 
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+"rechoir@^0.6.2":
+  "resolved" "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"
+  "version" "0.6.2"
   dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
+    "resolve" "^1.1.6"
 
-redent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+"recompose@^0.26.0":
+  "resolved" "https://registry.npmjs.org/recompose/-/recompose-0.26.0.tgz"
+  "version" "0.26.0"
   dependencies:
-    indent-string "^4.0.0"
-    strip-indent "^3.0.0"
+    "change-emitter" "^0.1.2"
+    "fbjs" "^0.8.1"
+    "hoist-non-react-statics" "^2.3.1"
+    "symbol-observable" "^1.0.4"
 
-redux-devtools-extension@^2.13.8:
-  version "2.13.8"
-  resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.8.tgz#37b982688626e5e4993ff87220c9bbb7cd2d96e1"
-
-redux-devtools-instrument@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/redux-devtools-instrument/-/redux-devtools-instrument-1.10.0.tgz#036caf79fa1e5f25ec4bae38a9af4f08c69e323a"
+"recursive-readdir@2.2.2":
+  "resolved" "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"
+  "version" "2.2.2"
   dependencies:
-    lodash "^4.17.19"
-    symbol-observable "^1.2.0"
+    "minimatch" "3.0.4"
 
-redux-devtools@^3.5.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/redux-devtools/-/redux-devtools-3.7.0.tgz#5bc2d50227d94ce95c79dbfdf2ffc7a23c553553"
+"redent@^3.0.0":
+  "resolved" "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"
+  "version" "3.0.0"
+  dependencies:
+    "indent-string" "^4.0.0"
+    "strip-indent" "^3.0.0"
+
+"redux-devtools-extension@^2.13.8":
+  "resolved" "https://registry.npmjs.org/redux-devtools-extension/-/redux-devtools-extension-2.13.8.tgz"
+  "version" "2.13.8"
+
+"redux-devtools-instrument@^1.10.0":
+  "resolved" "https://registry.npmjs.org/redux-devtools-instrument/-/redux-devtools-instrument-1.10.0.tgz"
+  "version" "1.10.0"
+  dependencies:
+    "lodash" "^4.17.19"
+    "symbol-observable" "^1.2.0"
+
+"redux-devtools@^3.5.0":
+  "resolved" "https://registry.npmjs.org/redux-devtools/-/redux-devtools-3.7.0.tgz"
+  "version" "3.7.0"
   dependencies:
     "@types/prop-types" "^15.7.3"
-    lodash "^4.17.19"
-    prop-types "^15.7.2"
-    redux-devtools-instrument "^1.10.0"
+    "lodash" "^4.17.19"
+    "prop-types" "^15.7.2"
+    "redux-devtools-instrument" "^1.10.0"
 
-redux-form@^8.2.6:
-  version "8.3.6"
-  resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-8.3.6.tgz#c098dcd0b9d8c38e2e443dab91033ea0e74d4609"
+"redux-form@^8.2.6":
+  "resolved" "https://registry.npmjs.org/redux-form/-/redux-form-8.3.6.tgz"
+  "version" "8.3.6"
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@scarf/scarf" "^1.0.5"
-    es6-error "^4.1.1"
-    hoist-non-react-statics "^3.3.2"
-    invariant "^2.2.4"
-    is-promise "^2.1.0"
-    lodash "^4.17.15"
-    prop-types "^15.6.1"
-    react-is "^16.4.2"
+    "es6-error" "^4.1.1"
+    "hoist-non-react-statics" "^3.3.2"
+    "invariant" "^2.2.4"
+    "is-promise" "^2.1.0"
+    "lodash" "^4.17.15"
+    "prop-types" "^15.6.1"
+    "react-is" "^16.4.2"
 
-redux-mock-store@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/redux-mock-store/-/redux-mock-store-1.5.4.tgz#90d02495fd918ddbaa96b83aef626287c9ab5872"
+"redux-mock-store@^1.5.4":
+  "resolved" "https://registry.npmjs.org/redux-mock-store/-/redux-mock-store-1.5.4.tgz"
+  "version" "1.5.4"
   dependencies:
-    lodash.isplainobject "^4.0.6"
+    "lodash.isplainobject" "^4.0.6"
 
-redux-saga@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.1.3.tgz#9f3e6aebd3c994bbc0f6901a625f9a42b51d1112"
+"redux-saga@^1.1.3":
+  "resolved" "https://registry.npmjs.org/redux-saga/-/redux-saga-1.1.3.tgz"
+  "version" "1.1.3"
   dependencies:
     "@redux-saga/core" "^1.1.3"
 
-"redux@^3.6.0 || ^4.0.0", redux@^4.0.0, redux@^4.0.1, redux@^4.0.4, redux@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f"
+"redux@*", "redux@^2.0.0 || ^3.0.0 || ^4.0.0-0", "redux@^3.1.0 || ^4.0.0", "redux@^3.4.0 || ^4.0.0", "redux@^3.5.2 || ^4.0.0", "redux@^3.6.0 || ^4.0.0", "redux@^3.7.2 || ^4.0.0", "redux@^4.0.0", "redux@^4.0.1", "redux@^4.0.4", "redux@^4.0.5":
+  "resolved" "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz"
+  "version" "4.0.5"
   dependencies:
-    loose-envify "^1.4.0"
-    symbol-observable "^1.2.0"
+    "loose-envify" "^1.4.0"
+    "symbol-observable" "^1.2.0"
 
-refractor@^2.4.1:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/refractor/-/refractor-2.10.1.tgz#166c32f114ed16fd96190ad21d5193d3afc7d34e"
+"refractor@^2.4.1":
+  "resolved" "https://registry.npmjs.org/refractor/-/refractor-2.10.1.tgz"
+  "version" "2.10.1"
   dependencies:
-    hastscript "^5.0.0"
-    parse-entities "^1.1.2"
-    prismjs "~1.17.0"
+    "hastscript" "^5.0.0"
+    "parse-entities" "^1.1.2"
+    "prismjs" "~1.17.0"
 
-regenerate-unicode-properties@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+"regenerate-unicode-properties@^8.2.0":
+  "resolved" "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"
+  "version" "8.2.0"
   dependencies:
-    regenerate "^1.4.0"
+    "regenerate" "^1.4.0"
 
-regenerate@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
+"regenerate@^1.4.0":
+  "resolved" "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz"
+  "version" "1.4.1"
 
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+"regenerator-runtime@*", "regenerator-runtime@^0.13.2", "regenerator-runtime@^0.13.3", "regenerator-runtime@^0.13.4", "regenerator-runtime@^0.13.7":
+  "resolved" "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"
+  "version" "0.13.7"
 
-regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+"regenerator-runtime@^0.11.0":
+  "resolved" "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
+  "version" "0.11.1"
 
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+"regenerator-transform@^0.14.2":
+  "resolved" "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"
+  "version" "0.14.5"
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+"regex-not@^1.0.0", "regex-not@^1.0.2":
+  "resolved" "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
+    "extend-shallow" "^3.0.2"
+    "safe-regex" "^1.1.0"
 
-regex-parser@^2.2.11:
-  version "2.2.11"
-  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
+"regex-parser@^2.2.11":
+  "resolved" "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz"
+  "version" "2.2.11"
 
-regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
+"regexp.prototype.flags@^1.2.0", "regexp.prototype.flags@^1.3.0":
+  "resolved" "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"
+  "version" "1.3.0"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
 
-regexpp@^3.0.0, regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+"regexpp@^3.0.0", "regexpp@^3.1.0":
+  "resolved" "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"
+  "version" "3.1.0"
 
-regexpu-core@^4.7.0, regexpu-core@^4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+"regexpu-core@^4.7.0", "regexpu-core@^4.7.1":
+  "resolved" "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"
+  "version" "4.7.1"
   dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
+    "regenerate" "^1.4.0"
+    "regenerate-unicode-properties" "^8.2.0"
+    "regjsgen" "^0.5.1"
+    "regjsparser" "^0.6.4"
+    "unicode-match-property-ecmascript" "^1.0.4"
+    "unicode-match-property-value-ecmascript" "^1.2.0"
 
-regjsgen@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+"regjsgen@^0.5.1":
+  "resolved" "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"
+  "version" "0.5.2"
 
-regjsparser@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+"regjsparser@^0.6.4":
+  "resolved" "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz"
+  "version" "0.6.4"
   dependencies:
-    jsesc "~0.5.0"
+    "jsesc" "~0.5.0"
 
-relateurl@^0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+"relateurl@^0.2.7":
+  "resolved" "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"
+  "version" "0.2.7"
 
-remark-external-links@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/remark-external-links/-/remark-external-links-5.0.0.tgz#e7fc0e0cc4c92d33fb195b08ed1dc691fdb1689a"
+"remark-external-links@^5.0.0":
+  "resolved" "https://registry.npmjs.org/remark-external-links/-/remark-external-links-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    extend "^3.0.0"
-    is-absolute-url "^3.0.0"
-    mdast-util-definitions "^1.2.3"
-    space-separated-tokens "^1.1.2"
-    unist-util-visit "^1.4.0"
+    "extend" "^3.0.0"
+    "is-absolute-url" "^3.0.0"
+    "mdast-util-definitions" "^1.2.3"
+    "space-separated-tokens" "^1.1.2"
+    "unist-util-visit" "^1.4.0"
 
-remark-footnotes@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f"
+"remark-footnotes@2.0.0":
+  "resolved" "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz"
+  "version" "2.0.0"
 
-remark-mdx@1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.18.tgz#d8c76017c95824cc7fb853bb2759add8ba0cf319"
+"remark-mdx@1.6.18":
+  "resolved" "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.18.tgz"
+  "version" "1.6.18"
   dependencies:
     "@babel/core" "7.11.6"
     "@babel/helper-plugin-utils" "7.10.4"
     "@babel/plugin-proposal-object-rest-spread" "7.11.0"
     "@babel/plugin-syntax-jsx" "7.10.4"
     "@mdx-js/util" "1.6.18"
-    is-alphabetical "1.0.4"
-    remark-parse "8.0.3"
-    unified "9.2.0"
+    "is-alphabetical" "1.0.4"
+    "remark-parse" "8.0.3"
+    "unified" "9.2.0"
 
-remark-parse@8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1"
+"remark-parse@8.0.3":
+  "resolved" "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz"
+  "version" "8.0.3"
   dependencies:
-    ccount "^1.0.0"
-    collapse-white-space "^1.0.2"
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-whitespace-character "^1.0.0"
-    is-word-character "^1.0.0"
-    markdown-escapes "^1.0.0"
-    parse-entities "^2.0.0"
-    repeat-string "^1.5.4"
-    state-toggle "^1.0.0"
-    trim "0.0.1"
-    trim-trailing-lines "^1.0.0"
-    unherit "^1.0.4"
-    unist-util-remove-position "^2.0.0"
-    vfile-location "^3.0.0"
-    xtend "^4.0.1"
+    "ccount" "^1.0.0"
+    "collapse-white-space" "^1.0.2"
+    "is-alphabetical" "^1.0.0"
+    "is-decimal" "^1.0.0"
+    "is-whitespace-character" "^1.0.0"
+    "is-word-character" "^1.0.0"
+    "markdown-escapes" "^1.0.0"
+    "parse-entities" "^2.0.0"
+    "repeat-string" "^1.5.4"
+    "state-toggle" "^1.0.0"
+    "trim" "0.0.1"
+    "trim-trailing-lines" "^1.0.0"
+    "unherit" "^1.0.4"
+    "unist-util-remove-position" "^2.0.0"
+    "vfile-location" "^3.0.0"
+    "xtend" "^4.0.1"
 
-remark-slug@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz#715ecdef8df1226786204b1887d31ab16aa24609"
+"remark-slug@^5.1.2":
+  "resolved" "https://registry.npmjs.org/remark-slug/-/remark-slug-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
-    github-slugger "^1.0.0"
-    mdast-util-to-string "^1.0.0"
-    unist-util-visit "^1.0.0"
+    "github-slugger" "^1.0.0"
+    "mdast-util-to-string" "^1.0.0"
+    "unist-util-visit" "^1.0.0"
 
-remark-squeeze-paragraphs@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead"
+"remark-squeeze-paragraphs@4.0.0":
+  "resolved" "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    mdast-squeeze-paragraphs "^4.0.0"
+    "mdast-squeeze-paragraphs" "^4.0.0"
 
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+"remove-trailing-separator@^1.0.1":
+  "resolved" "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
+  "version" "1.1.0"
 
-renderkid@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz#380179c2ff5ae1365c522bf2fcfcff01c5b74149"
+"renderkid@^2.0.1":
+  "resolved" "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz"
+  "version" "2.0.3"
   dependencies:
-    css-select "^1.1.0"
-    dom-converter "^0.2"
-    htmlparser2 "^3.3.0"
-    strip-ansi "^3.0.0"
-    utila "^0.4.0"
+    "css-select" "^1.1.0"
+    "dom-converter" "^0.2"
+    "htmlparser2" "^3.3.0"
+    "strip-ansi" "^3.0.0"
+    "utila" "^0.4.0"
 
-repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+"repeat-element@^1.1.2":
+  "resolved" "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"
+  "version" "1.1.3"
 
-repeat-string@^1.5.4, repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+"repeat-string@^1.5.4", "repeat-string@^1.6.1":
+  "resolved" "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
+  "version" "1.6.1"
 
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+"replace-ext@1.0.0":
+  "resolved" "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz"
+  "version" "1.0.0"
+
+"request-progress@^3.0.0":
+  "resolved" "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    is-finite "^1.0.0"
+    "throttleit" "^1.0.0"
 
-replace-ext@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-
-request-progress@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
+"request-promise-core@1.1.4":
+  "resolved" "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"
+  "version" "1.1.4"
   dependencies:
-    throttleit "^1.0.0"
+    "lodash" "^4.17.19"
 
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
+"request-promise-native@^1.0.8":
+  "resolved" "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz"
+  "version" "1.0.9"
   dependencies:
-    lodash "^4.17.19"
+    "request-promise-core" "1.1.4"
+    "stealthy-require" "^1.1.1"
+    "tough-cookie" "^2.3.3"
 
-request-promise-native@^1.0.8:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+"request@^2.34", "request@^2.88.0", "request@^2.88.2":
+  "resolved" "https://registry.npmjs.org/request/-/request-2.88.2.tgz"
+  "version" "2.88.2"
   dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
+    "aws-sign2" "~0.7.0"
+    "aws4" "^1.8.0"
+    "caseless" "~0.12.0"
+    "combined-stream" "~1.0.6"
+    "extend" "~3.0.2"
+    "forever-agent" "~0.6.1"
+    "form-data" "~2.3.2"
+    "har-validator" "~5.1.3"
+    "http-signature" "~1.2.0"
+    "is-typedarray" "~1.0.0"
+    "isstream" "~0.1.2"
+    "json-stringify-safe" "~5.0.1"
+    "mime-types" "~2.1.19"
+    "oauth-sign" "~0.9.0"
+    "performance-now" "^2.1.0"
+    "qs" "~6.5.2"
+    "safe-buffer" "^5.1.2"
+    "tough-cookie" "~2.5.0"
+    "tunnel-agent" "^0.6.0"
+    "uuid" "^3.3.2"
 
-request@^2.87.0, request@^2.88.0, request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+"require-directory@^2.1.1":
+  "resolved" "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
+  "version" "2.1.1"
+
+"require-main-filename@^2.0.0":
+  "resolved" "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"
+  "version" "2.0.0"
+
+"requires-port@^1.0.0":
+  "resolved" "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
+  "version" "1.0.0"
+
+"reselect@^4.0.0", "reselect@>1.0.0":
+  "resolved" "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz"
+  "version" "4.0.0"
+
+"resize-observer-polyfill@^1.5.0", "resize-observer-polyfill@^1.5.1":
+  "resolved" "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"
+  "version" "1.5.1"
+
+"resolve-cwd@^2.0.0":
+  "resolved" "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
+    "resolve-from" "^3.0.0"
 
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-
-reselect@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
-
-resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
-
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+"resolve-cwd@^3.0.0":
+  "resolved" "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    resolve-from "^3.0.0"
+    "resolve-from" "^5.0.0"
 
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+"resolve-from@^3.0.0":
+  "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"
+  "version" "3.0.0"
+
+"resolve-from@^4.0.0":
+  "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
+  "version" "4.0.0"
+
+"resolve-from@^5.0.0":
+  "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
+  "version" "5.0.0"
+
+"resolve-from@2.0.0":
+  "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"
+  "version" "2.0.0"
+
+"resolve-pathname@^3.0.0":
+  "resolved" "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz"
+  "version" "3.0.0"
+
+"resolve-url-loader@^3.1.2":
+  "resolved" "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz"
+  "version" "3.1.2"
   dependencies:
-    resolve-from "^5.0.0"
+    "adjust-sourcemap-loader" "3.0.0"
+    "camelcase" "5.3.1"
+    "compose-function" "3.0.3"
+    "convert-source-map" "1.7.0"
+    "es6-iterator" "2.0.3"
+    "loader-utils" "1.2.3"
+    "postcss" "7.0.21"
+    "rework" "1.0.1"
+    "rework-visit" "1.0.0"
+    "source-map" "0.6.1"
 
-resolve-from@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+"resolve-url@^0.2.1":
+  "resolved" "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"
+  "version" "0.2.1"
 
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-
-resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-
-resolve-pathname@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
-
-resolve-url-loader@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz#235e2c28e22e3e432ba7a5d4e305c59a58edfc08"
+"resolve@^1.1.6", "resolve@^1.10.0", "resolve@^1.11.0", "resolve@^1.12.0", "resolve@^1.13.1", "resolve@^1.14.2", "resolve@^1.15.1", "resolve@^1.17.0", "resolve@^1.3.2", "resolve@^1.8.1":
+  "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"
+  "version" "1.17.0"
   dependencies:
-    adjust-sourcemap-loader "3.0.0"
-    camelcase "5.3.1"
-    compose-function "3.0.3"
-    convert-source-map "1.7.0"
-    es6-iterator "2.0.3"
-    loader-utils "1.2.3"
-    postcss "7.0.21"
-    rework "1.0.1"
-    rework-visit "1.0.0"
-    source-map "0.6.1"
+    "path-parse" "^1.0.6"
 
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-
-resolve@1.18.1, resolve@^1.18.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
+"resolve@^1.18.1", "resolve@1.18.1":
+  "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz"
+  "version" "1.18.1"
   dependencies:
-    is-core-module "^2.0.0"
-    path-parse "^1.0.6"
+    "is-core-module" "^2.0.0"
+    "path-parse" "^1.0.6"
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+"resolve@^1.20.0":
+  "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"
+  "version" "1.20.0"
   dependencies:
-    path-parse "^1.0.6"
+    "is-core-module" "^2.2.0"
+    "path-parse" "^1.0.6"
 
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+"restore-cursor@^1.0.1":
+  "resolved" "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
+    "exit-hook" "^1.0.0"
+    "onetime" "^1.0.0"
 
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+"restore-cursor@^2.0.0":
+  "resolved" "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
+    "onetime" "^2.0.0"
+    "signal-exit" "^3.0.2"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+"restore-cursor@^3.1.0":
+  "resolved" "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
+    "onetime" "^5.1.0"
+    "signal-exit" "^3.0.2"
 
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+"ret@~0.1.10":
+  "resolved" "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"
+  "version" "0.1.15"
 
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+"retry@^0.12.0":
+  "resolved" "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"
+  "version" "0.12.0"
 
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+"reusify@^1.0.4":
+  "resolved" "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
+  "version" "1.0.4"
 
-rework-visit@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rework-visit/-/rework-visit-1.0.0.tgz#9945b2803f219e2f7aca00adb8bc9f640f842c9a"
+"rework-visit@1.0.0":
+  "resolved" "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz"
+  "version" "1.0.0"
 
-rework@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/rework/-/rework-1.0.1.tgz#30806a841342b54510aa4110850cd48534144aa7"
+"rework@1.0.1":
+  "resolved" "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    convert-source-map "^0.3.3"
-    css "^2.0.0"
+    "convert-source-map" "^0.3.3"
+    "css" "^2.0.0"
 
-rgb-regex@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
+"rgb-regex@^1.0.1":
+  "resolved" "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz"
+  "version" "1.0.1"
 
-rgba-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
+"rgba-regex@^1.0.0":
+  "resolved" "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz"
+  "version" "1.0.0"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+"rimraf@^2.2.8", "rimraf@^2.5.4", "rimraf@^2.6.3", "rimraf@^2.7.1":
+  "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"
+  "version" "2.7.1"
   dependencies:
-    glob "^7.1.3"
+    "glob" "^7.1.3"
 
-rimraf@2.6.3, rimraf@~2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+"rimraf@^3.0.0":
+  "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    glob "^7.1.3"
+    "glob" "^7.1.3"
 
-rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+"rimraf@^3.0.2":
+  "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    glob "^7.1.3"
+    "glob" "^7.1.3"
 
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+"rimraf@~2.6.2":
+  "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"
+  "version" "2.6.3"
   dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
+    "glob" "^7.1.3"
 
-rollup-plugin-babel@^4.3.3:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz#d15bd259466a9d1accbdb2fe2fff17c52d030acb"
+"rimraf@2.6.3":
+  "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"
+  "version" "2.6.3"
+  dependencies:
+    "glob" "^7.1.3"
+
+"ripemd160@^2.0.0", "ripemd160@^2.0.1":
+  "resolved" "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"
+  "version" "2.0.2"
+  dependencies:
+    "hash-base" "^3.0.0"
+    "inherits" "^2.0.1"
+
+"rollup-plugin-babel@^4.3.3":
+  "resolved" "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz"
+  "version" "4.4.0"
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
-    rollup-pluginutils "^2.8.1"
+    "rollup-pluginutils" "^2.8.1"
 
-rollup-plugin-terser@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.3.1.tgz#8c650062c22a8426c64268548957463bf981b413"
+"rollup-plugin-terser@^5.3.1":
+  "resolved" "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-5.3.1.tgz"
+  "version" "5.3.1"
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    jest-worker "^24.9.0"
-    rollup-pluginutils "^2.8.2"
-    serialize-javascript "^4.0.0"
-    terser "^4.6.2"
+    "jest-worker" "^24.9.0"
+    "rollup-pluginutils" "^2.8.2"
+    "serialize-javascript" "^4.0.0"
+    "terser" "^4.6.2"
 
-rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
+"rollup-pluginutils@^2.8.1", "rollup-pluginutils@^2.8.2":
+  "resolved" "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz"
+  "version" "2.8.2"
   dependencies:
-    estree-walker "^0.6.1"
+    "estree-walker" "^0.6.1"
 
-rollup@^1.31.1:
-  version "1.32.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4"
+"rollup@^1.20.0 || ^2.0.0", "rollup@^1.20.0||^2.0.0", "rollup@^1.31.1", "rollup@>=0.60.0 <3", "rollup@>=0.66.0 <3":
+  "resolved" "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz"
+  "version" "1.32.1"
   dependencies:
     "@types/estree" "*"
     "@types/node" "*"
-    acorn "^7.1.0"
+    "acorn" "^7.1.0"
 
-rsvp@^4.8.4:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+"rsvp@^4.8.4":
+  "resolved" "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz"
+  "version" "4.8.5"
 
-run-async@^2.2.0, run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+"run-async@^2.2.0", "run-async@^2.4.0":
+  "resolved" "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"
+  "version" "2.4.1"
 
-run-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
+"run-node@^1.0.0":
+  "resolved" "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz"
+  "version" "1.0.0"
 
-run-parallel@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+"run-parallel@^1.1.9":
+  "resolved" "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"
+  "version" "1.1.9"
 
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+"run-queue@^1.0.0", "run-queue@^1.0.3":
+  "resolved" "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"
+  "version" "1.0.3"
   dependencies:
-    aproba "^1.1.1"
+    "aproba" "^1.1.1"
 
-rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.6.0:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+"rxjs@^6.3.3", "rxjs@^6.4.0", "rxjs@^6.6.0":
+  "resolved" "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz"
+  "version" "6.6.3"
   dependencies:
-    tslib "^1.9.0"
+    "tslib" "^1.9.0"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+"safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@^5.1.1", "safe-buffer@^5.1.2", "safe-buffer@^5.2.0", "safe-buffer@>=5.1.0", "safe-buffer@~5.2.0":
+  "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  "version" "5.2.1"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+"safe-buffer@~5.1.0", "safe-buffer@~5.1.1":
+  "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  "version" "5.1.2"
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+"safe-buffer@5.1.1":
+  "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
+  "version" "5.1.1"
 
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+"safe-buffer@5.1.2":
+  "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  "version" "5.1.2"
+
+"safe-regex@^1.1.0":
+  "resolved" "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    ret "~0.1.10"
+    "ret" "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+"safer-buffer@^2.0.2", "safer-buffer@^2.1.0", "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", "safer-buffer@~2.1.0":
+  "resolved" "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
+  "version" "2.1.2"
 
-sane@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+"sane@^4.0.3":
+  "resolved" "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
     "@cnakazawa/watch" "^1.0.3"
-    anymatch "^2.0.0"
-    capture-exit "^2.0.0"
-    exec-sh "^0.3.2"
-    execa "^1.0.0"
-    fb-watchman "^2.0.0"
-    micromatch "^3.1.4"
-    minimist "^1.1.1"
-    walker "~1.0.5"
+    "anymatch" "^2.0.0"
+    "capture-exit" "^2.0.0"
+    "exec-sh" "^0.3.2"
+    "execa" "^1.0.0"
+    "fb-watchman" "^2.0.0"
+    "micromatch" "^3.1.4"
+    "minimist" "^1.1.1"
+    "walker" "~1.0.5"
 
-sanitize.css@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-10.0.0.tgz#b5cb2547e96d8629a60947544665243b1dc3657a"
+"sanitize.css@^10.0.0":
+  "resolved" "https://registry.npmjs.org/sanitize.css/-/sanitize.css-10.0.0.tgz"
+  "version" "10.0.0"
 
-sass-graph@2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
+"sass-graph@2.2.5":
+  "resolved" "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz"
+  "version" "2.2.5"
   dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^13.3.2"
+    "glob" "^7.0.0"
+    "lodash" "^4.0.0"
+    "scss-tokenizer" "^0.2.3"
+    "yargs" "^13.3.2"
 
-sass-loader@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d"
+"sass-loader@8.0.2":
+  "resolved" "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz"
+  "version" "8.0.2"
   dependencies:
-    clone-deep "^4.0.1"
-    loader-utils "^1.2.3"
-    neo-async "^2.6.1"
-    schema-utils "^2.6.1"
-    semver "^6.3.0"
+    "clone-deep" "^4.0.1"
+    "loader-utils" "^1.2.3"
+    "neo-async" "^2.6.1"
+    "schema-utils" "^2.6.1"
+    "semver" "^6.3.0"
 
-sax@~1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+"sax@~1.2.4":
+  "resolved" "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"
+  "version" "1.2.4"
 
-saxes@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
+"saxes@^5.0.0":
+  "resolved" "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz"
+  "version" "5.0.1"
   dependencies:
-    xmlchars "^2.2.0"
+    "xmlchars" "^2.2.0"
 
-scheduler@^0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
+"scheduler@^0.19.1":
+  "resolved" "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz"
+  "version" "0.19.1"
   dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
+    "loose-envify" "^1.1.0"
+    "object-assign" "^4.1.1"
 
-schema-utils@^0.4.0:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+"schema-utils@^0.4.0":
+  "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz"
+  "version" "0.4.7"
   dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
+    "ajv" "^6.1.0"
+    "ajv-keywords" "^3.1.0"
 
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+"schema-utils@^1.0.0":
+  "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
+    "ajv" "^6.1.0"
+    "ajv-errors" "^1.0.0"
+    "ajv-keywords" "^3.1.0"
 
-schema-utils@^2.0.1, schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0, schema-utils@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+"schema-utils@^2.0.1", "schema-utils@^2.5.0", "schema-utils@^2.6.1", "schema-utils@^2.6.5", "schema-utils@^2.6.6", "schema-utils@^2.7.0", "schema-utils@^2.7.1":
+  "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"
+  "version" "2.7.1"
   dependencies:
     "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
-    ajv-keywords "^3.5.2"
+    "ajv" "^6.12.4"
+    "ajv-keywords" "^3.5.2"
 
-schema-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
+"schema-utils@^3.0.0":
+  "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
     "@types/json-schema" "^7.0.6"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
+    "ajv" "^6.12.5"
+    "ajv-keywords" "^3.5.2"
 
-scriptjs@^2.5.8:
-  version "2.5.9"
-  resolved "https://registry.yarnpkg.com/scriptjs/-/scriptjs-2.5.9.tgz#343915cd2ec2ed9bfdde2b9875cd28f59394b35f"
+"scriptjs@^2.5.8":
+  "resolved" "https://registry.npmjs.org/scriptjs/-/scriptjs-2.5.9.tgz"
+  "version" "2.5.9"
 
-scroll-into-view-if-needed@^2.2.26:
-  version "2.2.26"
-  resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.26.tgz#e4917da0c820135ff65ad6f7e4b7d7af568c4f13"
+"scroll-into-view-if-needed@^2.2.26":
+  "resolved" "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.26.tgz"
+  "version" "2.2.26"
   dependencies:
-    compute-scroll-into-view "^1.0.16"
+    "compute-scroll-into-view" "^1.0.16"
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+"scss-tokenizer@^0.2.3":
+  "resolved" "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz"
+  "version" "0.2.3"
   dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
+    "js-base64" "^2.1.8"
+    "source-map" "^0.4.2"
 
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+"select-hose@^2.0.0":
+  "resolved" "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"
+  "version" "2.0.0"
 
-select@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+"select@^1.1.2":
+  "resolved" "https://registry.npmjs.org/select/-/select-1.1.2.tgz"
+  "version" "1.1.2"
 
-selfsigned@^1.10.7:
-  version "1.10.8"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30"
+"selfsigned@^1.10.7":
+  "resolved" "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz"
+  "version" "1.10.8"
   dependencies:
-    node-forge "^0.10.0"
+    "node-forge" "^0.10.0"
 
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+"semver-compare@^1.0.0":
+  "resolved" "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"
+  "version" "1.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+"semver@^5.4.1", "semver@^5.5.0", "semver@^5.5.1", "semver@^5.6.0", "semver@^5.7.0", "semver@2 || 3 || 4 || 5":
+  "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
+  "version" "5.7.1"
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+"semver@^6.0.0", "semver@^6.3.0":
+  "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
+  "version" "6.3.0"
 
-semver@7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+"semver@^6.3.0":
+  "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
+  "version" "6.3.0"
 
-semver@7.x:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+"semver@^7.2.1":
+  "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"
+  "version" "7.3.4"
   dependencies:
-    lru-cache "^6.0.0"
+    "lru-cache" "^6.0.0"
 
-semver@^6.0.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-
-semver@^7.2.1, semver@^7.3.2:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+"semver@^7.3.2":
+  "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"
+  "version" "7.3.4"
   dependencies:
-    lru-cache "^6.0.0"
+    "lru-cache" "^6.0.0"
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
-send@0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+"semver@^7.3.4":
+  "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"
+  "version" "7.3.5"
   dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.7.2"
-    mime "1.6.0"
-    ms "2.1.1"
-    on-finished "~2.3.0"
-    range-parser "~1.2.1"
-    statuses "~1.5.0"
+    "lru-cache" "^6.0.0"
 
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+"semver@7.0.0":
+  "resolved" "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
+  "version" "7.0.0"
+
+"semver@7.3.2":
+  "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"
+  "version" "7.3.2"
+
+"semver@7.x":
+  "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"
+  "version" "7.3.5"
   dependencies:
-    randombytes "^2.1.0"
+    "lru-cache" "^6.0.0"
 
-serialize-javascript@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
+"send@0.17.1":
+  "resolved" "https://registry.npmjs.org/send/-/send-0.17.1.tgz"
+  "version" "0.17.1"
   dependencies:
-    randombytes "^2.1.0"
+    "debug" "2.6.9"
+    "depd" "~1.1.2"
+    "destroy" "~1.0.4"
+    "encodeurl" "~1.0.2"
+    "escape-html" "~1.0.3"
+    "etag" "~1.8.1"
+    "fresh" "0.5.2"
+    "http-errors" "~1.7.2"
+    "mime" "1.6.0"
+    "ms" "2.1.1"
+    "on-finished" "~2.3.0"
+    "range-parser" "~1.2.1"
+    "statuses" "~1.5.0"
 
-serve-favicon@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.5.0.tgz#935d240cdfe0f5805307fdfe967d88942a2cbcf0"
+"serialize-javascript@^4.0.0":
+  "resolved" "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    etag "~1.8.1"
-    fresh "0.5.2"
-    ms "2.1.1"
-    parseurl "~1.3.2"
-    safe-buffer "5.1.1"
+    "randombytes" "^2.1.0"
 
-serve-index@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+"serialize-javascript@^5.0.1":
+  "resolved" "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"
+  "version" "5.0.1"
   dependencies:
-    accepts "~1.3.4"
-    batch "0.6.1"
-    debug "2.6.9"
-    escape-html "~1.0.3"
-    http-errors "~1.6.2"
-    mime-types "~2.1.17"
-    parseurl "~1.3.2"
+    "randombytes" "^2.1.0"
 
-serve-static@1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+"serve-favicon@^2.5.0":
+  "resolved" "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz"
+  "version" "2.5.0"
   dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.17.1"
+    "etag" "~1.8.1"
+    "fresh" "0.5.2"
+    "ms" "2.1.1"
+    "parseurl" "~1.3.2"
+    "safe-buffer" "5.1.1"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
-set-cookie-parser@^2.4.6:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz#d0da0ed388bc8f24e706a391f9c9e252a13c58b2"
-  integrity sha512-edRH8mBKEWNVIVMKejNnuJxleqYE/ZSdcT8/Nem9/mmosx12pctd80s2Oy00KNZzrogMZS5mauK2/ymL1bvlvg==
-
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+"serve-index@^1.9.1":
+  "resolved" "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"
+  "version" "1.9.1"
   dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
+    "accepts" "~1.3.4"
+    "batch" "0.6.1"
+    "debug" "2.6.9"
+    "escape-html" "~1.0.3"
+    "http-errors" "~1.6.2"
+    "mime-types" "~2.1.17"
+    "parseurl" "~1.3.2"
 
-setimmediate@^1.0.4, setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+"serve-static@1.14.1":
+  "resolved" "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"
+  "version" "1.14.1"
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    "encodeurl" "~1.0.2"
+    "escape-html" "~1.0.3"
+    "parseurl" "~1.3.3"
+    "send" "0.17.1"
 
-shallow-clone@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
+"set-blocking@^2.0.0", "set-blocking@~2.0.0":
+  "resolved" "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
+  "version" "2.0.0"
+
+"set-cookie-parser@^2.4.6":
+  "resolved" "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz"
+  "version" "2.4.8"
+
+"set-immediate-shim@~1.0.1":
+  "resolved" "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"
+  "version" "1.0.1"
+
+"set-value@^2.0.0", "set-value@^2.0.1":
+  "resolved" "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    is-extendable "^0.1.1"
-    kind-of "^2.0.1"
-    lazy-cache "^0.2.3"
-    mixin-object "^2.0.1"
+    "extend-shallow" "^2.0.1"
+    "is-extendable" "^0.1.1"
+    "is-plain-object" "^2.0.3"
+    "split-string" "^3.0.1"
 
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+"setimmediate@^1.0.4", "setimmediate@^1.0.5":
+  "resolved" "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"
+  "version" "1.0.5"
+
+"setprototypeof@1.1.0":
+  "resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"
+  "version" "1.1.0"
+
+"setprototypeof@1.1.1":
+  "resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"
+  "version" "1.1.1"
+
+"sha.js@^2.4.0", "sha.js@^2.4.8":
+  "resolved" "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"
+  "version" "2.4.11"
   dependencies:
-    kind-of "^6.0.2"
+    "inherits" "^2.0.1"
+    "safe-buffer" "^5.0.1"
 
-shallow-equal@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da"
-
-shallowequal@^1.0.1, shallowequal@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+"shallow-clone@^0.1.2":
+  "resolved" "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz"
+  "version" "0.1.2"
   dependencies:
-    shebang-regex "^1.0.0"
+    "is-extendable" "^0.1.1"
+    "kind-of" "^2.0.1"
+    "lazy-cache" "^0.2.3"
+    "mixin-object" "^2.0.1"
 
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+"shallow-clone@^3.0.0":
+  "resolved" "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    shebang-regex "^3.0.0"
+    "kind-of" "^6.0.2"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+"shallow-equal@^1.1.0":
+  "resolved" "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz"
+  "version" "1.2.1"
 
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+"shallowequal@^1.0.1", "shallowequal@^1.1.0":
+  "resolved" "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz"
+  "version" "1.1.0"
 
-shell-quote@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
-
-shelljs@^0.8.3:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
+"shebang-command@^1.2.0":
+  "resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
+    "shebang-regex" "^1.0.0"
 
-shellwords@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
-
-showdown@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/showdown/-/showdown-1.9.1.tgz#134e148e75cd4623e09c21b0511977d79b5ad0ef"
+"shebang-command@^2.0.0":
+  "resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    yargs "^14.2"
+    "shebang-regex" "^3.0.0"
 
-side-channel@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3"
+"shebang-regex@^1.0.0":
+  "resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
+  "version" "1.0.0"
+
+"shebang-regex@^3.0.0":
+  "resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
+  "version" "3.0.0"
+
+"shell-quote@1.7.2":
+  "resolved" "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"
+  "version" "1.7.2"
+
+"shelljs@^0.8.3":
+  "resolved" "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz"
+  "version" "0.8.4"
   dependencies:
-    es-abstract "^1.18.0-next.0"
-    object-inspect "^1.8.0"
+    "glob" "^7.0.0"
+    "interpret" "^1.0.0"
+    "rechoir" "^0.6.2"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+"shelljs@0.3.x":
+  "resolved" "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
+  "version" "0.3.0"
 
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+"shellwords@^0.1.1":
+  "resolved" "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"
+  "version" "0.1.1"
+
+"showdown@^1.9.1":
+  "resolved" "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz"
+  "version" "1.9.1"
   dependencies:
-    is-arrayish "^0.3.1"
+    "yargs" "^14.2"
 
-simplebar-react@^1.0.0-alpha.6:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/simplebar-react/-/simplebar-react-1.2.3.tgz#bd81fa9827628470e9470d06caef6ece15e1c882"
+"side-channel@^1.0.2":
+  "resolved" "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz"
+  "version" "1.0.3"
   dependencies:
-    prop-types "^15.6.1"
-    simplebar "^4.2.3"
+    "es-abstract" "^1.18.0-next.0"
+    "object-inspect" "^1.8.0"
 
-simplebar@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-4.2.3.tgz#dac40aced299c17928329eab3d5e6e795fafc10c"
+"signal-exit@^3.0.0", "signal-exit@^3.0.2":
+  "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"
+  "version" "3.0.3"
+
+"simple-swizzle@^0.2.2":
+  "resolved" "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"
+  "version" "0.2.2"
   dependencies:
-    can-use-dom "^0.1.0"
-    core-js "^3.0.1"
-    lodash.debounce "^4.0.8"
-    lodash.memoize "^4.1.2"
-    lodash.throttle "^4.1.1"
-    resize-observer-polyfill "^1.5.1"
+    "is-arrayish" "^0.3.1"
 
-sisteransi@^1.0.4, sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
-
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+"simplebar-react@^1.0.0-alpha.6":
+  "resolved" "https://registry.npmjs.org/simplebar-react/-/simplebar-react-1.2.3.tgz"
+  "version" "1.2.3"
   dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
+    "prop-types" "^15.6.1"
+    "simplebar" "^4.2.3"
 
-smartlook-client@^4.5.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/smartlook-client/-/smartlook-client-4.6.1.tgz#0c99c297ef52ef42cc3732cf17ea7ebfd81cfefe"
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+"simplebar@^4.2.3":
+  "resolved" "https://registry.npmjs.org/simplebar/-/simplebar-4.2.3.tgz"
+  "version" "4.2.3"
   dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
+    "can-use-dom" "^0.1.0"
+    "core-js" "^3.0.1"
+    "lodash.debounce" "^4.0.8"
+    "lodash.memoize" "^4.1.2"
+    "lodash.throttle" "^4.1.1"
+    "resize-observer-polyfill" "^1.5.1"
 
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+"sisteransi@^1.0.4", "sisteransi@^1.0.5":
+  "resolved" "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"
+  "version" "1.0.5"
+
+"slash@^1.0.0":
+  "resolved" "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"
+  "version" "1.0.0"
+
+"slash@^2.0.0":
+  "resolved" "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"
+  "version" "2.0.0"
+
+"slash@^3.0.0":
+  "resolved" "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
+  "version" "3.0.0"
+
+"slice-ansi@^2.1.0":
+  "resolved" "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    kind-of "^3.2.0"
+    "ansi-styles" "^3.2.0"
+    "astral-regex" "^1.0.0"
+    "is-fullwidth-code-point" "^2.0.0"
 
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+"slice-ansi@0.0.4":
+  "resolved" "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"
+  "version" "0.0.4"
+
+"smartlook-client@^4.5.1":
+  "resolved" "https://registry.npmjs.org/smartlook-client/-/smartlook-client-4.6.1.tgz"
+  "version" "4.6.1"
+
+"snapdragon-node@^2.0.1":
+  "resolved" "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"
+  "version" "2.1.1"
   dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
+    "define-property" "^1.0.0"
+    "isobject" "^3.0.0"
+    "snapdragon-util" "^3.0.1"
 
-socket.io-client@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.0.0.tgz#643cc25e5b5bbe37be75ecd317156a3335bb495a"
-  integrity sha512-27yQxmXJAEYF19Ygyl8FPJ0if0wegpSmkIIbrWJeI7n7ST1JyH8bbD5v3fjjGY5cfCanACJ3dARUAyiVFNrlTQ==
+"snapdragon-util@^3.0.1":
+  "resolved" "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"
+  "version" "3.0.1"
+  dependencies:
+    "kind-of" "^3.2.0"
+
+"snapdragon@^0.8.1":
+  "resolved" "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"
+  "version" "0.8.2"
+  dependencies:
+    "base" "^0.11.1"
+    "debug" "^2.2.0"
+    "define-property" "^0.2.5"
+    "extend-shallow" "^2.0.1"
+    "map-cache" "^0.2.2"
+    "source-map" "^0.5.6"
+    "source-map-resolve" "^0.5.0"
+    "use" "^3.1.0"
+
+"socket.io-client@^4.0.0":
+  "resolved" "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
     "@types/component-emitter" "^1.2.10"
-    backo2 "~1.0.2"
-    component-emitter "~1.3.0"
-    debug "~4.3.1"
-    engine.io-client "~5.0.0"
-    parseuri "0.0.6"
-    socket.io-parser "~4.0.4"
+    "backo2" "~1.0.2"
+    "component-emitter" "~1.3.0"
+    "debug" "~4.3.1"
+    "engine.io-client" "~5.0.0"
+    "parseuri" "0.0.6"
+    "socket.io-parser" "~4.0.4"
 
-socket.io-parser@~4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
-  integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
+"socket.io-parser@~4.0.4":
+  "resolved" "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz"
+  "version" "4.0.4"
   dependencies:
     "@types/component-emitter" "^1.2.10"
-    component-emitter "~1.3.0"
-    debug "~4.3.1"
+    "component-emitter" "~1.3.0"
+    "debug" "~4.3.1"
 
-sockjs-client@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
+"sockjs-client@^1.4.0", "sockjs-client@1.4.0":
+  "resolved" "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"
+  "version" "1.4.0"
   dependencies:
-    debug "^3.2.5"
-    eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
+    "debug" "^3.2.5"
+    "eventsource" "^1.0.7"
+    "faye-websocket" "~0.11.1"
+    "inherits" "^2.0.3"
+    "json3" "^3.3.2"
+    "url-parse" "^1.4.3"
 
-sockjs@0.3.20:
-  version "0.3.20"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
+"sockjs@0.3.20":
+  "resolved" "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz"
+  "version" "0.3.20"
   dependencies:
-    faye-websocket "^0.10.0"
-    uuid "^3.4.0"
-    websocket-driver "0.6.5"
+    "faye-websocket" "^0.10.0"
+    "uuid" "^3.4.0"
+    "websocket-driver" "0.6.5"
 
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+"sort-keys@^1.0.0":
+  "resolved" "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"
+  "version" "1.1.2"
   dependencies:
-    is-plain-obj "^1.0.0"
+    "is-plain-obj" "^1.0.0"
 
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+"source-list-map@^2.0.0":
+  "resolved" "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"
+  "version" "2.0.1"
 
-source-map-explorer@^2.4.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.0.tgz#42e12c76743e8a0ca0579d472ea5ba623e0d0498"
+"source-map-explorer@^2.4.2":
+  "resolved" "https://registry.npmjs.org/source-map-explorer/-/source-map-explorer-2.5.0.tgz"
+  "version" "2.5.0"
   dependencies:
-    btoa "^1.2.1"
-    chalk "^4.1.0"
-    convert-source-map "^1.7.0"
-    ejs "^3.1.5"
-    escape-html "^1.0.3"
-    glob "^7.1.6"
-    gzip-size "^5.1.1"
-    lodash "^4.17.20"
-    open "^7.1.0"
-    source-map "^0.7.3"
-    temp "^0.9.1"
-    yargs "^15.4.1"
+    "btoa" "^1.2.1"
+    "chalk" "^4.1.0"
+    "convert-source-map" "^1.7.0"
+    "ejs" "^3.1.5"
+    "escape-html" "^1.0.3"
+    "glob" "^7.1.6"
+    "gzip-size" "^5.1.1"
+    "lodash" "^4.17.20"
+    "open" "^7.1.0"
+    "source-map" "^0.7.3"
+    "temp" "^0.9.1"
+    "yargs" "^15.4.1"
 
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+"source-map-resolve@^0.5.0", "source-map-resolve@^0.5.2":
+  "resolved" "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"
+  "version" "0.5.3"
   dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
+    "atob" "^2.1.2"
+    "decode-uri-component" "^0.2.0"
+    "resolve-url" "^0.2.1"
+    "source-map-url" "^0.4.0"
+    "urix" "^0.1.0"
 
-source-map-resolve@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
+"source-map-resolve@^0.6.0":
+  "resolved" "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz"
+  "version" "0.6.0"
   dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
+    "atob" "^2.1.2"
+    "decode-uri-component" "^0.2.0"
 
-source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@^0.5.9, source-map-support@~0.5.12, source-map-support@~0.5.19:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+"source-map-support@^0.5.16", "source-map-support@^0.5.6", "source-map-support@^0.5.9", "source-map-support@~0.5.12", "source-map-support@~0.5.19":
+  "resolved" "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"
+  "version" "0.5.19"
   dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
+    "buffer-from" "^1.0.0"
+    "source-map" "^0.6.0"
 
-source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+"source-map-url@^0.4.0":
+  "resolved" "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"
+  "version" "0.4.0"
 
-source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-
-source-map@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+"source-map@^0.4.2":
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
+  "version" "0.4.4"
   dependencies:
-    amdefine ">=0.0.4"
+    "amdefine" ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+"source-map@^0.5.0":
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
+  "version" "0.5.7"
 
-source-map@^0.7.3, source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+"source-map@^0.5.6":
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
+  "version" "0.5.7"
 
-sourcemap-codec@^1.4.4:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+"source-map@^0.5.7":
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
+  "version" "0.5.7"
 
-space-separated-tokens@^1.0.0, space-separated-tokens@^1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
+"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.0", "source-map@~0.6.1", "source-map@0.6.1":
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+  "version" "0.6.1"
 
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+"source-map@^0.7.3":
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"
+  "version" "0.7.3"
+
+"source-map@~0.7.2":
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"
+  "version" "0.7.3"
+
+"sourcemap-codec@^1.4.4":
+  "resolved" "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
+  "version" "1.4.8"
+
+"space-separated-tokens@^1.0.0", "space-separated-tokens@^1.1.2":
+  "resolved" "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz"
+  "version" "1.1.5"
+
+"spdx-correct@^3.0.0":
+  "resolved" "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"
+  "version" "3.1.1"
   dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
+    "spdx-expression-parse" "^3.0.0"
+    "spdx-license-ids" "^3.0.0"
 
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+"spdx-exceptions@^2.1.0":
+  "resolved" "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
+  "version" "2.3.0"
 
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+"spdx-expression-parse@^3.0.0":
+  "resolved" "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
+    "spdx-exceptions" "^2.1.0"
+    "spdx-license-ids" "^3.0.0"
 
-spdx-license-ids@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
+"spdx-license-ids@^3.0.0":
+  "resolved" "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"
+  "version" "3.0.6"
 
-spdy-transport@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+"spdy-transport@^3.0.0":
+  "resolved" "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    debug "^4.1.0"
-    detect-node "^2.0.4"
-    hpack.js "^2.1.6"
-    obuf "^1.1.2"
-    readable-stream "^3.0.6"
-    wbuf "^1.7.3"
+    "debug" "^4.1.0"
+    "detect-node" "^2.0.4"
+    "hpack.js" "^2.1.6"
+    "obuf" "^1.1.2"
+    "readable-stream" "^3.0.6"
+    "wbuf" "^1.7.3"
 
-spdy@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
+"spdy@^4.0.2":
+  "resolved" "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    debug "^4.1.0"
-    handle-thing "^2.0.0"
-    http-deceiver "^1.2.7"
-    select-hose "^2.0.0"
-    spdy-transport "^3.0.0"
+    "debug" "^4.1.0"
+    "handle-thing" "^2.0.0"
+    "http-deceiver" "^1.2.7"
+    "select-hose" "^2.0.0"
+    "spdy-transport" "^3.0.0"
 
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+"split-string@^3.0.1", "split-string@^3.0.2":
+  "resolved" "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    extend-shallow "^3.0.0"
+    "extend-shallow" "^3.0.0"
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+"sprintf-js@~1.0.2":
+  "resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
+  "version" "1.0.3"
 
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+"sshpk@^1.7.0":
+  "resolved" "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"
+  "version" "1.16.1"
   dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
+    "asn1" "~0.2.3"
+    "assert-plus" "^1.0.0"
+    "bcrypt-pbkdf" "^1.0.0"
+    "dashdash" "^1.12.0"
+    "ecc-jsbn" "~0.1.1"
+    "getpass" "^0.1.1"
+    "jsbn" "~0.1.0"
+    "safer-buffer" "^2.0.2"
+    "tweetnacl" "~0.14.0"
 
-ssri@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
-  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
+"ssri@^6.0.1":
+  "resolved" "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz"
+  "version" "6.0.2"
   dependencies:
-    figgy-pudding "^3.5.1"
+    "figgy-pudding" "^3.5.1"
 
-ssri@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d"
+"ssri@^7.0.0":
+  "resolved" "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz"
+  "version" "7.1.0"
   dependencies:
-    figgy-pudding "^3.5.1"
-    minipass "^3.1.1"
+    "figgy-pudding" "^3.5.1"
+    "minipass" "^3.1.1"
 
-ssri@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808"
+"ssri@^8.0.0":
+  "resolved" "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz"
+  "version" "8.0.0"
   dependencies:
-    minipass "^3.1.1"
+    "minipass" "^3.1.1"
 
-stable@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
+"stable@^0.1.8":
+  "resolved" "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"
+  "version" "0.1.8"
 
-stack-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
+"stack-utils@^1.0.1":
+  "resolved" "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz"
+  "version" "1.0.2"
 
-stack-utils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593"
+"stack-utils@^2.0.2":
+  "resolved" "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    escape-string-regexp "^2.0.0"
+    "escape-string-regexp" "^2.0.0"
 
-stackframe@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303"
+"stackframe@^1.1.1":
+  "resolved" "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz"
+  "version" "1.2.0"
 
-state-toggle@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
+"state-toggle@^1.0.0":
+  "resolved" "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz"
+  "version" "1.0.3"
 
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+"static-extend@^0.1.1":
+  "resolved" "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"
+  "version" "0.1.2"
   dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
+    "define-property" "^0.2.5"
+    "object-copy" "^0.1.0"
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+"statuses@^2.0.0":
+  "resolved" "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
+  "version" "2.0.1"
 
-statuses@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", "statuses@~1.5.0":
+  "resolved" "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
+  "version" "1.5.0"
 
-stdout-stream@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+"stdout-stream@^1.4.0":
+  "resolved" "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz"
+  "version" "1.4.1"
   dependencies:
-    readable-stream "^2.0.1"
+    "readable-stream" "^2.0.1"
 
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+"stealthy-require@^1.1.1":
+  "resolved" "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"
+  "version" "1.1.1"
 
-store2@^2.7.1:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/store2/-/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf"
+"store2@^2.7.1":
+  "resolved" "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz"
+  "version" "2.12.0"
 
-storybook-addon-designs@^5.4.0:
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/storybook-addon-designs/-/storybook-addon-designs-5.4.2.tgz#5cd98c2e1665e610c4fb190cfe8310d720657057"
+"storybook-addon-designs@^5.4.0":
+  "resolved" "https://registry.npmjs.org/storybook-addon-designs/-/storybook-addon-designs-5.4.2.tgz"
+  "version" "5.4.2"
   dependencies:
-    react-pdf "^4.0.5"
+    "react-pdf" "^4.0.5"
 
-stream-browserify@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+"stream-browserify@^2.0.1":
+  "resolved" "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
+    "inherits" "~2.0.1"
+    "readable-stream" "^2.0.2"
 
-stream-each@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+"stream-each@^1.1.0":
+  "resolved" "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz"
+  "version" "1.2.3"
   dependencies:
-    end-of-stream "^1.1.0"
-    stream-shift "^1.0.0"
+    "end-of-stream" "^1.1.0"
+    "stream-shift" "^1.0.0"
 
-stream-http@^2.7.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+"stream-http@^2.7.2":
+  "resolved" "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"
+  "version" "2.8.3"
   dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
+    "builtin-status-codes" "^3.0.0"
+    "inherits" "^2.0.1"
+    "readable-stream" "^2.3.6"
+    "to-arraybuffer" "^1.0.0"
+    "xtend" "^4.0.0"
 
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+"stream-shift@^1.0.0":
+  "resolved" "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"
+  "version" "1.0.1"
 
-strict-event-emitter@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/strict-event-emitter/-/strict-event-emitter-0.1.0.tgz#fd742c1fb7e3852f0b964ecdae2d7666a6fb7ef8"
-  integrity sha512-8hSYfU+WKLdNcHVXJ0VxRXiPESalzRe7w1l8dg9+/22Ry+iZQUoQuoJ27R30GMD1TiyYINWsIEGY05WrskhSKw==
+"strict-event-emitter@^0.1.0":
+  "resolved" "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.1.0.tgz"
+  "version" "0.1.0"
 
-strict-event-emitter@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/strict-event-emitter/-/strict-event-emitter-0.2.0.tgz#78e2f75dc6ea502e5d8a877661065a1e2deedecd"
-  integrity sha512-zv7K2egoKwkQkZGEaH8m+i2D0XiKzx5jNsiSul6ja2IYFvil10A59Z9Y7PPAAe5OW53dQUf9CfsHKzjZzKkm1w==
+"strict-event-emitter@^0.2.0":
+  "resolved" "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.2.0.tgz"
+  "version" "0.2.0"
   dependencies:
-    events "^3.3.0"
+    "events" "^3.3.0"
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+"strict-uri-encode@^1.0.0":
+  "resolved" "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"
+  "version" "1.1.0"
 
-string-argv@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
-
-string-hash@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
-
-string-length@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
+"string_decoder@^1.0.0", "string_decoder@^1.1.1":
+  "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+  "version" "1.3.0"
   dependencies:
-    char-regex "^1.0.2"
-    strip-ansi "^6.0.0"
+    "safe-buffer" "~5.2.0"
 
-string-natural-compare@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
+"string_decoder@~0.10.x":
+  "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+  "version" "0.10.31"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+"string_decoder@~1.1.1":
+  "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
+    "safe-buffer" "~5.1.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+"string-argv@^0.3.0":
+  "resolved" "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz"
+  "version" "0.3.1"
+
+"string-hash@^1.1.1":
+  "resolved" "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz"
+  "version" "1.1.3"
+
+"string-length@^4.0.1":
+  "resolved" "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz"
+  "version" "4.0.1"
   dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
+    "char-regex" "^1.0.2"
+    "strip-ansi" "^6.0.0"
 
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+"string-natural-compare@^3.0.1":
+  "resolved" "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz"
+  "version" "3.0.1"
+
+"string-width@^1.0.1":
+  "resolved" "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
+    "code-point-at" "^1.0.0"
+    "is-fullwidth-code-point" "^1.0.0"
+    "strip-ansi" "^3.0.0"
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+"string-width@^1.0.2 || 2":
+  "resolved" "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"
+  "version" "2.1.1"
   dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
+    "is-fullwidth-code-point" "^2.0.0"
+    "strip-ansi" "^4.0.0"
 
-string.fromcodepoint@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz#8d978333c0bc92538f50f383e4888f3e5619d653"
-
-"string.prototype.matchall@^4.0.0 || ^3.0.1", string.prototype.matchall@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
+"string-width@^2.1.0":
+  "resolved" "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"
+  "version" "2.1.1"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    has-symbols "^1.0.1"
-    internal-slot "^1.0.2"
-    regexp.prototype.flags "^1.3.0"
-    side-channel "^1.0.2"
+    "is-fullwidth-code-point" "^2.0.0"
+    "strip-ansi" "^4.0.0"
 
-string.prototype.padend@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz#dc08f57a8010dc5c153550318f67e13adbb72ac3"
+"string-width@^2.1.1":
+  "resolved" "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"
+  "version" "2.1.1"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    "is-fullwidth-code-point" "^2.0.0"
+    "strip-ansi" "^4.0.0"
 
-string.prototype.padstart@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.padstart/-/string.prototype.padstart-3.1.0.tgz#b47c087540d0710be5a49375751a0a627bd4ff90"
+"string-width@^3.0.0":
+  "resolved" "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    "emoji-regex" "^7.0.1"
+    "is-fullwidth-code-point" "^2.0.0"
+    "strip-ansi" "^5.1.0"
 
-string.prototype.trimend@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+"string-width@^3.1.0":
+  "resolved" "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    "emoji-regex" "^7.0.1"
+    "is-fullwidth-code-point" "^2.0.0"
+    "strip-ansi" "^5.1.0"
 
-string.prototype.trimstart@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+"string-width@^4.0.0", "string-width@^4.1.0", "string-width@^4.2.0":
+  "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"
+  "version" "4.2.0"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    "emoji-regex" "^8.0.0"
+    "is-fullwidth-code-point" "^3.0.0"
+    "strip-ansi" "^6.0.0"
 
-string_decoder@^1.0.0, string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+"string.fromcodepoint@^0.2.1":
+  "resolved" "https://registry.npmjs.org/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz"
+  "version" "0.2.1"
+
+"string.prototype.matchall@^4.0.0 || ^3.0.1", "string.prototype.matchall@^4.0.2":
+  "resolved" "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    safe-buffer "~5.2.0"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0"
+    "has-symbols" "^1.0.1"
+    "internal-slot" "^1.0.2"
+    "regexp.prototype.flags" "^1.3.0"
+    "side-channel" "^1.0.2"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+"string.prototype.padend@^3.0.0":
+  "resolved" "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    safe-buffer "~5.1.0"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
 
-stringify-object@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
+"string.prototype.padstart@^3.0.0":
+  "resolved" "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    get-own-enumerable-property-symbols "^3.0.0"
-    is-obj "^1.0.1"
-    is-regexp "^1.0.0"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.0-next.1"
 
-strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+"string.prototype.trimend@^1.0.1":
+  "resolved" "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    ansi-regex "^4.1.0"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.5"
 
-strip-ansi@6.0.0, strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+"string.prototype.trimstart@^1.0.1":
+  "resolved" "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    ansi-regex "^5.0.0"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.5"
 
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+"stringify-object@^3.3.0":
+  "resolved" "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"
+  "version" "3.3.0"
   dependencies:
-    ansi-regex "^2.0.0"
+    "get-own-enumerable-property-symbols" "^3.0.0"
+    "is-obj" "^1.0.1"
+    "is-regexp" "^1.0.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+"strip-ansi@^3.0.0", "strip-ansi@^3.0.1":
+  "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    ansi-regex "^3.0.0"
+    "ansi-regex" "^2.0.0"
 
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+"strip-ansi@^3.0.1":
+  "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    is-utf8 "^0.2.0"
+    "ansi-regex" "^2.0.0"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
-strip-bom@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
-
-strip-comments@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-1.0.2.tgz#82b9c45e7f05873bee53f37168af930aa368679d"
+"strip-ansi@^4.0.0":
+  "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    babel-extract-comments "^1.0.0"
-    babel-plugin-transform-object-rest-spread "^6.26.0"
+    "ansi-regex" "^3.0.0"
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+"strip-ansi@^5.0.0", "strip-ansi@^5.1.0", "strip-ansi@^5.2.0", "strip-ansi@5.2.0":
+  "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"
+  "version" "5.2.0"
   dependencies:
-    get-stdin "^4.0.1"
+    "ansi-regex" "^4.1.0"
 
-strip-indent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+"strip-ansi@^6.0.0", "strip-ansi@6.0.0":
+  "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    min-indent "^1.0.0"
+    "ansi-regex" "^5.0.0"
 
-strip-json-comments@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+"strip-bom@^3.0.0":
+  "resolved" "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"
+  "version" "3.0.0"
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+"strip-bom@^4.0.0":
+  "resolved" "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz"
+  "version" "4.0.0"
 
-style-loader@1.3.0, style-loader@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e"
+"strip-comments@^1.0.2":
+  "resolved" "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^2.7.0"
+    "babel-extract-comments" "^1.0.0"
+    "babel-plugin-transform-object-rest-spread" "^6.26.0"
 
-style-to-object@0.3.0, style-to-object@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
+"strip-eof@^1.0.0":
+  "resolved" "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"
+  "version" "1.0.0"
+
+"strip-final-newline@^2.0.0":
+  "resolved" "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
+  "version" "2.0.0"
+
+"strip-indent@^3.0.0":
+  "resolved" "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    inline-style-parser "0.1.1"
+    "min-indent" "^1.0.0"
 
-styled-components@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.2.0.tgz#6dcb5aa8a629c84b8d5ab34b7167e3e0c6f7ed74"
+"strip-json-comments@^3.1.0", "strip-json-comments@^3.1.1":
+  "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
+  "version" "3.1.1"
+
+"strip-json-comments@1.0.x":
+  "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"
+  "version" "1.0.4"
+
+"strip-json-comments@2.0.1":
+  "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
+  "version" "2.0.1"
+
+"style-loader@^1.0.0", "style-loader@1.3.0":
+  "resolved" "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz"
+  "version" "1.3.0"
+  dependencies:
+    "loader-utils" "^2.0.0"
+    "schema-utils" "^2.7.0"
+
+"style-to-object@^0.3.0", "style-to-object@0.3.0":
+  "resolved" "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz"
+  "version" "0.3.0"
+  dependencies:
+    "inline-style-parser" "0.1.1"
+
+"styled-components@^5.2.0", "styled-components@>= 2":
+  "resolved" "https://registry.npmjs.org/styled-components/-/styled-components-5.2.0.tgz"
+  "version" "5.2.0"
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/traverse" "^7.4.5"
     "@emotion/is-prop-valid" "^0.8.8"
     "@emotion/stylis" "^0.8.4"
     "@emotion/unitless" "^0.7.4"
-    babel-plugin-styled-components ">= 1"
-    css-to-react-native "^3.0.0"
-    hoist-non-react-statics "^3.0.0"
-    shallowequal "^1.1.0"
-    supports-color "^5.5.0"
+    "babel-plugin-styled-components" ">= 1"
+    "css-to-react-native" "^3.0.0"
+    "hoist-non-react-statics" "^3.0.0"
+    "shallowequal" "^1.1.0"
+    "supports-color" "^5.5.0"
 
-styled-system@^5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/styled-system/-/styled-system-5.1.5.tgz#e362d73e1dbb5641a2fd749a6eba1263dc85075e"
+"styled-system@^5.1.5":
+  "resolved" "https://registry.npmjs.org/styled-system/-/styled-system-5.1.5.tgz"
+  "version" "5.1.5"
   dependencies:
     "@styled-system/background" "^5.1.2"
     "@styled-system/border" "^5.1.5"
@@ -16351,1322 +16996,1358 @@ styled-system@^5.1.5:
     "@styled-system/space" "^5.1.2"
     "@styled-system/typography" "^5.1.2"
     "@styled-system/variant" "^5.1.5"
-    object-assign "^4.1.1"
+    "object-assign" "^4.1.1"
 
-stylehacks@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
+"stylehacks@^4.0.0":
+  "resolved" "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    browserslist "^4.0.0"
-    postcss "^7.0.0"
-    postcss-selector-parser "^3.0.0"
+    "browserslist" "^4.0.0"
+    "postcss" "^7.0.0"
+    "postcss-selector-parser" "^3.0.0"
 
-substyle@^9.1.0:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/substyle/-/substyle-9.3.0.tgz#569af81723f74cd895b08b6b1e6bc06727f2a2bd"
-  integrity sha512-OK6A6EpqOfRvlwOnrgwFKIi8UDJwCQ2UB5cIJGMEFvl3zUUA83XDbRUJizECj66CdeZ9pGjkmwRxyc/9wBGQMA==
+"substyle@^9.1.0":
+  "resolved" "https://registry.npmjs.org/substyle/-/substyle-9.3.0.tgz"
+  "version" "9.3.0"
   dependencies:
     "@babel/runtime" "^7.3.4"
-    invariant "^2.2.4"
+    "invariant" "^2.2.4"
 
-supports-color@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
+"supports-color@^2.0.0":
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+  "version" "2.0.0"
+
+"supports-color@^5.3.0":
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+  "version" "5.5.0"
   dependencies:
-    has-flag "^3.0.0"
+    "has-flag" "^3.0.0"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-supports-color@^5.3.0, supports-color@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+"supports-color@^5.5.0":
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+  "version" "5.5.0"
   dependencies:
-    has-flag "^3.0.0"
+    "has-flag" "^3.0.0"
 
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+"supports-color@^6.1.0":
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"
+  "version" "6.1.0"
   dependencies:
-    has-flag "^3.0.0"
+    "has-flag" "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0, supports-color@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+"supports-color@^7.0.0", "supports-color@^7.1.0", "supports-color@^7.2.0":
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+  "version" "7.2.0"
   dependencies:
-    has-flag "^4.0.0"
+    "has-flag" "^4.0.0"
 
-supports-hyperlinks@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
+"supports-color@6.0.0":
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
+    "has-flag" "^3.0.0"
 
-svg-parser@^2.0.0, svg-parser@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5"
-
-svgo@^1.0.0, svgo@^1.2.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
+"supports-hyperlinks@^2.0.0":
+  "resolved" "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    chalk "^2.4.1"
-    coa "^2.0.2"
-    css-select "^2.0.0"
-    css-select-base-adapter "^0.1.1"
-    css-tree "1.0.0-alpha.37"
-    csso "^4.0.2"
-    js-yaml "^3.13.1"
-    mkdirp "~0.5.1"
-    object.values "^1.1.0"
-    sax "~1.2.4"
-    stable "^0.1.8"
-    unquote "~1.1.1"
-    util.promisify "~1.0.0"
+    "has-flag" "^4.0.0"
+    "supports-color" "^7.0.0"
 
-symbol-observable@^1.0.4, symbol-observable@^1.1.0, symbol-observable@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+"svg-parser@^2.0.0", "svg-parser@^2.0.2":
+  "resolved" "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz"
+  "version" "2.0.4"
 
-symbol-tree@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
-
-symbol.prototype.description@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/symbol.prototype.description/-/symbol.prototype.description-1.0.2.tgz#f325e1e6ad534b3b29c9c3ca73c136c9ce03c5e2"
+"svgo@^1.0.0", "svgo@^1.2.2":
+  "resolved" "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz"
+  "version" "1.3.2"
   dependencies:
-    es-abstract "^1.17.0-next.1"
-    has-symbols "^1.0.1"
+    "chalk" "^2.4.1"
+    "coa" "^2.0.2"
+    "css-select" "^2.0.0"
+    "css-select-base-adapter" "^0.1.1"
+    "css-tree" "1.0.0-alpha.37"
+    "csso" "^4.0.2"
+    "js-yaml" "^3.13.1"
+    "mkdirp" "~0.5.1"
+    "object.values" "^1.1.0"
+    "sax" "~1.2.4"
+    "stable" "^0.1.8"
+    "unquote" "~1.1.1"
+    "util.promisify" "~1.0.0"
 
-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+"symbol-observable@^1.0.4", "symbol-observable@^1.1.0", "symbol-observable@^1.2.0":
+  "resolved" "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"
+  "version" "1.2.0"
+
+"symbol-tree@^3.2.4":
+  "resolved" "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
+  "version" "3.2.4"
+
+"symbol.prototype.description@^1.0.0":
+  "resolved" "https://registry.npmjs.org/symbol.prototype.description/-/symbol.prototype.description-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
+    "es-abstract" "^1.17.0-next.1"
+    "has-symbols" "^1.0.1"
 
-tapable@^0.2.3:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.9.tgz#af2d8bbc9b04f74ee17af2b4d9048f807acd18a8"
-
-tapable@^1.0.0, tapable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-
-tar@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
+"table@^5.2.3":
+  "resolved" "https://registry.npmjs.org/table/-/table-5.4.6.tgz"
+  "version" "5.4.6"
   dependencies:
-    block-stream "*"
-    fstream "^1.0.12"
-    inherits "2"
+    "ajv" "^6.10.2"
+    "lodash" "^4.17.14"
+    "slice-ansi" "^2.1.0"
+    "string-width" "^3.0.0"
 
-tar@^6.0.2:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
+"tapable@^0.2.3":
+  "resolved" "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz"
+  "version" "0.2.9"
+
+"tapable@^1.0.0", "tapable@^1.1.3":
+  "resolved" "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"
+  "version" "1.1.3"
+
+"tar@^6.0.2":
+  "resolved" "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz"
+  "version" "6.0.5"
   dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^3.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
+    "chownr" "^2.0.0"
+    "fs-minipass" "^2.0.0"
+    "minipass" "^3.0.0"
+    "minizlib" "^2.1.1"
+    "mkdirp" "^1.0.3"
+    "yallist" "^4.0.0"
 
-tcomb-validation@^3.3.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tcomb-validation/-/tcomb-validation-3.4.1.tgz#a7696ec176ce56a081d9e019f8b732a5a8894b65"
+"tcomb-validation@^3.3.0":
+  "resolved" "https://registry.npmjs.org/tcomb-validation/-/tcomb-validation-3.4.1.tgz"
+  "version" "3.4.1"
   dependencies:
-    tcomb "^3.0.0"
+    "tcomb" "^3.0.0"
 
-tcomb@^3.0.0, tcomb@^3.2.17:
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-3.2.29.tgz#32404fe9456d90c2cf4798682d37439f1ccc386c"
+"tcomb@^3.0.0", "tcomb@^3.2.17":
+  "resolved" "https://registry.npmjs.org/tcomb/-/tcomb-3.2.29.tgz"
+  "version" "3.2.29"
 
-telejson@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/telejson/-/telejson-3.3.0.tgz#6d814f3c0d254d5c4770085aad063e266b56ad03"
+"telejson@^3.2.0":
+  "resolved" "https://registry.npmjs.org/telejson/-/telejson-3.3.0.tgz"
+  "version" "3.3.0"
   dependencies:
     "@types/is-function" "^1.0.0"
-    global "^4.4.0"
-    is-function "^1.0.1"
-    is-regex "^1.0.4"
-    is-symbol "^1.0.3"
-    isobject "^4.0.0"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
+    "global" "^4.4.0"
+    "is-function" "^1.0.1"
+    "is-regex" "^1.0.4"
+    "is-symbol" "^1.0.3"
+    "isobject" "^4.0.0"
+    "lodash" "^4.17.15"
+    "memoizerific" "^1.11.3"
 
-temp-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+"temp-dir@^1.0.0":
+  "resolved" "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"
+  "version" "1.0.0"
 
-temp@^0.8.1:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2"
+"temp@^0.8.1":
+  "resolved" "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz"
+  "version" "0.8.4"
   dependencies:
-    rimraf "~2.6.2"
+    "rimraf" "~2.6.2"
 
-temp@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.1.tgz#2d666114fafa26966cd4065996d7ceedd4dd4697"
+"temp@^0.9.1":
+  "resolved" "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz"
+  "version" "0.9.1"
   dependencies:
-    rimraf "~2.6.2"
+    "rimraf" "~2.6.2"
 
-tempy@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.3.0.tgz#6f6c5b295695a16130996ad5ab01a8bd726e8bf8"
+"tempy@^0.3.0":
+  "resolved" "https://registry.npmjs.org/tempy/-/tempy-0.3.0.tgz"
+  "version" "0.3.0"
   dependencies:
-    temp-dir "^1.0.0"
-    type-fest "^0.3.1"
-    unique-string "^1.0.0"
+    "temp-dir" "^1.0.0"
+    "type-fest" "^0.3.1"
+    "unique-string" "^1.0.0"
 
-term-size@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
+"term-size@^2.1.0":
+  "resolved" "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz"
+  "version" "2.2.0"
 
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
+"terminal-link@^2.0.0":
+  "resolved" "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz"
+  "version" "2.1.1"
   dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
+    "ansi-escapes" "^4.2.1"
+    "supports-hyperlinks" "^2.0.0"
 
-tern@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/tern/-/tern-0.21.0.tgz#809c87a826e112494398cf8894f7c2d1b3464eb7"
+"tern@^0.21.0":
+  "resolved" "https://registry.npmjs.org/tern/-/tern-0.21.0.tgz"
+  "version" "0.21.0"
   dependencies:
-    acorn "^4.0.9"
-    enhanced-resolve "^2.2.2"
-    glob "^7.1.1"
-    minimatch "^3.0.3"
-    resolve-from "2.0.0"
+    "acorn" "^4.0.9"
+    "enhanced-resolve" "^2.2.2"
+    "glob" "^7.1.1"
+    "minimatch" "^3.0.3"
+    "resolve-from" "2.0.0"
 
-terser-webpack-plugin@4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a"
+"terser-webpack-plugin@^1.4.3":
+  "resolved" "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"
+  "version" "1.4.5"
   dependencies:
-    cacache "^15.0.5"
-    find-cache-dir "^3.3.1"
-    jest-worker "^26.5.0"
-    p-limit "^3.0.2"
-    schema-utils "^3.0.0"
-    serialize-javascript "^5.0.1"
-    source-map "^0.6.1"
-    terser "^5.3.4"
-    webpack-sources "^1.4.3"
+    "cacache" "^12.0.2"
+    "find-cache-dir" "^2.1.0"
+    "is-wsl" "^1.1.0"
+    "schema-utils" "^1.0.0"
+    "serialize-javascript" "^4.0.0"
+    "source-map" "^0.6.1"
+    "terser" "^4.1.2"
+    "webpack-sources" "^1.4.0"
+    "worker-farm" "^1.7.0"
 
-terser-webpack-plugin@^1.4.3:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
+"terser-webpack-plugin@^2.1.2":
+  "resolved" "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz"
+  "version" "2.3.8"
   dependencies:
-    cacache "^12.0.2"
-    find-cache-dir "^2.1.0"
-    is-wsl "^1.1.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^4.0.0"
-    source-map "^0.6.1"
-    terser "^4.1.2"
-    webpack-sources "^1.4.0"
-    worker-farm "^1.7.0"
+    "cacache" "^13.0.1"
+    "find-cache-dir" "^3.3.1"
+    "jest-worker" "^25.4.0"
+    "p-limit" "^2.3.0"
+    "schema-utils" "^2.6.6"
+    "serialize-javascript" "^4.0.0"
+    "source-map" "^0.6.1"
+    "terser" "^4.6.12"
+    "webpack-sources" "^1.4.3"
 
-terser-webpack-plugin@^2.1.2:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz#894764a19b0743f2f704e7c2a848c5283a696724"
+"terser-webpack-plugin@4.2.3":
+  "resolved" "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz"
+  "version" "4.2.3"
   dependencies:
-    cacache "^13.0.1"
-    find-cache-dir "^3.3.1"
-    jest-worker "^25.4.0"
-    p-limit "^2.3.0"
-    schema-utils "^2.6.6"
-    serialize-javascript "^4.0.0"
-    source-map "^0.6.1"
-    terser "^4.6.12"
-    webpack-sources "^1.4.3"
+    "cacache" "^15.0.5"
+    "find-cache-dir" "^3.3.1"
+    "jest-worker" "^26.5.0"
+    "p-limit" "^3.0.2"
+    "schema-utils" "^3.0.0"
+    "serialize-javascript" "^5.0.1"
+    "source-map" "^0.6.1"
+    "terser" "^5.3.4"
+    "webpack-sources" "^1.4.3"
 
-terser@^4.1.2, terser@^4.6.12, terser@^4.6.2, terser@^4.6.3:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+"terser@^4.1.2", "terser@^4.6.12", "terser@^4.6.2", "terser@^4.6.3":
+  "resolved" "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz"
+  "version" "4.8.0"
   dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
+    "commander" "^2.20.0"
+    "source-map" "~0.6.1"
+    "source-map-support" "~0.5.12"
 
-terser@^5.3.4:
-  version "5.3.8"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.8.tgz#991ae8ba21a3d990579b54aa9af11586197a75dd"
+"terser@^5.3.4":
+  "resolved" "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz"
+  "version" "5.3.8"
   dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
+    "commander" "^2.20.0"
+    "source-map" "~0.7.2"
+    "source-map-support" "~0.5.19"
 
-test-exclude@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
+"test-exclude@^5.2.3":
+  "resolved" "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz"
+  "version" "5.2.3"
   dependencies:
-    glob "^7.1.3"
-    minimatch "^3.0.4"
-    read-pkg-up "^4.0.0"
-    require-main-filename "^2.0.0"
+    "glob" "^7.1.3"
+    "minimatch" "^3.0.4"
+    "read-pkg-up" "^4.0.0"
+    "require-main-filename" "^2.0.0"
 
-test-exclude@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+"test-exclude@^6.0.0":
+  "resolved" "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
     "@istanbuljs/schema" "^0.1.2"
-    glob "^7.1.4"
-    minimatch "^3.0.4"
+    "glob" "^7.1.4"
+    "minimatch" "^3.0.4"
 
-text-table@0.2.0, text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+"text-table@^0.2.0", "text-table@0.2.0":
+  "resolved" "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
+  "version" "0.2.0"
 
-throat@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
+"throat@^5.0.0":
+  "resolved" "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz"
+  "version" "5.0.0"
 
-throttle-debounce@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.3.0.tgz#fd31865e66502071e411817e241465b3e9c372e2"
+"throttle-debounce@^2.1.0":
+  "resolved" "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz"
+  "version" "2.3.0"
 
-throttleit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
+"throttleit@^1.0.0":
+  "resolved" "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"
+  "version" "1.0.0"
 
-through2@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+"through@^2.3.6":
+  "resolved" "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+  "version" "2.3.8"
+
+"through2@^2.0.0":
+  "resolved" "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
+  "version" "2.0.5"
   dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
+    "readable-stream" "~2.3.6"
+    "xtend" "~4.0.1"
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+"thunky@^1.0.2":
+  "resolved" "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"
+  "version" "1.1.0"
 
-thunky@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
-
-timers-browserify@^2.0.4:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
+"timers-browserify@^2.0.4":
+  "resolved" "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"
+  "version" "2.0.11"
   dependencies:
-    setimmediate "^1.0.4"
+    "setimmediate" "^1.0.4"
 
-timsort@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
+"timsort@^0.3.0":
+  "resolved" "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz"
+  "version" "0.3.0"
 
-tiny-emitter@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
+"tiny-emitter@^2.0.0":
+  "resolved" "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz"
+  "version" "2.1.0"
 
-tiny-invariant@^1.0.2, tiny-invariant@^1.0.6:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
+"tiny-invariant@^1.0.2", "tiny-invariant@^1.0.6":
+  "resolved" "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz"
+  "version" "1.1.0"
 
-tiny-warning@^1.0.0, tiny-warning@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
+"tiny-warning@^1.0.0", "tiny-warning@^1.0.3":
+  "resolved" "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz"
+  "version" "1.0.3"
 
-tinycolor2@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803"
+"tinycolor2@^1.4.1":
+  "resolved" "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"
+  "version" "1.4.2"
 
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+"tmp@^0.0.33":
+  "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"
+  "version" "0.0.33"
   dependencies:
-    os-tmpdir "~1.0.2"
+    "os-tmpdir" "~1.0.2"
 
-tmp@~0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+"tmp@~0.2.1":
+  "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"
+  "version" "0.2.1"
   dependencies:
-    rimraf "^3.0.0"
+    "rimraf" "^3.0.0"
 
-tmpl@1.0.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+"tmpl@1.0.x":
+  "resolved" "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz"
+  "version" "1.0.4"
 
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+"to-arraybuffer@^1.0.0":
+  "resolved" "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
+  "version" "1.0.1"
 
-to-camel-case@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/to-camel-case/-/to-camel-case-1.0.0.tgz#1a56054b2f9d696298ce66a60897322b6f423e46"
+"to-camel-case@1.0.0":
+  "resolved" "https://registry.npmjs.org/to-camel-case/-/to-camel-case-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    to-space-case "^1.0.0"
+    "to-space-case" "^1.0.0"
 
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+"to-fast-properties@^2.0.0":
+  "resolved" "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
+  "version" "2.0.0"
 
-to-no-case@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/to-no-case/-/to-no-case-1.0.2.tgz#c722907164ef6b178132c8e69930212d1b4aa16a"
+"to-no-case@^1.0.0":
+  "resolved" "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz"
+  "version" "1.0.2"
 
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+"to-object-path@^0.3.0":
+  "resolved" "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"
+  "version" "0.3.0"
   dependencies:
-    kind-of "^3.0.2"
+    "kind-of" "^3.0.2"
 
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+"to-regex-range@^2.1.0":
+  "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"
+  "version" "2.1.1"
   dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
+    "is-number" "^3.0.0"
+    "repeat-string" "^1.6.1"
 
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+"to-regex-range@^5.0.1":
+  "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
+  "version" "5.0.1"
   dependencies:
-    is-number "^7.0.0"
+    "is-number" "^7.0.0"
 
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+"to-regex@^3.0.1", "to-regex@^3.0.2":
+  "resolved" "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
+    "define-property" "^2.0.2"
+    "extend-shallow" "^3.0.2"
+    "regex-not" "^1.0.2"
+    "safe-regex" "^1.1.0"
 
-to-space-case@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/to-space-case/-/to-space-case-1.0.0.tgz#b052daafb1b2b29dc770cea0163e5ec0ebc9fc17"
+"to-space-case@^1.0.0":
+  "resolved" "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    to-no-case "^1.0.0"
+    "to-no-case" "^1.0.0"
 
-toggle-selection@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
+"toggle-selection@^1.0.6":
+  "resolved" "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz"
+  "version" "1.0.6"
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+"toidentifier@1.0.0":
+  "resolved" "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"
+  "version" "1.0.0"
 
-token-stream@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4"
+"token-stream@1.0.0":
+  "resolved" "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz"
+  "version" "1.0.0"
 
-toposort@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+"toposort@^2.0.2":
+  "resolved" "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"
+  "version" "2.0.2"
 
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+"tough-cookie@^2.3.3", "tough-cookie@~2.5.0":
+  "resolved" "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"
+  "version" "2.5.0"
   dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
+    "psl" "^1.1.28"
+    "punycode" "^2.1.1"
 
-tough-cookie@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
+"tough-cookie@^3.0.1":
+  "resolved" "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    ip-regex "^2.1.0"
-    psl "^1.1.28"
-    punycode "^2.1.1"
+    "ip-regex" "^2.1.0"
+    "psl" "^1.1.28"
+    "punycode" "^2.1.1"
 
-tr46@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
+"tr46@^2.0.2":
+  "resolved" "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    punycode "^2.1.1"
+    "punycode" "^2.1.1"
 
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+"trim-newlines@^3.0.0":
+  "resolved" "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"
+  "version" "3.0.1"
 
-trim-trailing-lines@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz#7f0739881ff76657b7776e10874128004b625a94"
+"trim-trailing-lines@^1.0.0":
+  "resolved" "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz"
+  "version" "1.1.3"
 
-trim@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
+"trim@0.0.1":
+  "resolved" "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"
+  "version" "0.0.1"
 
-trough@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
+"trough@^1.0.0":
+  "resolved" "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz"
+  "version" "1.0.5"
 
 "true-case-path@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  "resolved" "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz"
+  "version" "1.0.3"
   dependencies:
-    glob "^7.1.2"
+    "glob" "^7.1.2"
 
-tryer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
+"tryer@^1.0.1":
+  "resolved" "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz"
+  "version" "1.0.1"
 
-ts-dedent@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-1.2.0.tgz#6aa2229d837159bb6d635b6b233002423b91e0b0"
+"ts-dedent@^1.1.0":
+  "resolved" "https://registry.npmjs.org/ts-dedent/-/ts-dedent-1.2.0.tgz"
+  "version" "1.2.0"
 
-ts-jest@^26.5.4:
-  version "26.5.4"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.4.tgz#207f4c114812a9c6d5746dd4d1cdf899eafc9686"
-  integrity sha512-I5Qsddo+VTm94SukBJ4cPimOoFZsYTeElR2xy6H2TOVs+NsvgYglW8KuQgKoApOKuaU/Ix/vrF9ebFZlb5D2Pg==
+"ts-jest@^26.5.4":
+  "resolved" "https://registry.npmjs.org/ts-jest/-/ts-jest-26.5.4.tgz"
+  "version" "26.5.4"
   dependencies:
-    bs-logger "0.x"
-    buffer-from "1.x"
-    fast-json-stable-stringify "2.x"
-    jest-util "^26.1.0"
-    json5 "2.x"
-    lodash "4.x"
-    make-error "1.x"
-    mkdirp "1.x"
-    semver "7.x"
-    yargs-parser "20.x"
+    "bs-logger" "0.x"
+    "buffer-from" "1.x"
+    "fast-json-stable-stringify" "2.x"
+    "jest-util" "^26.1.0"
+    "json5" "2.x"
+    "lodash" "4.x"
+    "make-error" "1.x"
+    "mkdirp" "1.x"
+    "semver" "7.x"
+    "yargs-parser" "20.x"
 
-ts-loader@^6.0.4:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.2.2.tgz#dffa3879b01a1a1e0a4b85e2b8421dc0dfff1c58"
+"ts-loader@^6.0.4":
+  "resolved" "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz"
+  "version" "6.2.2"
   dependencies:
-    chalk "^2.3.0"
-    enhanced-resolve "^4.0.0"
-    loader-utils "^1.0.2"
-    micromatch "^4.0.0"
-    semver "^6.0.0"
+    "chalk" "^2.3.0"
+    "enhanced-resolve" "^4.0.0"
+    "loader-utils" "^1.0.2"
+    "micromatch" "^4.0.0"
+    "semver" "^6.0.0"
 
-ts-map@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ts-map/-/ts-map-1.0.3.tgz#1c4d218dec813d2103b7e04e4bcf348e1471c1ff"
+"ts-map@^1.0.3":
+  "resolved" "https://registry.npmjs.org/ts-map/-/ts-map-1.0.3.tgz"
+  "version" "1.0.3"
 
-ts-pnp@1.2.0, ts-pnp@^1.1.2, ts-pnp@^1.1.6:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
+"ts-pnp@^1.1.2", "ts-pnp@^1.1.6", "ts-pnp@1.2.0":
+  "resolved" "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz"
+  "version" "1.2.0"
 
-tsconfig-paths@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
+"tsconfig-paths@^3.9.0":
+  "resolved" "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"
+  "version" "3.9.0"
   dependencies:
     "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
-    minimist "^1.2.0"
-    strip-bom "^3.0.0"
+    "json5" "^1.0.1"
+    "minimist" "^1.2.0"
+    "strip-bom" "^3.0.0"
 
-tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+"tslib@^1.10.0":
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  "version" "1.14.1"
 
-tslib@^2.0.0, tslib@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
+"tslib@^1.8.1":
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  "version" "1.14.1"
 
-tslib@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
-  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
+"tslib@^1.9.0":
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  "version" "1.14.1"
 
-tslib@~1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
+"tslib@^1.9.3":
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  "version" "1.14.1"
 
-tsutils@^3.17.1:
-  version "3.17.1"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
+"tslib@^2.0.0":
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz"
+  "version" "2.0.3"
+
+"tslib@^2.0.1":
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz"
+  "version" "2.0.3"
+
+"tslib@^2.1.0":
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"
+  "version" "2.1.0"
+
+"tslib@~1.13.0":
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"
+  "version" "1.13.0"
+
+"tsutils@^3.17.1":
+  "resolved" "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz"
+  "version" "3.17.1"
   dependencies:
-    tslib "^1.8.1"
+    "tslib" "^1.8.1"
 
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+"tty-browserify@0.0.0":
+  "resolved" "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
+  "version" "0.0.0"
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+"tunnel-agent@^0.6.0":
+  "resolved" "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
+  "version" "0.6.0"
   dependencies:
-    safe-buffer "^5.0.1"
+    "safe-buffer" "^5.0.1"
 
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+"tweetnacl@^0.14.3", "tweetnacl@~0.14.0":
+  "resolved" "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+  "version" "0.14.5"
 
-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+"type-check@^0.4.0":
+  "resolved" "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
+  "version" "0.4.0"
   dependencies:
-    prelude-ls "^1.2.1"
+    "prelude-ls" "^1.2.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+"type-check@~0.3.2":
+  "resolved" "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"
+  "version" "0.3.2"
   dependencies:
-    prelude-ls "~1.1.2"
+    "prelude-ls" "~1.1.2"
 
-type-detect@4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-
-type-fest@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
-
-type-fest@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
-
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-
-type-is@~1.6.17, type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+"type-check@~0.4.0":
+  "resolved" "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
+  "version" "0.4.0"
   dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
+    "prelude-ls" "^1.2.1"
 
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+"type-detect@4.0.8":
+  "resolved" "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
+  "version" "4.0.8"
 
-type@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
+"type-fest@^0.11.0":
+  "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz"
+  "version" "0.11.0"
 
-typed-styles@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
+"type-fest@^0.13.1", "type-fest@^0.8.1":
+  "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"
+  "version" "0.8.1"
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+"type-fest@^0.18.0":
+  "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz"
+  "version" "0.18.1"
+
+"type-fest@^0.3.1":
+  "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz"
+  "version" "0.3.1"
+
+"type-fest@^0.6.0":
+  "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"
+  "version" "0.6.0"
+
+"type-is@~1.6.17", "type-is@~1.6.18":
+  "resolved" "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
+  "version" "1.6.18"
   dependencies:
-    is-typedarray "^1.0.0"
+    "media-typer" "0.3.0"
+    "mime-types" "~2.1.24"
 
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+"type@^1.0.1":
+  "resolved" "https://registry.npmjs.org/type/-/type-1.2.0.tgz"
+  "version" "1.2.0"
 
-typescript-compare@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425"
+"type@^2.0.0":
+  "resolved" "https://registry.npmjs.org/type/-/type-2.1.0.tgz"
+  "version" "2.1.0"
+
+"typed-styles@^0.0.7":
+  "resolved" "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz"
+  "version" "0.0.7"
+
+"typedarray-to-buffer@^3.1.5":
+  "resolved" "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"
+  "version" "3.1.5"
   dependencies:
-    typescript-logic "^0.0.0"
+    "is-typedarray" "^1.0.0"
 
-typescript-logic@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196"
+"typedarray@^0.0.6":
+  "resolved" "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+  "version" "0.0.6"
 
-typescript-tuple@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2"
+"typescript-compare@^0.0.2":
+  "resolved" "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz"
+  "version" "0.0.2"
   dependencies:
-    typescript-compare "^0.0.2"
+    "typescript-logic" "^0.0.0"
 
-typescript@^4.1.3:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
-  integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==
+"typescript-logic@^0.0.0":
+  "resolved" "https://registry.npmjs.org/typescript-logic/-/typescript-logic-0.0.0.tgz"
+  "version" "0.0.0"
 
-ua-parser-js@^0.7.18:
-  version "0.7.22"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3"
-
-unescape-js@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/unescape-js/-/unescape-js-1.1.4.tgz#4bc6389c499cb055a98364a0b3094e1c3d5da395"
+"typescript-tuple@^2.2.1":
+  "resolved" "https://registry.npmjs.org/typescript-tuple/-/typescript-tuple-2.2.1.tgz"
+  "version" "2.2.1"
   dependencies:
-    string.fromcodepoint "^0.2.1"
+    "typescript-compare" "^0.0.2"
 
-unfetch@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
+"typescript@*", "typescript@^3.2.1", "typescript@^4.1.3", "typescript@>= 3.x", "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta", "typescript@>=3.8 <5.0":
+  "resolved" "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz"
+  "version" "4.1.5"
 
-unherit@^1.0.4:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
+"ua-parser-js@^0.7.18":
+  "resolved" "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz"
+  "version" "0.7.22"
+
+"unescape-js@^1.1.4":
+  "resolved" "https://registry.npmjs.org/unescape-js/-/unescape-js-1.1.4.tgz"
+  "version" "1.1.4"
   dependencies:
-    inherits "^2.0.0"
-    xtend "^4.0.0"
+    "string.fromcodepoint" "^0.2.1"
 
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+"unfetch@^4.1.0":
+  "resolved" "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz"
+  "version" "4.2.0"
 
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+"unherit@^1.0.4":
+  "resolved" "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz"
+  "version" "1.1.3"
   dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
+    "inherits" "^2.0.0"
+    "xtend" "^4.0.0"
 
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+"unicode-canonical-property-names-ecmascript@^1.0.4":
+  "resolved" "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"
+  "version" "1.0.4"
 
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
-
-unified@9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8"
+"unicode-match-property-ecmascript@^1.0.4":
+  "resolved" "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"
+  "version" "1.0.4"
   dependencies:
-    bail "^1.0.0"
-    extend "^3.0.0"
-    is-buffer "^2.0.0"
-    is-plain-obj "^2.0.0"
-    trough "^1.0.0"
-    vfile "^4.0.0"
+    "unicode-canonical-property-names-ecmascript" "^1.0.4"
+    "unicode-property-aliases-ecmascript" "^1.0.4"
 
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+"unicode-match-property-value-ecmascript@^1.2.0":
+  "resolved" "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"
+  "version" "1.2.0"
+
+"unicode-property-aliases-ecmascript@^1.0.4":
+  "resolved" "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"
+  "version" "1.1.0"
+
+"unified@9.2.0":
+  "resolved" "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz"
+  "version" "9.2.0"
   dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
+    "bail" "^1.0.0"
+    "extend" "^3.0.0"
+    "is-buffer" "^2.0.0"
+    "is-plain-obj" "^2.0.0"
+    "trough" "^1.0.0"
+    "vfile" "^4.0.0"
 
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-
-uniqs@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+"union-value@^1.0.0":
+  "resolved" "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    unique-slug "^2.0.0"
+    "arr-union" "^3.1.0"
+    "get-value" "^2.0.6"
+    "is-extendable" "^0.1.1"
+    "set-value" "^2.0.1"
 
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+"uniq@^1.0.1":
+  "resolved" "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"
+  "version" "1.0.1"
+
+"uniqs@^2.0.0":
+  "resolved" "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"
+  "version" "2.0.0"
+
+"unique-filename@^1.1.1":
+  "resolved" "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
-    imurmurhash "^0.1.4"
+    "unique-slug" "^2.0.0"
 
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
+"unique-slug@^2.0.0":
+  "resolved" "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    crypto-random-string "^1.0.0"
+    "imurmurhash" "^0.1.4"
 
-unist-builder@2.0.3, unist-builder@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
-
-unist-util-generated@^1.0.0:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.5.tgz#1e903e68467931ebfaea386dae9ea253628acd42"
-
-unist-util-is@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd"
-
-unist-util-is@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.2.tgz#c7d1341188aa9ce5b3cff538958de9895f14a5de"
-
-unist-util-position@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
-
-unist-util-remove-position@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc"
+"unique-string@^1.0.0":
+  "resolved" "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    unist-util-visit "^2.0.0"
+    "crypto-random-string" "^1.0.0"
 
-unist-util-remove@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488"
+"unist-builder@^2.0.0", "unist-builder@2.0.3":
+  "resolved" "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz"
+  "version" "2.0.3"
+
+"unist-util-generated@^1.0.0":
+  "resolved" "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.5.tgz"
+  "version" "1.1.5"
+
+"unist-util-is@^3.0.0":
+  "resolved" "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz"
+  "version" "3.0.0"
+
+"unist-util-is@^4.0.0":
+  "resolved" "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz"
+  "version" "4.0.2"
+
+"unist-util-position@^3.0.0":
+  "resolved" "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz"
+  "version" "3.1.0"
+
+"unist-util-remove-position@^2.0.0":
+  "resolved" "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    unist-util-is "^4.0.0"
+    "unist-util-visit" "^2.0.0"
 
-unist-util-stringify-position@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
+"unist-util-remove@^2.0.0":
+  "resolved" "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.0.tgz"
+  "version" "2.0.0"
+  dependencies:
+    "unist-util-is" "^4.0.0"
+
+"unist-util-stringify-position@^2.0.0":
+  "resolved" "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz"
+  "version" "2.0.3"
   dependencies:
     "@types/unist" "^2.0.2"
 
-unist-util-visit-parents@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9"
+"unist-util-visit-parents@^2.0.0":
+  "resolved" "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz"
+  "version" "2.1.2"
   dependencies:
-    unist-util-is "^3.0.0"
+    "unist-util-is" "^3.0.0"
 
-unist-util-visit-parents@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz#4dd262fb9dcfe44f297d53e882fc6ff3421173d5"
+"unist-util-visit-parents@^3.0.0":
+  "resolved" "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
     "@types/unist" "^2.0.0"
-    unist-util-is "^4.0.0"
+    "unist-util-is" "^4.0.0"
 
-unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
+"unist-util-visit@^1.0.0":
+  "resolved" "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz"
+  "version" "1.4.1"
+  dependencies:
+    "unist-util-visit-parents" "^2.0.0"
+
+"unist-util-visit@^1.4.0":
+  "resolved" "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz"
+  "version" "1.4.1"
+  dependencies:
+    "unist-util-visit-parents" "^2.0.0"
+
+"unist-util-visit@^2.0.0", "unist-util-visit@2.0.3":
+  "resolved" "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz"
+  "version" "2.0.3"
   dependencies:
     "@types/unist" "^2.0.0"
-    unist-util-is "^4.0.0"
-    unist-util-visit-parents "^3.0.0"
+    "unist-util-is" "^4.0.0"
+    "unist-util-visit-parents" "^3.0.0"
 
-unist-util-visit@^1.0.0, unist-util-visit@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"
+"universalify@^0.1.0":
+  "resolved" "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"
+  "version" "0.1.2"
+
+"universalify@^1.0.0":
+  "resolved" "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz"
+  "version" "1.0.0"
+
+"unpipe@~1.0.0", "unpipe@1.0.0":
+  "resolved" "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
+  "version" "1.0.0"
+
+"unquote@^1.1.0", "unquote@~1.1.1":
+  "resolved" "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz"
+  "version" "1.1.1"
+
+"unset-value@^1.0.0":
+  "resolved" "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    unist-util-visit-parents "^2.0.0"
+    "has-value" "^0.3.1"
+    "isobject" "^3.0.0"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+"untildify@^4.0.0":
+  "resolved" "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz"
+  "version" "4.0.0"
 
-universalify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
+"upath@^1.1.1", "upath@^1.1.2", "upath@^1.2.0":
+  "resolved" "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"
+  "version" "1.2.0"
 
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-
-unquote@^1.1.0, unquote@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+"uri-js@^4.2.2":
+  "resolved" "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"
+  "version" "4.4.0"
   dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
+    "punycode" "^2.1.0"
 
-untildify@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+"urix@^0.1.0":
+  "resolved" "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
+  "version" "0.1.0"
 
-upath@^1.1.1, upath@^1.1.2, upath@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
-
-uri-js@^4.2.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
+"url-loader@^2.0.1":
+  "resolved" "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz"
+  "version" "2.3.0"
   dependencies:
-    punycode "^2.1.0"
+    "loader-utils" "^1.2.3"
+    "mime" "^2.4.4"
+    "schema-utils" "^2.5.0"
 
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-
-url-loader@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2"
+"url-loader@4.1.1":
+  "resolved" "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz"
+  "version" "4.1.1"
   dependencies:
-    loader-utils "^2.0.0"
-    mime-types "^2.1.27"
-    schema-utils "^3.0.0"
+    "loader-utils" "^2.0.0"
+    "mime-types" "^2.1.27"
+    "schema-utils" "^3.0.0"
 
-url-loader@^2.0.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz#e0e2ef658f003efb8ca41b0f3ffbf76bab88658b"
+"url-parse@^1.4.3":
+  "resolved" "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"
+  "version" "1.4.7"
   dependencies:
-    loader-utils "^1.2.3"
-    mime "^2.4.4"
-    schema-utils "^2.5.0"
+    "querystringify" "^2.1.1"
+    "requires-port" "^1.0.0"
 
-url-parse@^1.4.3:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
+"url-search-params-polyfill@^8.0.0":
+  "resolved" "https://registry.npmjs.org/url-search-params-polyfill/-/url-search-params-polyfill-8.1.0.tgz"
+  "version" "8.1.0"
+
+"url@^0.11.0":
+  "resolved" "https://registry.npmjs.org/url/-/url-0.11.0.tgz"
+  "version" "0.11.0"
   dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
+    "punycode" "1.3.2"
+    "querystring" "0.2.0"
 
-url-search-params-polyfill@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-8.1.0.tgz#5c15b69687165bfd4f6c7d8a161d70d85385885b"
+"use-callback-ref@^1.2.1":
+  "resolved" "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.2.4.tgz"
+  "version" "1.2.4"
 
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+"use-memo-one@^1.1.1":
+  "resolved" "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.1.tgz"
+  "version" "1.1.1"
+
+"use-sidecar@^1.0.1":
+  "resolved" "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.0.3.tgz"
+  "version" "1.0.3"
   dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
+    "detect-node-es" "^1.0.0"
+    "tslib" "^1.9.3"
 
-use-callback-ref@^1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.4.tgz#d86d1577bfd0b955b6e04aaf5971025f406bea3c"
+"use@^3.1.0":
+  "resolved" "https://registry.npmjs.org/use/-/use-3.1.1.tgz"
+  "version" "3.1.1"
 
-use-memo-one@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.1.tgz#39e6f08fe27e422a7d7b234b5f9056af313bd22c"
+"util-deprecate@^1.0.1", "util-deprecate@^1.0.2", "util-deprecate@~1.0.1":
+  "resolved" "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  "version" "1.0.2"
 
-use-sidecar@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.3.tgz#17a4e567d4830c0c0ee100040e85a7fe68611e0f"
+"util.promisify@^1.0.0", "util.promisify@~1.0.0":
+  "resolved" "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    detect-node-es "^1.0.0"
-    tslib "^1.9.3"
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.2"
+    "has-symbols" "^1.0.1"
+    "object.getownpropertydescriptors" "^2.1.0"
 
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-util.promisify@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+"util.promisify@1.0.0":
+  "resolved" "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
+    "define-properties" "^1.1.2"
+    "object.getownpropertydescriptors" "^2.0.3"
 
-util.promisify@^1.0.0, util.promisify@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
+"util@^0.11.0":
+  "resolved" "https://registry.npmjs.org/util/-/util-0.11.1.tgz"
+  "version" "0.11.1"
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.2"
-    has-symbols "^1.0.1"
-    object.getownpropertydescriptors "^2.1.0"
+    "inherits" "2.0.3"
 
-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+"util@0.10.3":
+  "resolved" "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
+  "version" "0.10.3"
   dependencies:
-    inherits "2.0.1"
+    "inherits" "2.0.1"
 
-util@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
-  dependencies:
-    inherits "2.0.3"
+"utila@^0.4.0", "utila@~0.4":
+  "resolved" "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz"
+  "version" "0.4.0"
 
-utila@^0.4.0, utila@~0.4:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+"utils-merge@1.0.1":
+  "resolved" "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
+  "version" "1.0.1"
 
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+"uuid@^3.1.0", "uuid@^3.3.2", "uuid@^3.4.0":
+  "resolved" "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"
+  "version" "3.4.0"
 
-uuid@^3.1.0, uuid@^3.3.2, uuid@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+"uuid@^7.0.0":
+  "resolved" "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"
+  "version" "7.0.3"
 
-uuid@^7.0.0:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
+"uuid@^8.3.0":
+  "resolved" "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
+  "version" "8.3.2"
 
-uuid@^8.3.0:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+"v8-compile-cache@^2.0.3":
+  "resolved" "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"
+  "version" "2.1.1"
 
-v8-compile-cache@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
-
-v8-to-istanbul@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-6.0.1.tgz#7ef0e32faa10f841fe4c1b0f8de96ed067c0be1e"
+"v8-to-istanbul@^6.0.1":
+  "resolved" "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-6.0.1.tgz"
+  "version" "6.0.1"
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
-    source-map "^0.7.3"
+    "convert-source-map" "^1.6.0"
+    "source-map" "^0.7.3"
 
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+"validate-npm-package-license@^3.0.1":
+  "resolved" "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
+  "version" "3.0.4"
   dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
+    "spdx-correct" "^3.0.0"
+    "spdx-expression-parse" "^3.0.0"
 
-validator@^10.11.0:
-  version "10.11.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
+"validator@^10.11.0":
+  "resolved" "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz"
+  "version" "10.11.0"
 
-value-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
+"value-equal@^1.0.1":
+  "resolved" "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz"
+  "version" "1.0.1"
 
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+"vary@~1.1.2":
+  "resolved" "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
+  "version" "1.1.2"
 
-vendors@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
+"vendors@^1.0.0":
+  "resolved" "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz"
+  "version" "1.0.4"
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+"verror@1.10.0":
+  "resolved" "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"
+  "version" "1.10.0"
   dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
+    "assert-plus" "^1.0.0"
+    "core-util-is" "1.0.2"
+    "extsprintf" "^1.2.0"
 
-vfile-location@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.1.0.tgz#81cd8a04b0ac935185f4fce16f270503fc2f692f"
+"vfile-location@^3.0.0":
+  "resolved" "https://registry.npmjs.org/vfile-location/-/vfile-location-3.1.0.tgz"
+  "version" "3.1.0"
 
-vfile-message@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
+"vfile-message@^2.0.0":
+  "resolved" "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz"
+  "version" "2.0.4"
   dependencies:
     "@types/unist" "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
+    "unist-util-stringify-position" "^2.0.0"
 
-vfile@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz#26c78ac92eb70816b01d4565e003b7e65a2a0e01"
+"vfile@^4.0.0":
+  "resolved" "https://registry.npmjs.org/vfile/-/vfile-4.2.0.tgz"
+  "version" "4.2.0"
   dependencies:
     "@types/unist" "^2.0.0"
-    is-buffer "^2.0.0"
-    replace-ext "1.0.0"
-    unist-util-stringify-position "^2.0.0"
-    vfile-message "^2.0.0"
+    "is-buffer" "^2.0.0"
+    "replace-ext" "1.0.0"
+    "unist-util-stringify-position" "^2.0.0"
+    "vfile-message" "^2.0.0"
 
-vm-browserify@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+"vm-browserify@^1.0.1":
+  "resolved" "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz"
+  "version" "1.1.2"
 
-void-elements@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
+"void-elements@^3.1.0":
+  "resolved" "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz"
+  "version" "3.1.0"
 
-vue-docgen-api@^4.1.0:
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/vue-docgen-api/-/vue-docgen-api-4.33.0.tgz#59630636373ee3f06b0a36820d6235fdb9adfbae"
+"vue-docgen-api@^4.1.0", "vue-docgen-api@>=3":
+  "resolved" "https://registry.npmjs.org/vue-docgen-api/-/vue-docgen-api-4.33.0.tgz"
+  "version" "4.33.0"
   dependencies:
     "@babel/parser" "^7.6.0"
     "@babel/types" "^7.6.0"
     "@vue/compiler-dom" "^3.0.0-rc.6"
     "@vue/compiler-sfc" "^3.0.0-rc.6"
-    ast-types "0.13.3"
-    hash-sum "^1.0.2"
-    lru-cache "^4.1.5"
-    pug "^3.0.0"
-    recast "0.19.1"
-    ts-map "^1.0.3"
-    vue-inbrowser-compiler-utils "^4.33.0"
+    "ast-types" "0.13.3"
+    "hash-sum" "^1.0.2"
+    "lru-cache" "^4.1.5"
+    "pug" "^3.0.0"
+    "recast" "0.19.1"
+    "ts-map" "^1.0.3"
+    "vue-inbrowser-compiler-utils" "^4.33.0"
 
-vue-docgen-loader@^1.3.0-beta.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/vue-docgen-loader/-/vue-docgen-loader-1.5.0.tgz#bf8797ea9dde87a8d734b56176f105477d9bf266"
+"vue-docgen-loader@^1.3.0-beta.0":
+  "resolved" "https://registry.npmjs.org/vue-docgen-loader/-/vue-docgen-loader-1.5.0.tgz"
+  "version" "1.5.0"
   dependencies:
-    clone "^2.1.2"
-    jscodeshift "^0.7.0"
-    loader-utils "^1.2.3"
-    querystring "^0.2.0"
+    "clone" "^2.1.2"
+    "jscodeshift" "^0.7.0"
+    "loader-utils" "^1.2.3"
+    "querystring" "^0.2.0"
 
-vue-inbrowser-compiler-utils@^4.33.0:
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/vue-inbrowser-compiler-utils/-/vue-inbrowser-compiler-utils-4.33.0.tgz#3bb510a7931c62d076a035f71dc31a5329e4e015"
+"vue-inbrowser-compiler-utils@^4.33.0":
+  "resolved" "https://registry.npmjs.org/vue-inbrowser-compiler-utils/-/vue-inbrowser-compiler-utils-4.33.0.tgz"
+  "version" "4.33.0"
   dependencies:
-    camelcase "^5.3.1"
+    "camelcase" "^5.3.1"
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+"w3c-hr-time@^1.0.2":
+  "resolved" "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    browser-process-hrtime "^1.0.0"
+    "browser-process-hrtime" "^1.0.0"
 
-w3c-xmlserializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
+"w3c-xmlserializer@^2.0.0":
+  "resolved" "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    xml-name-validator "^3.0.0"
+    "xml-name-validator" "^3.0.0"
 
-walker@^1.0.7, walker@~1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+"walker@^1.0.7", "walker@~1.0.5":
+  "resolved" "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz"
+  "version" "1.0.7"
   dependencies:
-    makeerror "1.0.x"
+    "makeerror" "1.0.x"
 
-warning@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
+"warning@^3.0.0":
+  "resolved" "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    loose-envify "^1.0.0"
+    "loose-envify" "^1.0.0"
 
-warning@^4.0.2, warning@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
+"warning@^4.0.2", "warning@^4.0.3":
+  "resolved" "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    loose-envify "^1.0.0"
+    "loose-envify" "^1.0.0"
 
-watchpack-chokidar2@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
+"watchpack-chokidar2@^2.0.0":
+  "resolved" "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    chokidar "^2.1.8"
+    "chokidar" "^2.1.8"
 
-watchpack@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b"
+"watchpack@^1.7.4":
+  "resolved" "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz"
+  "version" "1.7.4"
   dependencies:
-    graceful-fs "^4.1.2"
-    neo-async "^2.5.0"
+    "graceful-fs" "^4.1.2"
+    "neo-async" "^2.5.0"
   optionalDependencies:
-    chokidar "^3.4.1"
-    watchpack-chokidar2 "^2.0.0"
+    "chokidar" "^3.4.1"
+    "watchpack-chokidar2" "^2.0.0"
 
-wbuf@^1.1.0, wbuf@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+"wbuf@^1.1.0", "wbuf@^1.7.3":
+  "resolved" "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"
+  "version" "1.7.3"
   dependencies:
-    minimalistic-assert "^1.0.0"
+    "minimalistic-assert" "^1.0.0"
 
-web-namespaces@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec"
+"web-namespaces@^1.0.0":
+  "resolved" "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz"
+  "version" "1.1.4"
 
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+"webidl-conversions@^5.0.0":
+  "resolved" "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"
+  "version" "5.0.0"
 
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+"webidl-conversions@^6.1.0":
+  "resolved" "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz"
+  "version" "6.1.0"
 
-webpack-dev-middleware@^3.7.0, webpack-dev-middleware@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
+"webpack-dev-middleware@^3.7.0", "webpack-dev-middleware@^3.7.2":
+  "resolved" "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"
+  "version" "3.7.2"
   dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.4.4"
-    mkdirp "^0.5.1"
-    range-parser "^1.2.1"
-    webpack-log "^2.0.0"
+    "memory-fs" "^0.4.1"
+    "mime" "^2.4.4"
+    "mkdirp" "^0.5.1"
+    "range-parser" "^1.2.1"
+    "webpack-log" "^2.0.0"
 
-webpack-dev-server@3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
+"webpack-dev-server@3.11.0", "webpack-dev-server@3.x":
+  "resolved" "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"
+  "version" "3.11.0"
   dependencies:
-    ansi-html "0.0.7"
-    bonjour "^3.5.0"
-    chokidar "^2.1.8"
-    compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
-    debug "^4.1.1"
-    del "^4.1.1"
-    express "^4.17.1"
-    html-entities "^1.3.1"
-    http-proxy-middleware "0.19.1"
-    import-local "^2.0.0"
-    internal-ip "^4.3.0"
-    ip "^1.1.5"
-    is-absolute-url "^3.0.3"
-    killable "^1.0.1"
-    loglevel "^1.6.8"
-    opn "^5.5.0"
-    p-retry "^3.0.1"
-    portfinder "^1.0.26"
-    schema-utils "^1.0.0"
-    selfsigned "^1.10.7"
-    semver "^6.3.0"
-    serve-index "^1.9.1"
-    sockjs "0.3.20"
-    sockjs-client "1.4.0"
-    spdy "^4.0.2"
-    strip-ansi "^3.0.1"
-    supports-color "^6.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "^3.7.2"
-    webpack-log "^2.0.0"
-    ws "^6.2.1"
-    yargs "^13.3.2"
+    "ansi-html" "0.0.7"
+    "bonjour" "^3.5.0"
+    "chokidar" "^2.1.8"
+    "compression" "^1.7.4"
+    "connect-history-api-fallback" "^1.6.0"
+    "debug" "^4.1.1"
+    "del" "^4.1.1"
+    "express" "^4.17.1"
+    "html-entities" "^1.3.1"
+    "http-proxy-middleware" "0.19.1"
+    "import-local" "^2.0.0"
+    "internal-ip" "^4.3.0"
+    "ip" "^1.1.5"
+    "is-absolute-url" "^3.0.3"
+    "killable" "^1.0.1"
+    "loglevel" "^1.6.8"
+    "opn" "^5.5.0"
+    "p-retry" "^3.0.1"
+    "portfinder" "^1.0.26"
+    "schema-utils" "^1.0.0"
+    "selfsigned" "^1.10.7"
+    "semver" "^6.3.0"
+    "serve-index" "^1.9.1"
+    "sockjs" "0.3.20"
+    "sockjs-client" "1.4.0"
+    "spdy" "^4.0.2"
+    "strip-ansi" "^3.0.1"
+    "supports-color" "^6.1.0"
+    "url" "^0.11.0"
+    "webpack-dev-middleware" "^3.7.2"
+    "webpack-log" "^2.0.0"
+    "ws" "^6.2.1"
+    "yargs" "^13.3.2"
 
-webpack-hot-middleware@^2.25.0:
-  version "2.25.0"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz#4528a0a63ec37f8f8ef565cf9e534d57d09fe706"
+"webpack-hot-middleware@^2.25.0", "webpack-hot-middleware@2.x":
+  "resolved" "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz"
+  "version" "2.25.0"
   dependencies:
-    ansi-html "0.0.7"
-    html-entities "^1.2.0"
-    querystring "^0.2.0"
-    strip-ansi "^3.0.0"
+    "ansi-html" "0.0.7"
+    "html-entities" "^1.2.0"
+    "querystring" "^0.2.0"
+    "strip-ansi" "^3.0.0"
 
-webpack-log@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d"
+"webpack-log@^1.1.2":
+  "resolved" "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
-    chalk "^2.1.0"
-    log-symbols "^2.1.0"
-    loglevelnext "^1.0.1"
-    uuid "^3.1.0"
+    "chalk" "^2.1.0"
+    "log-symbols" "^2.1.0"
+    "loglevelnext" "^1.0.1"
+    "uuid" "^3.1.0"
 
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+"webpack-log@^2.0.0":
+  "resolved" "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
+    "ansi-colors" "^3.0.0"
+    "uuid" "^3.3.2"
 
-webpack-manifest-plugin@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz#19ca69b435b0baec7e29fbe90fb4015de2de4f16"
+"webpack-manifest-plugin@2.2.0":
+  "resolved" "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"
+  "version" "2.2.0"
   dependencies:
-    fs-extra "^7.0.0"
-    lodash ">=3.5 <5"
-    object.entries "^1.1.0"
-    tapable "^1.0.0"
+    "fs-extra" "^7.0.0"
+    "lodash" ">=3.5 <5"
+    "object.entries" "^1.1.0"
+    "tapable" "^1.0.0"
 
-webpack-merge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
+"webpack-merge@^4.2.2":
+  "resolved" "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"
+  "version" "4.2.2"
   dependencies:
-    lodash "^4.17.15"
+    "lodash" "^4.17.15"
 
-webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+"webpack-sources@^1.1.0", "webpack-sources@^1.3.0", "webpack-sources@^1.4.0", "webpack-sources@^1.4.1", "webpack-sources@^1.4.3":
+  "resolved" "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"
+  "version" "1.4.3"
   dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
+    "source-list-map" "^2.0.0"
+    "source-map" "~0.6.1"
 
-webpack-virtual-modules@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz#20863dc3cb6bb2104729fff951fbe14b18bd0299"
+"webpack-virtual-modules@^0.2.0":
+  "resolved" "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz"
+  "version" "0.2.2"
   dependencies:
-    debug "^3.0.0"
+    "debug" "^3.0.0"
 
-webpack@4.44.2, webpack@^4.33.0, webpack@^4.38.0:
-  version "4.44.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"
+"webpack@^1 || ^2 || ^3 || ^4", "webpack@^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.27.0 || ^5.0.0", "webpack@^4.3.0", "webpack@^4.33.0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.38.0", "webpack@^4.4.0", "webpack@^4.4.0 || ^5.0.0", "webpack@>=2", "webpack@>=4", "webpack@>=4.43.0 <6.0.0", "webpack@2 || 3 || 4", "webpack@4.44.2":
+  "resolved" "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"
+  "version" "4.44.2"
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
     "@webassemblyjs/wasm-edit" "1.9.0"
     "@webassemblyjs/wasm-parser" "1.9.0"
-    acorn "^6.4.1"
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.3.0"
-    eslint-scope "^4.0.3"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.4.0"
-    loader-utils "^1.2.3"
-    memory-fs "^0.4.1"
-    micromatch "^3.1.10"
-    mkdirp "^0.5.3"
-    neo-async "^2.6.1"
-    node-libs-browser "^2.2.1"
-    schema-utils "^1.0.0"
-    tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.3"
-    watchpack "^1.7.4"
-    webpack-sources "^1.4.1"
+    "acorn" "^6.4.1"
+    "ajv" "^6.10.2"
+    "ajv-keywords" "^3.4.1"
+    "chrome-trace-event" "^1.0.2"
+    "enhanced-resolve" "^4.3.0"
+    "eslint-scope" "^4.0.3"
+    "json-parse-better-errors" "^1.0.2"
+    "loader-runner" "^2.4.0"
+    "loader-utils" "^1.2.3"
+    "memory-fs" "^0.4.1"
+    "micromatch" "^3.1.10"
+    "mkdirp" "^0.5.3"
+    "neo-async" "^2.6.1"
+    "node-libs-browser" "^2.2.1"
+    "schema-utils" "^1.0.0"
+    "tapable" "^1.1.3"
+    "terser-webpack-plugin" "^1.4.3"
+    "watchpack" "^1.7.4"
+    "webpack-sources" "^1.4.1"
 
-websocket-driver@0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
+"websocket-driver@>=0.5.1":
+  "resolved" "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
+  "version" "0.7.4"
   dependencies:
-    websocket-extensions ">=0.1.1"
+    "http-parser-js" ">=0.5.1"
+    "safe-buffer" ">=5.1.0"
+    "websocket-extensions" ">=0.1.1"
 
-websocket-driver@>=0.5.1:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+"websocket-driver@0.6.5":
+  "resolved" "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"
+  "version" "0.6.5"
   dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
+    "websocket-extensions" ">=0.1.1"
 
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+"websocket-extensions@>=0.1.1":
+  "resolved" "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"
+  "version" "0.1.4"
 
-whatwg-encoding@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+"whatwg-encoding@^1.0.5":
+  "resolved" "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"
+  "version" "1.0.5"
   dependencies:
-    iconv-lite "0.4.24"
+    "iconv-lite" "0.4.24"
 
-whatwg-fetch@>=0.10.0, whatwg-fetch@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz#e5f871572d6879663fa5674c8f833f15a8425ab3"
+"whatwg-fetch@^3.0.0":
+  "resolved" "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"
+  "version" "3.6.2"
 
-whatwg-mimetype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+"whatwg-fetch@^3.4.1", "whatwg-fetch@>=0.10.0":
+  "resolved" "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"
+  "version" "3.4.1"
 
-whatwg-url@^8.0.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
+"whatwg-mimetype@^2.3.0":
+  "resolved" "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"
+  "version" "2.3.0"
+
+"whatwg-url@^8.0.0":
+  "resolved" "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz"
+  "version" "8.4.0"
   dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^2.0.2"
-    webidl-conversions "^6.1.0"
+    "lodash.sortby" "^4.7.0"
+    "tr46" "^2.0.2"
+    "webidl-conversions" "^6.1.0"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+"which-module@^2.0.0":
+  "resolved" "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"
+  "version" "2.0.0"
 
-which@1, which@1.3.1, which@^1.2.9, which@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+"which@^1.2.9", "which@^1.3.1", "which@1.3.1":
+  "resolved" "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
+  "version" "1.3.1"
   dependencies:
-    isexe "^2.0.0"
+    "isexe" "^2.0.0"
 
-which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+"which@^2.0.1":
+  "resolved" "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    isexe "^2.0.0"
+    "isexe" "^2.0.0"
 
-wide-align@1.1.3, wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+"which@^2.0.2":
+  "resolved" "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    string-width "^1.0.2 || 2"
+    "isexe" "^2.0.0"
 
-widest-line@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
+"wide-align@^1.1.0", "wide-align@1.1.3":
+  "resolved" "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"
+  "version" "1.1.3"
   dependencies:
-    string-width "^4.0.0"
+    "string-width" "^1.0.2 || 2"
 
-wildcard@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-1.1.2.tgz#a7020453084d8cd2efe70ba9d3696263de1710a5"
+"widest-line@^3.1.0":
+  "resolved" "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz"
+  "version" "3.1.0"
+  dependencies:
+    "string-width" "^4.0.0"
 
-with@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/with/-/with-7.0.2.tgz#ccee3ad542d25538a7a7a80aad212b9828495bac"
+"wildcard@^1.1.0":
+  "resolved" "https://registry.npmjs.org/wildcard/-/wildcard-1.1.2.tgz"
+  "version" "1.1.2"
+
+"with@^7.0.0":
+  "resolved" "https://registry.npmjs.org/with/-/with-7.0.2.tgz"
+  "version" "7.0.2"
   dependencies:
     "@babel/parser" "^7.9.6"
     "@babel/types" "^7.9.6"
-    assert-never "^1.2.1"
-    babel-walk "3.0.0-canary-5"
+    "assert-never" "^1.2.1"
+    "babel-walk" "3.0.0-canary-5"
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+"word-wrap@^1.2.3", "word-wrap@~1.2.3":
+  "resolved" "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
+  "version" "1.2.3"
 
-workbox-background-sync@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-5.1.4.tgz#5ae0bbd455f4e9c319e8d827c055bb86c894fd12"
+"workbox-background-sync@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
+    "workbox-core" "^5.1.4"
 
-workbox-broadcast-update@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-5.1.4.tgz#0eeb89170ddca7f6914fa3523fb14462891f2cfc"
+"workbox-broadcast-update@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
+    "workbox-core" "^5.1.4"
 
-workbox-build@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-5.1.4.tgz#23d17ed5c32060c363030c8823b39d0eabf4c8c7"
+"workbox-build@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-build/-/workbox-build-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
     "@babel/core" "^7.8.4"
     "@babel/preset-env" "^7.8.4"
@@ -17675,376 +18356,385 @@ workbox-build@^5.1.4:
     "@rollup/plugin-node-resolve" "^7.1.1"
     "@rollup/plugin-replace" "^2.3.1"
     "@surma/rollup-plugin-off-main-thread" "^1.1.1"
-    common-tags "^1.8.0"
-    fast-json-stable-stringify "^2.1.0"
-    fs-extra "^8.1.0"
-    glob "^7.1.6"
-    lodash.template "^4.5.0"
-    pretty-bytes "^5.3.0"
-    rollup "^1.31.1"
-    rollup-plugin-babel "^4.3.3"
-    rollup-plugin-terser "^5.3.1"
-    source-map "^0.7.3"
-    source-map-url "^0.4.0"
-    stringify-object "^3.3.0"
-    strip-comments "^1.0.2"
-    tempy "^0.3.0"
-    upath "^1.2.0"
-    workbox-background-sync "^5.1.4"
-    workbox-broadcast-update "^5.1.4"
-    workbox-cacheable-response "^5.1.4"
-    workbox-core "^5.1.4"
-    workbox-expiration "^5.1.4"
-    workbox-google-analytics "^5.1.4"
-    workbox-navigation-preload "^5.1.4"
-    workbox-precaching "^5.1.4"
-    workbox-range-requests "^5.1.4"
-    workbox-routing "^5.1.4"
-    workbox-strategies "^5.1.4"
-    workbox-streams "^5.1.4"
-    workbox-sw "^5.1.4"
-    workbox-window "^5.1.4"
+    "common-tags" "^1.8.0"
+    "fast-json-stable-stringify" "^2.1.0"
+    "fs-extra" "^8.1.0"
+    "glob" "^7.1.6"
+    "lodash.template" "^4.5.0"
+    "pretty-bytes" "^5.3.0"
+    "rollup" "^1.31.1"
+    "rollup-plugin-babel" "^4.3.3"
+    "rollup-plugin-terser" "^5.3.1"
+    "source-map" "^0.7.3"
+    "source-map-url" "^0.4.0"
+    "stringify-object" "^3.3.0"
+    "strip-comments" "^1.0.2"
+    "tempy" "^0.3.0"
+    "upath" "^1.2.0"
+    "workbox-background-sync" "^5.1.4"
+    "workbox-broadcast-update" "^5.1.4"
+    "workbox-cacheable-response" "^5.1.4"
+    "workbox-core" "^5.1.4"
+    "workbox-expiration" "^5.1.4"
+    "workbox-google-analytics" "^5.1.4"
+    "workbox-navigation-preload" "^5.1.4"
+    "workbox-precaching" "^5.1.4"
+    "workbox-range-requests" "^5.1.4"
+    "workbox-routing" "^5.1.4"
+    "workbox-strategies" "^5.1.4"
+    "workbox-streams" "^5.1.4"
+    "workbox-sw" "^5.1.4"
+    "workbox-window" "^5.1.4"
 
-workbox-cacheable-response@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-5.1.4.tgz#9ff26e1366214bdd05cf5a43da9305b274078a54"
+"workbox-cacheable-response@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
+    "workbox-core" "^5.1.4"
 
-workbox-core@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4"
+"workbox-core@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-core/-/workbox-core-5.1.4.tgz"
+  "version" "5.1.4"
 
-workbox-expiration@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-5.1.4.tgz#92b5df461e8126114943a3b15c55e4ecb920b163"
+"workbox-expiration@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
+    "workbox-core" "^5.1.4"
 
-workbox-google-analytics@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-5.1.4.tgz#b3376806b1ac7d7df8418304d379707195fa8517"
+"workbox-google-analytics@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-background-sync "^5.1.4"
-    workbox-core "^5.1.4"
-    workbox-routing "^5.1.4"
-    workbox-strategies "^5.1.4"
+    "workbox-background-sync" "^5.1.4"
+    "workbox-core" "^5.1.4"
+    "workbox-routing" "^5.1.4"
+    "workbox-strategies" "^5.1.4"
 
-workbox-navigation-preload@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-5.1.4.tgz#30d1b720d26a05efc5fa11503e5cc1ed5a78902a"
+"workbox-navigation-preload@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
+    "workbox-core" "^5.1.4"
 
-workbox-precaching@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-5.1.4.tgz#874f7ebdd750dd3e04249efae9a1b3f48285fe6b"
+"workbox-precaching@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
+    "workbox-core" "^5.1.4"
 
-workbox-range-requests@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-5.1.4.tgz#7066a12c121df65bf76fdf2b0868016aa2bab859"
+"workbox-range-requests@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
+    "workbox-core" "^5.1.4"
 
-workbox-routing@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-5.1.4.tgz#3e8cd86bd3b6573488d1a2ce7385e547b547e970"
+"workbox-routing@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-routing/-/workbox-routing-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
+    "workbox-core" "^5.1.4"
 
-workbox-strategies@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-5.1.4.tgz#96b1418ccdfde5354612914964074d466c52d08c"
+"workbox-strategies@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
-    workbox-routing "^5.1.4"
+    "workbox-core" "^5.1.4"
+    "workbox-routing" "^5.1.4"
 
-workbox-streams@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-5.1.4.tgz#05754e5e3667bdc078df2c9315b3f41210d8cac0"
+"workbox-streams@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-streams/-/workbox-streams-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
-    workbox-routing "^5.1.4"
+    "workbox-core" "^5.1.4"
+    "workbox-routing" "^5.1.4"
 
-workbox-sw@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-5.1.4.tgz#2bb34c9f7381f90d84cef644816d45150011d3db"
+"workbox-sw@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-sw/-/workbox-sw-5.1.4.tgz"
+  "version" "5.1.4"
 
-workbox-webpack-plugin@5.1.4, workbox-webpack-plugin@^5.1.2:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-5.1.4.tgz#7bfe8c16e40fe9ed8937080ac7ae9c8bde01e79c"
+"workbox-webpack-plugin@^5.1.2", "workbox-webpack-plugin@5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
     "@babel/runtime" "^7.5.5"
-    fast-json-stable-stringify "^2.0.0"
-    source-map-url "^0.4.0"
-    upath "^1.1.2"
-    webpack-sources "^1.3.0"
-    workbox-build "^5.1.4"
+    "fast-json-stable-stringify" "^2.0.0"
+    "source-map-url" "^0.4.0"
+    "upath" "^1.1.2"
+    "webpack-sources" "^1.3.0"
+    "workbox-build" "^5.1.4"
 
-workbox-window@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-5.1.4.tgz#2740f7dea7f93b99326179a62f1cc0ca2c93c863"
+"workbox-window@^5.1.4":
+  "resolved" "https://registry.npmjs.org/workbox-window/-/workbox-window-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    workbox-core "^5.1.4"
+    "workbox-core" "^5.1.4"
 
-worker-farm@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+"worker-farm@^1.7.0":
+  "resolved" "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz"
+  "version" "1.7.0"
   dependencies:
-    errno "~0.1.7"
+    "errno" "~0.1.7"
 
-worker-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac"
+"worker-loader@^2.0.0":
+  "resolved" "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    loader-utils "^1.0.0"
-    schema-utils "^0.4.0"
+    "loader-utils" "^1.0.0"
+    "schema-utils" "^0.4.0"
 
-worker-loader@^3.0.2:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-3.0.4.tgz#bbc0af0af7e2d972c1105001ab215497c00b98ca"
+"worker-loader@^3.0.2":
+  "resolved" "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.4.tgz"
+  "version" "3.0.4"
   dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
+    "loader-utils" "^2.0.0"
+    "schema-utils" "^3.0.0"
 
-worker-rpc@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/worker-rpc/-/worker-rpc-0.1.1.tgz#cb565bd6d7071a8f16660686051e969ad32f54d5"
+"worker-rpc@^0.1.0":
+  "resolved" "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz"
+  "version" "0.1.1"
   dependencies:
-    microevent.ts "~0.1.1"
+    "microevent.ts" "~0.1.1"
 
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
+"wrap-ansi@^3.0.1":
+  "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
+    "string-width" "^2.1.1"
+    "strip-ansi" "^4.0.0"
 
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+"wrap-ansi@^5.1.0":
+  "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"
+  "version" "5.1.0"
   dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
+    "ansi-styles" "^3.2.0"
+    "string-width" "^3.0.0"
+    "strip-ansi" "^5.0.0"
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+"wrap-ansi@^6.2.0":
+  "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
+  "version" "6.2.0"
   dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
+    "ansi-styles" "^4.0.0"
+    "string-width" "^4.1.0"
+    "strip-ansi" "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+"wrap-ansi@^7.0.0":
+  "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
+  "version" "7.0.0"
   dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
+    "ansi-styles" "^4.0.0"
+    "string-width" "^4.1.0"
+    "strip-ansi" "^6.0.0"
 
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+"wrappy@1":
+  "resolved" "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+  "version" "1.0.2"
 
-write-file-atomic@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
+"write-file-atomic@^2.3.0":
+  "resolved" "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz"
+  "version" "2.4.3"
   dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
+    "graceful-fs" "^4.1.11"
+    "imurmurhash" "^0.1.4"
+    "signal-exit" "^3.0.2"
 
-write-file-atomic@^2.3.0:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+"write-file-atomic@^3.0.0":
+  "resolved" "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz"
+  "version" "3.0.3"
   dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
+    "imurmurhash" "^0.1.4"
+    "is-typedarray" "^1.0.0"
+    "signal-exit" "^3.0.2"
+    "typedarray-to-buffer" "^3.1.5"
 
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+"write-file-atomic@2.4.1":
+  "resolved" "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz"
+  "version" "2.4.1"
   dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
+    "graceful-fs" "^4.1.11"
+    "imurmurhash" "^0.1.4"
+    "signal-exit" "^3.0.2"
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+"write@1.0.3":
+  "resolved" "https://registry.npmjs.org/write/-/write-1.0.3.tgz"
+  "version" "1.0.3"
   dependencies:
-    mkdirp "^0.5.1"
+    "mkdirp" "^0.5.1"
 
-ws@^6.1.0, ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+"ws@^6.1.0", "ws@^6.2.1":
+  "resolved" "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz"
+  "version" "6.2.2"
   dependencies:
-    async-limiter "~1.0.0"
+    "async-limiter" "~1.0.0"
 
-ws@^7.2.3:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
+"ws@^7.2.3":
+  "resolved" "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz"
+  "version" "7.4.4"
 
-ws@~7.4.2:
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59"
-  integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==
+"ws@~7.4.2":
+  "resolved" "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz"
+  "version" "7.4.4"
 
-xml-name-validator@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+"xml-name-validator@^3.0.0":
+  "resolved" "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"
+  "version" "3.0.0"
 
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+"xml@^1.0.0":
+  "resolved" "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz"
+  "version" "1.0.1"
 
-xmlchars@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+"xmlchars@^2.2.0":
+  "resolved" "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"
+  "version" "2.2.0"
 
-xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+"xtend@^4.0.0", "xtend@^4.0.1", "xtend@~4.0.1":
+  "resolved" "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
+  "version" "4.0.2"
 
-y18n@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
-  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
+"y18n@^4.0.0":
+  "resolved" "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"
+  "version" "4.0.1"
 
-y18n@^5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
-  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
+"y18n@^5.0.5":
+  "resolved" "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz"
+  "version" "5.0.5"
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+"yallist@^2.1.2":
+  "resolved" "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"
+  "version" "2.1.2"
 
-yallist@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+"yallist@^3.0.2":
+  "resolved" "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"
+  "version" "3.1.1"
 
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+"yallist@^4.0.0":
+  "resolved" "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
+  "version" "4.0.0"
 
-yaml@^1.7.2:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
+"yaml@^1.7.2":
+  "resolved" "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz"
+  "version" "1.10.0"
 
-yargs-parser@13.1.2, yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+"yargs-parser@^13.1.2", "yargs-parser@13.1.2":
+  "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"
+  "version" "13.1.2"
   dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+    "camelcase" "^5.0.0"
+    "decamelize" "^1.2.0"
 
-yargs-parser@20.x, yargs-parser@^20.2.2:
-  version "20.2.7"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
-  integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
-
-yargs-parser@^15.0.1:
-  version "15.0.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3"
+"yargs-parser@^15.0.1":
+  "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz"
+  "version" "15.0.1"
   dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+    "camelcase" "^5.0.0"
+    "decamelize" "^1.2.0"
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+"yargs-parser@^18.1.2":
+  "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"
+  "version" "18.1.3"
   dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+    "camelcase" "^5.0.0"
+    "decamelize" "^1.2.0"
 
-yargs-unparser@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
+"yargs-parser@^20.2.2":
+  "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz"
+  "version" "20.2.7"
+
+"yargs-parser@^20.2.3":
+  "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
+  "version" "20.2.9"
+
+"yargs-parser@20.x":
+  "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz"
+  "version" "20.2.7"
+
+"yargs-unparser@1.6.0":
+  "resolved" "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"
+  "version" "1.6.0"
   dependencies:
-    flat "^4.1.0"
-    lodash "^4.17.15"
-    yargs "^13.3.0"
+    "flat" "^4.1.0"
+    "lodash" "^4.17.15"
+    "yargs" "^13.3.0"
 
-yargs@13.3.2, yargs@^13.2.2, yargs@^13.3.0, yargs@^13.3.2:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+"yargs@^13.2.2", "yargs@^13.3.0", "yargs@^13.3.2", "yargs@13.3.2":
+  "resolved" "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"
+  "version" "13.3.2"
   dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
+    "cliui" "^5.0.0"
+    "find-up" "^3.0.0"
+    "get-caller-file" "^2.0.1"
+    "require-directory" "^2.1.1"
+    "require-main-filename" "^2.0.0"
+    "set-blocking" "^2.0.0"
+    "string-width" "^3.0.0"
+    "which-module" "^2.0.0"
+    "y18n" "^4.0.0"
+    "yargs-parser" "^13.1.2"
 
-yargs@^14.2:
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414"
+"yargs@^14.2":
+  "resolved" "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz"
+  "version" "14.2.3"
   dependencies:
-    cliui "^5.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^15.0.1"
+    "cliui" "^5.0.0"
+    "decamelize" "^1.2.0"
+    "find-up" "^3.0.0"
+    "get-caller-file" "^2.0.1"
+    "require-directory" "^2.1.1"
+    "require-main-filename" "^2.0.0"
+    "set-blocking" "^2.0.0"
+    "string-width" "^3.0.0"
+    "which-module" "^2.0.0"
+    "y18n" "^4.0.0"
+    "yargs-parser" "^15.0.1"
 
-yargs@^15.4.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+"yargs@^15.4.1":
+  "resolved" "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
+  "version" "15.4.1"
   dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
+    "cliui" "^6.0.0"
+    "decamelize" "^1.2.0"
+    "find-up" "^4.1.0"
+    "get-caller-file" "^2.0.1"
+    "require-directory" "^2.1.1"
+    "require-main-filename" "^2.0.0"
+    "set-blocking" "^2.0.0"
+    "string-width" "^4.2.0"
+    "which-module" "^2.0.0"
+    "y18n" "^4.0.0"
+    "yargs-parser" "^18.1.2"
 
-yargs@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+"yargs@^16.2.0":
+  "resolved" "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
+  "version" "16.2.0"
   dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
+    "cliui" "^7.0.2"
+    "escalade" "^3.1.1"
+    "get-caller-file" "^2.0.5"
+    "require-directory" "^2.1.1"
+    "string-width" "^4.2.0"
+    "y18n" "^5.0.5"
+    "yargs-parser" "^20.2.2"
 
-yauzl@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+"yauzl@^2.10.0":
+  "resolved" "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
+  "version" "2.10.0"
   dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
+    "buffer-crc32" "~0.2.3"
+    "fd-slicer" "~1.1.0"
 
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+"yeast@0.1.2":
+  "resolved" "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"
+  "version" "0.1.2"
 
-zwitch@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
+"zipcelx@^1.6.2":
+  "resolved" "https://registry.npmjs.org/zipcelx/-/zipcelx-1.6.2.tgz"
+  "version" "1.6.2"
+  dependencies:
+    "file-saver" "^2.0.0"
+    "jszip" "^3.1.3"
+    "lodash.escape" "^4.0.1"
+
+"zwitch@^1.0.0":
+  "resolved" "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz"
+  "version" "1.0.5"
diff --git a/app/rts/src/server.ts b/app/rts/src/server.ts
index 5e627d7298..7cd1ed3ecf 100644
--- a/app/rts/src/server.ts
+++ b/app/rts/src/server.ts
@@ -233,6 +233,37 @@ async function watchMongoDB(io) {
 		}
 	})
 
+	const notificationsStream = db.collection("notification").watch(
+		[
+			// Prevent server-internal fields from being sent to the client.
+			{
+				$unset: [
+					"deletedAt",
+					"deleted",
+				].map(f => "fullDocument." + f)
+			},
+		],
+		{ fullDocument: "updateLookup" }
+	);
+
+	notificationsStream.on("change", async (event: mongodb.ChangeEventCR) => {
+		console.log("notification event", event)
+		const notification = event.fullDocument
+
+		if (notification == null) {
+			// This happens when `event.operationType === "drop"`, when a notification is deleted.
+			console.error("Null document recieved for notification change event", event)
+			return
+		}
+
+		// set the type from _class attribute
+		notification.type = notification._class.substr(notification._class.lastIndexOf(".") + 1)
+		delete notification._class
+		
+		const eventName = event.operationType + ":" + event.ns.coll
+		io.to("email:" + notification.forUsername).emit(eventName, { notification })
+	})
+
 	process.on("exit", () => {
 		(commentChangeStream != null ? commentChangeStream.close() : Promise.bind(client).resolve())
 			.then(client.close.bind(client))
diff --git a/app/server/.gitignore b/app/server/.gitignore
index 6d1ed7069a..efc8776c80 100644
--- a/app/server/.gitignore
+++ b/app/server/.gitignore
@@ -11,5 +11,6 @@ node_modules
 **/.classpath
 **/.project
 **/.factorypath
+container-volumes
 *.env
 dependency-reduced-pom.xml
diff --git a/app/server/.run/ServerApplication.run.xml b/app/server/.run/ServerApplication.run.xml
index 961dd31c5c..7d0d075ffd 100644
--- a/app/server/.run/ServerApplication.run.xml
+++ b/app/server/.run/ServerApplication.run.xml
@@ -19,4 +19,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component> 
+</component>
\ No newline at end of file
diff --git a/app/server/Dockerfile b/app/server/Dockerfile
index b193784132..25bda26541 100644
--- a/app/server/Dockerfile
+++ b/app/server/Dockerfile
@@ -1,6 +1,6 @@
 #When you are building, name it appsmith-server which is how it is referenced in docker-compose.yml
 
-FROM adoptopenjdk/openjdk11:alpine-jre
+FROM adoptopenjdk/openjdk11:jre-11.0.10_9-alpine
 
 LABEL maintainer="tech@appsmith.com"
 
diff --git a/app/server/README.md b/app/server/README.md
index 29193833b4..135bed1833 100644
--- a/app/server/README.md
+++ b/app/server/README.md
@@ -1,6 +1,39 @@
 # Appsmith Server
 
 This is the server-side repository for the Appsmith framework.
+For details on setting up your development machine, please refer to the [Setup Guide](../../contributions/ServerSetup.md). Alternatively, you can run the server using docker(see the instructions below). 
 
-## Dev Setup
-For details on setting up the server on your development machine, please refer to the [Setup Guide](https://github.com/appsmithorg/appsmith/blob/master/contributions/ServerSetup.md)
+## Run locally with Docker 
+
+You can run the server codebase in a docker container. This is the easiest way to get the server up and running if all you care about is contributing to the client codebase.
+
+### What's in the box
+
+* Appsmith server
+* MongoDB
+* Redis
+
+### Pre-requisites
+
+* [Docker](https://docs.docker.com/get-docker/)
+
+### Steps for setup
+
+1. Clone the Appsmith repository and `cd` into it
+```sh
+git clone https://github.com/appsmithorg/appsmith.git
+cd appsmith
+```
+2. Change your directory to `app/server`
+```sh
+cd app/server
+```
+3. Create a copy of the `envs/docker.env.example`
+```sh
+cp envs/docker.env.example envs/docker.env
+```
+4. Start up the containers
+```sh
+docker-compose up -d
+``` 
+5. Have fun!
diff --git a/app/server/appsmith-interfaces/pom.xml b/app/server/appsmith-interfaces/pom.xml
index 745124bb92..f6b5510ac3 100644
--- a/app/server/appsmith-interfaces/pom.xml
+++ b/app/server/appsmith-interfaces/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.10.7</version>
+            <version>2.9.10.8</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -118,12 +118,12 @@
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.0.18.Final</version>
+            <version>6.0.20.Final</version>
         </dependency>
         <dependency>
             <groupId>net.minidev</groupId>
             <artifactId>json-smart</artifactId>
-            <version>2.3</version>
+            <version>2.4.7</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/annotations/encryption/EncryptionHandler.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/annotations/encryption/EncryptionHandler.java
index c6230b2b12..aac53e06a6 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/annotations/encryption/EncryptionHandler.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/annotations/encryption/EncryptionHandler.java
@@ -53,144 +53,146 @@ public class EncryptionHandler {
 
         // If it is not known, scan each field for annotation or Appsmith type
         List<CandidateField> finalCandidateFields = new ArrayList<>();
-        ReflectionUtils.doWithFields(sourceClass, field -> {
-            if (field.getAnnotation(Encrypted.class) != null) {
-                CandidateField candidateField = new CandidateField(field, CandidateField.Type.ANNOTATED_FIELD);
-                finalCandidateFields.add(candidateField);
-            } else if (AppsmithDomain.class.isAssignableFrom(field.getType())) {
-                CandidateField candidateField = null;
-
-                field.setAccessible(true);
-                Object fieldValue = ReflectionUtils.getField(field, source);
-                if (fieldValue == null) {
-                    if (this.encryptedFieldsMap.containsKey(field.getType())) {
-                        // If this field is null, but the cache has a non-empty list of candidates already,
-                        // then this is an appsmith field with known annotations
-                        candidateField = new CandidateField(field, CandidateField.Type.APPSMITH_FIELD_KNOWN);
-                    } else {
-                        // If it is null and the cache is not aware of the field, this is still a prospect,
-                        // but with an unknown type (could also be polymorphic)
-                        candidateField = new CandidateField(field, CandidateField.Type.APPSMITH_FIELD_UNKNOWN);
-                    }
-                } else {
-                    // If an object exists, check if the object type is the same as the field type
-                    CandidateField.Type appsmithFieldType;
-                    if (field.getType().getCanonicalName().equals(fieldValue.getClass().getCanonicalName())) {
-                        // If they match, then this is going to be an appsmith known field
-                        appsmithFieldType = CandidateField.Type.APPSMITH_FIELD_KNOWN;
-                    } else {
-                        // If not, then this field is polymorphic,
-                        // it will need to be checked for type every time
-                        appsmithFieldType = CandidateField.Type.APPSMITH_FIELD_POLYMORPHIC;
-                    }
-                    // Now, go into field type and repeat
-                    List<CandidateField> candidateFieldsForType = findCandidateFieldsForType(fieldValue);
-
-                    if (appsmithFieldType.equals(CandidateField.Type.APPSMITH_FIELD_POLYMORPHIC)
-                            || !candidateFieldsForType.isEmpty()) {
-                        // This type only qualifies as a candidate if it is polymorphic,
-                        // or has a list of candidates
-                        candidateField = new CandidateField(field, appsmithFieldType);
-                    }
-                }
-
-                field.setAccessible(false);
-                if (candidateField != null) {
-                    // This will only ever be null if the field value is populated,
-                    // and is known to be a non-encryption related field
+        synchronized (sourceClass) {
+            ReflectionUtils.doWithFields(sourceClass, field -> {
+                if (field.getAnnotation(Encrypted.class) != null) {
+                    CandidateField candidateField = new CandidateField(field, CandidateField.Type.ANNOTATED_FIELD);
                     finalCandidateFields.add(candidateField);
-                }
-            } else if (Collection.class.isAssignableFrom(field.getType()) &&
-                    field.getGenericType() instanceof ParameterizedType) {
-                // If this is a collection, check if the Type parameter is an AppsmithDomain
-                Type[] typeArguments;
-                ParameterizedType parameterizedType = (ParameterizedType) field.getGenericType();
-                typeArguments = parameterizedType.getActualTypeArguments();
-                Class<?> subFieldType = (Class<?>) typeArguments[0];
-
-                if (this.encryptedFieldsMap.containsKey(subFieldType)) {
-                    // This is a known type, it should necessarily be of AppsmithDomain type
-                    assert AppsmithDomain.class.isAssignableFrom(subFieldType);
-                    final List<CandidateField> existingSubTypeCandidates = this.encryptedFieldsMap.get(subFieldType);
-                    if (!existingSubTypeCandidates.isEmpty()) {
-                        finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_LIST_KNOWN));
-                    }
-                } else if (AppsmithDomain.class.isAssignableFrom(subFieldType)) {
-                    // If the type is not known, then this is either not parsed yet, or has polymorphic implementations
+                } else if (AppsmithDomain.class.isAssignableFrom(field.getType())) {
+                    CandidateField candidateField = null;
 
                     field.setAccessible(true);
                     Object fieldValue = ReflectionUtils.getField(field, source);
-                    List<?> list = (List<?>) fieldValue;
-
-                    if (list == null || list.isEmpty()) {
-                        finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_LIST_UNKNOWN));
+                    if (fieldValue == null) {
+                        if (this.encryptedFieldsMap.containsKey(field.getType())) {
+                            // If this field is null, but the cache has a non-empty list of candidates already,
+                            // then this is an appsmith field with known annotations
+                            candidateField = new CandidateField(field, CandidateField.Type.APPSMITH_FIELD_KNOWN);
+                        } else {
+                            // If it is null and the cache is not aware of the field, this is still a prospect,
+                            // but with an unknown type (could also be polymorphic)
+                            candidateField = new CandidateField(field, CandidateField.Type.APPSMITH_FIELD_UNKNOWN);
+                        }
                     } else {
-                        for (final Object o : list) {
-                            if (o == null) {
-                                continue;
-                            }
-                            if (o.getClass().getCanonicalName().equals(subFieldType.getTypeName())) {
-                                final List<CandidateField> candidateFieldsForListMember = findCandidateFieldsForType(o);
-                                if (candidateFieldsForListMember != null && !candidateFieldsForListMember.isEmpty()) {
-                                    finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_LIST_KNOWN));
-                                }
-                            } else {
-                                finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_LIST_POLYMORPHIC));
-                            }
-                            break;
+                        // If an object exists, check if the object type is the same as the field type
+                        CandidateField.Type appsmithFieldType;
+                        if (field.getType().getCanonicalName().equals(fieldValue.getClass().getCanonicalName())) {
+                            // If they match, then this is going to be an appsmith known field
+                            appsmithFieldType = CandidateField.Type.APPSMITH_FIELD_KNOWN;
+                        } else {
+                            // If not, then this field is polymorphic,
+                            // it will need to be checked for type every time
+                            appsmithFieldType = CandidateField.Type.APPSMITH_FIELD_POLYMORPHIC;
+                        }
+                        // Now, go into field type and repeat
+                        List<CandidateField> candidateFieldsForType = findCandidateFieldsForType(fieldValue);
+
+                        if (appsmithFieldType.equals(CandidateField.Type.APPSMITH_FIELD_POLYMORPHIC)
+                                || !candidateFieldsForType.isEmpty()) {
+                            // This type only qualifies as a candidate if it is polymorphic,
+                            // or has a list of candidates
+                            candidateField = new CandidateField(field, appsmithFieldType);
                         }
                     }
+
                     field.setAccessible(false);
-
-                }
-                // TODO Add support for nested collections
-            } else if (Map.class.isAssignableFrom(field.getType()) &&
-                    field.getGenericType() instanceof ParameterizedType) {
-                Type[] typeArguments;
-                ParameterizedType parameterizedType = (ParameterizedType) field.getGenericType();
-                typeArguments = parameterizedType.getActualTypeArguments();
-                Class<?> subFieldType = (Class<?>) typeArguments[1];
-
-                if (this.encryptedFieldsMap.containsKey(subFieldType)) {
-                    // This is a known type, it should necessarily be of AppsmithDomain type
-                    assert AppsmithDomain.class.isAssignableFrom(subFieldType);
-                    final List<CandidateField> existingSubTypeCandidates = this.encryptedFieldsMap.get(subFieldType);
-                    if (!existingSubTypeCandidates.isEmpty()) {
-                        finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_MAP_KNOWN));
+                    if (candidateField != null) {
+                        // This will only ever be null if the field value is populated,
+                        // and is known to be a non-encryption related field
+                        finalCandidateFields.add(candidateField);
                     }
-                } else if (AppsmithDomain.class.isAssignableFrom(subFieldType)) {
-                    // If the type is not known, then this is either not parsed yet, or has polymorphic implementations
+                } else if (Collection.class.isAssignableFrom(field.getType()) &&
+                        field.getGenericType() instanceof ParameterizedType) {
+                    // If this is a collection, check if the Type parameter is an AppsmithDomain
+                    Type[] typeArguments;
+                    ParameterizedType parameterizedType = (ParameterizedType) field.getGenericType();
+                    typeArguments = parameterizedType.getActualTypeArguments();
+                    Class<?> subFieldType = (Class<?>) typeArguments[0];
 
-                    field.setAccessible(true);
-                    Object fieldValue = ReflectionUtils.getField(field, source);
-                    Map<?, ?> map = (Map<?, ?>) fieldValue;
-                    if (map == null || map.isEmpty()) {
-                        finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_MAP_UNKNOWN));
-                    } else {
-                        for (Map.Entry<?, ?> entry : map.entrySet()) {
-                            final Object value = entry.getValue();
-                            if (value == null) {
-                                continue;
-                            }
-                            if (value.getClass().getCanonicalName().equals(subFieldType.getTypeName())) {
-                                final List<CandidateField> candidateFieldsForListMember = findCandidateFieldsForType(value);
-                                if (candidateFieldsForListMember != null && !candidateFieldsForListMember.isEmpty()) {
-                                    finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_MAP_KNOWN));
-                                }
-                            } else {
-                                finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_MAP_POLYMORPHIC));
-                            }
-                            break;
+                    if (this.encryptedFieldsMap.containsKey(subFieldType)) {
+                        // This is a known type, it should necessarily be of AppsmithDomain type
+                        assert AppsmithDomain.class.isAssignableFrom(subFieldType);
+                        final List<CandidateField> existingSubTypeCandidates = this.encryptedFieldsMap.get(subFieldType);
+                        if (!existingSubTypeCandidates.isEmpty()) {
+                            finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_LIST_KNOWN));
                         }
-                    }
-                    field.setAccessible(false);
-                }
-            }
+                    } else if (AppsmithDomain.class.isAssignableFrom(subFieldType)) {
+                        // If the type is not known, then this is either not parsed yet, or has polymorphic implementations
 
-        }, field -> field.getAnnotation(Encrypted.class) != null ||
-                AppsmithDomain.class.isAssignableFrom(field.getType()) ||
-                Collection.class.isAssignableFrom(field.getType()) ||
-                Map.class.isAssignableFrom(field.getType()));
+                        field.setAccessible(true);
+                        Object fieldValue = ReflectionUtils.getField(field, source);
+                        List<?> list = (List<?>) fieldValue;
+
+                        if (list == null || list.isEmpty()) {
+                            finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_LIST_UNKNOWN));
+                        } else {
+                            for (final Object o : list) {
+                                if (o == null) {
+                                    continue;
+                                }
+                                if (o.getClass().getCanonicalName().equals(subFieldType.getTypeName())) {
+                                    final List<CandidateField> candidateFieldsForListMember = findCandidateFieldsForType(o);
+                                    if (candidateFieldsForListMember != null && !candidateFieldsForListMember.isEmpty()) {
+                                        finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_LIST_KNOWN));
+                                    }
+                                } else {
+                                    finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_LIST_POLYMORPHIC));
+                                }
+                                break;
+                            }
+                        }
+                        field.setAccessible(false);
+
+                    }
+                    // TODO Add support for nested collections
+                } else if (Map.class.isAssignableFrom(field.getType()) &&
+                        field.getGenericType() instanceof ParameterizedType) {
+                    Type[] typeArguments;
+                    ParameterizedType parameterizedType = (ParameterizedType) field.getGenericType();
+                    typeArguments = parameterizedType.getActualTypeArguments();
+                    Class<?> subFieldType = (Class<?>) typeArguments[1];
+
+                    if (this.encryptedFieldsMap.containsKey(subFieldType)) {
+                        // This is a known type, it should necessarily be of AppsmithDomain type
+                        assert AppsmithDomain.class.isAssignableFrom(subFieldType);
+                        final List<CandidateField> existingSubTypeCandidates = this.encryptedFieldsMap.get(subFieldType);
+                        if (!existingSubTypeCandidates.isEmpty()) {
+                            finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_MAP_KNOWN));
+                        }
+                    } else if (AppsmithDomain.class.isAssignableFrom(subFieldType)) {
+                        // If the type is not known, then this is either not parsed yet, or has polymorphic implementations
+
+                        field.setAccessible(true);
+                        Object fieldValue = ReflectionUtils.getField(field, source);
+                        Map<?, ?> map = (Map<?, ?>) fieldValue;
+                        if (map == null || map.isEmpty()) {
+                            finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_MAP_UNKNOWN));
+                        } else {
+                            for (Map.Entry<?, ?> entry : map.entrySet()) {
+                                final Object value = entry.getValue();
+                                if (value == null) {
+                                    continue;
+                                }
+                                if (value.getClass().getCanonicalName().equals(subFieldType.getTypeName())) {
+                                    final List<CandidateField> candidateFieldsForListMember = findCandidateFieldsForType(value);
+                                    if (candidateFieldsForListMember != null && !candidateFieldsForListMember.isEmpty()) {
+                                        finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_MAP_KNOWN));
+                                    }
+                                } else {
+                                    finalCandidateFields.add(new CandidateField(field, CandidateField.Type.APPSMITH_MAP_POLYMORPHIC));
+                                }
+                                break;
+                            }
+                        }
+                        field.setAccessible(false);
+                    }
+                }
+
+            }, field -> field.getAnnotation(Encrypted.class) != null ||
+                    AppsmithDomain.class.isAssignableFrom(field.getType()) ||
+                    Collection.class.isAssignableFrom(field.getType()) ||
+                    Map.class.isAssignableFrom(field.getType()));
+        }
         // Update cache for next use
         encryptedFieldsMap.put(sourceClass, finalCandidateFields);
 
@@ -198,7 +200,7 @@ public class EncryptionHandler {
         
     }
 
-    boolean convertEncryption(Object source, Function<String, String> transformer) {
+    synchronized boolean convertEncryption(Object source, Function<String, String> transformer) {
         if (source == null) {
             return false;
         }
@@ -294,12 +296,11 @@ public class EncryptionHandler {
                         }
                     }
                 }
-                field.setAccessible(false);
             }
+
+            field.setAccessible(false);
         }
 
         return hasEncryptedFields;
     }
-
-
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/Authentication.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/Authentication.java
index ea08952678..28c2b92a2b 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/Authentication.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/Authentication.java
@@ -5,6 +5,11 @@ public class Authentication {
     // Auth type constants
     public static final String DB_AUTH = "dbAuth";
     public static final String OAUTH2 = "oAuth2";
+    public static final String BASIC = "basic";
+    public static final String API_KEY = "apiKey";
+    public static final String API_KEY_AUTH_TYPE_QUERY_PARAMS = "queryParams";
+    public static final String API_KEY_AUTH_TYPE_HEADER = "header";
+    public static final String BEARER_TOKEN = "bearerToken";
 
     // Request parameter names
     public static final String CLIENT_ID = "client_id";
@@ -22,11 +27,20 @@ public class Authentication {
     public static final String AUTHORIZATION_URL = "authorization_url";
     public static final String ACCESS_TOKEN_URL = "access_token_url";
     public static final String RESPONSE_TYPE = "response_type";
+    public static final String AUDIENCE = "audience";
+    public static final String RESOURCE = "resource";
 
     // Request parameter values
     public static final String AUTHORIZATION_CODE = "authorization_code";
     public static final String CLIENT_CREDENTIALS = "client_credentials";
 
+    // Header names
+    public static final String AUTHORIZATION_HEADER = "Authorization";
+
+    // Other constants
+    public static final String BEARER_HEADER_PREFIX = "Bearer";
+    public static final String BASIC_HEADER_PREFIX = "Basic ";
+
     // Response codes
     public static final String SUCCESS = "success";
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/ExecuteActionDTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/ExecuteActionDTO.java
index 6565a8109c..60d3c0307a 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/ExecuteActionDTO.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/ExecuteActionDTO.java
@@ -4,11 +4,13 @@ import com.appsmith.external.models.PaginationField;
 import com.appsmith.external.models.Param;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.util.List;
 
 @Getter
 @Setter
+@ToString
 public class ExecuteActionDTO {
 
     String actionId;
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/MustacheHelper.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/MustacheHelper.java
index e6ee0eeea6..3dc8147ee7 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/MustacheHelper.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/MustacheHelper.java
@@ -4,18 +4,21 @@ import com.appsmith.external.models.ActionConfiguration;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.text.StringEscapeUtils;
 import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyAccessorFactory;
 import org.springframework.util.StringUtils;
 
 import java.beans.PropertyDescriptor;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -254,56 +257,57 @@ public class MustacheHelper {
         }
     }
 
+    /**
+     * - If object is null, then return object.
+     * - If object is an Appsmith domain object then iterate over all fields of the object and render field values
+     * for each of them.
+     * - If object is list type then iterate over each item in the list and render field value for them.
+     * - If object is map type, then iterate over each value in the map and render field value for them.
+     * - If the object is string type (base case), then do the binding substitution if applicable.
+     * - If the object falls under none of the above conditions then return the object without doing anything.
+     */
     public static <T> T renderFieldValues(T object, Map<String, String> context) {
-        final BeanWrapper sourceBeanWrapper = PropertyAccessorFactory.forBeanPropertyAccess(object);
+        if (object == null) {
+            return object;
+        }
 
-        try {
-
-            for (PropertyDescriptor propertyDescriptor : sourceBeanWrapper.getPropertyDescriptors()) {
-                // For properties like `class` that don't have a set method, just ignore them.
-                if (propertyDescriptor.getWriteMethod() == null) {
-                    continue;
-                }
-
-                String name = propertyDescriptor.getName();
-                Object value = sourceBeanWrapper.getPropertyValue(name);
-
-                // If value is null, don't copy it over to target and just move on to the next property.
-                if (value == null) {
-                    continue;
-                }
-
-                if (isDomainModel(propertyDescriptor.getPropertyType())) {
-                    // Go deeper *only* if the property belongs to Appsmith's models, and both the source and target
-                    // values are not null.
-                    renderFieldValues(value, context);
-
-                } else if (value instanceof List) {
-                    for (Object childValue : (List) value) {
-                        if (childValue != null && isDomainModel(childValue.getClass())) {
-                            renderFieldValues(childValue, context);
-                        }
+        if (isDomainModel(object.getClass())) {
+            try {
+                final BeanWrapper sourceBeanWrapper = PropertyAccessorFactory.forBeanPropertyAccess(object);
+                for (PropertyDescriptor propertyDescriptor : sourceBeanWrapper.getPropertyDescriptors()) {
+                    // For properties like `class` that don't have a set method, just ignore them.
+                    if (propertyDescriptor.getWriteMethod() == null) {
+                        continue;
                     }
 
-                } else if (value instanceof Map) {
-                    for (Object childValue : ((Map) value).values()) {
-                        if (childValue != null && isDomainModel(childValue.getClass())) {
-                            renderFieldValues(childValue, context);
-                        }
-                    }
-
-                } else if (value instanceof String) {
-                    sourceBeanWrapper.setPropertyValue(
-                            name,
-                            render((String) value, context)
-                    );
-
+                    String name = propertyDescriptor.getName();
+                    Object value = sourceBeanWrapper.getPropertyValue(name);
+                    sourceBeanWrapper.setPropertyValue(name, renderFieldValues(value, context));
                 }
+            } catch (BeansException e) {
+                log.error("Exception caught while substituting values in mustache template.", e);
+            }
+        } else if (object instanceof List) {
+            List renderedList = new ArrayList();
+            for (Object childValue : (List) object) {
+                renderedList.add(renderFieldValues(childValue, context));
             }
 
-        } catch (Exception e) {
-            log.error("Exception caught while substituting values in mustache template.", e);
+            return (T) renderedList;
 
+        } else if (object instanceof Map) {
+            Map renderedMap = new HashMap();
+            for (Object entry : ((Map)object).entrySet()) {
+                renderedMap.put(
+                        ((Map.Entry) entry).getKey(), // key
+                        renderFieldValues(((Map.Entry) entry).getValue(), context) // value
+                );
+            }
+
+            return (T) renderedMap;
+
+        } else if (object instanceof String) {
+            return (T) render((String) object, context);
         }
 
         return object;
@@ -367,6 +371,21 @@ public class MustacheHelper {
         return body;
     }
 
+    public static String replaceQuestionMarkWithDollarIndex(String query) {
+        final AtomicInteger counter = new AtomicInteger();
+        String updatedQuery = query.chars()
+                .mapToObj(c -> {
+                    if (c == '?') {
+                        return "$" + counter.incrementAndGet();
+                    }
+
+                    return Character.toString(c);
+                })
+                .collect(Collectors.joining());
+
+        return updatedQuery;
+    }
+
     public static Boolean laxIsBindingPresentInString(String input) {
         return laxMustacheBindingPattern.matcher(input).find();
     }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/PluginUtils.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/PluginUtils.java
index 9c129b1150..bc953b7e5d 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/PluginUtils.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/PluginUtils.java
@@ -50,4 +50,8 @@ public class PluginUtils {
     public static String getActionConfigurationPropertyPath(int index) {
         return "actionConfiguration.pluginSpecifiedTemplates[" + index + "].value";
     }
+
+    public static String getPSParamLabel(int i) {
+        return "$" + i;
+    }
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionExecutionRequest.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionExecutionRequest.java
index d24f3d343a..665aa55add 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionExecutionRequest.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionExecutionRequest.java
@@ -1,5 +1,6 @@
 package com.appsmith.external.models;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -16,12 +17,14 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 public class ActionExecutionRequest {
-    String query;
+    @JsonIgnore
+    String query; // Only used for analytics. Not to be returned back to the client.
     Object body;
     Object headers;
     HttpMethod httpMethod;
     String url;
-    Map<String, ?> properties;
+    @JsonIgnore
+    Map<String, ?> properties; // Only used for analytics. Not to be returned back to the client.
     List<String> executionParameters;
-    List<RequestParamDTO> requestParams;
+    Object requestParams;
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionExecutionResult.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionExecutionResult.java
index a744609693..ff47ab7088 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionExecutionResult.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionExecutionResult.java
@@ -33,6 +33,8 @@ public class ActionExecutionResult {
 
     List<ParsedDataType> dataTypes;
 
+    List<WidgetType> suggestedWidgets;
+
     public void setErrorInfo(Throwable error) {
         this.body = error.getMessage();
 
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApiKeyAuth.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApiKeyAuth.java
new file mode 100644
index 0000000000..0d01f05077
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApiKeyAuth.java
@@ -0,0 +1,36 @@
+package com.appsmith.external.models;
+
+import com.appsmith.external.annotations.documenttype.DocumentType;
+import com.appsmith.external.annotations.encryption.Encrypted;
+import com.appsmith.external.constants.Authentication;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Builder
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@DocumentType(Authentication.API_KEY)
+public class ApiKeyAuth extends AuthenticationDTO {
+
+    public enum Type {
+        @JsonProperty(Authentication.API_KEY_AUTH_TYPE_QUERY_PARAMS)
+        QUERY_PARAMS,
+        @JsonProperty(Authentication.API_KEY_AUTH_TYPE_HEADER)
+        HEADER,
+    }
+
+    Type addTo;
+    String label;
+
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @Encrypted
+    String value;
+}
\ No newline at end of file
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/AuthenticationDTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/AuthenticationDTO.java
index d0d335d3f0..423da04b3f 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/AuthenticationDTO.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/AuthenticationDTO.java
@@ -1,6 +1,5 @@
 package com.appsmith.external.models;
 
-import com.appsmith.external.annotations.encryption.Encrypted;
 import com.appsmith.external.constants.Authentication;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
@@ -11,8 +10,6 @@ import lombok.Setter;
 import org.springframework.data.annotation.Transient;
 import reactor.core.publisher.Mono;
 
-import java.util.Collections;
-import java.util.Map;
 import java.util.Set;
 
 @Getter
@@ -25,7 +22,11 @@ import java.util.Set;
         defaultImpl = DBAuth.class)
 @JsonSubTypes({
         @JsonSubTypes.Type(value = DBAuth.class, name = Authentication.DB_AUTH),
-        @JsonSubTypes.Type(value = OAuth2.class, name = Authentication.OAUTH2)
+        @JsonSubTypes.Type(value = OAuth2.class, name = Authentication.OAUTH2),
+        @JsonSubTypes.Type(value = BasicAuth.class, name = Authentication.BASIC),
+        @JsonSubTypes.Type(value = BasicAuth.class, name = Authentication.BASIC),
+        @JsonSubTypes.Type(value = ApiKeyAuth.class, name = Authentication.API_KEY),
+        @JsonSubTypes.Type(value = BearerTokenAuth.class, name = Authentication.BEARER_TOKEN)
 })
 public class AuthenticationDTO implements AppsmithDomain {
     // In principle, this class should've been abstract. However, when this class is abstract, Spring's deserialization
@@ -45,33 +46,11 @@ public class AuthenticationDTO implements AppsmithDomain {
 
     Set<Property> customAuthenticationParameters;
 
-    @JsonIgnore
-    private Boolean isEncrypted;
-
     private Boolean isAuthorized;
 
     @JsonIgnore
     AuthenticationResponse authenticationResponse;
 
-    @JsonIgnore
-    public Map<String, String> getEncryptionFields() {
-        return Collections.emptyMap();
-    }
-
-    public void setEncryptionFields(Map<String, String> encryptedFields) {
-        // This is supposed to be overridden by implementations.
-    }
-
-    @JsonIgnore
-    public Set<String> getEmptyEncryptionFields() {
-        return Collections.emptySet();
-    }
-
-    @JsonIgnore
-    public Boolean isEncrypted() {
-        return this.isEncrypted;
-    }
-
     public Mono<Boolean> hasExpired() {
         return Mono.just(Boolean.FALSE);
     }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/AuthenticationResponse.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/AuthenticationResponse.java
index 2f4c1416a5..8e305203f6 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/AuthenticationResponse.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/AuthenticationResponse.java
@@ -1,5 +1,6 @@
 package com.appsmith.external.models;
 
+import com.appsmith.external.annotations.encryption.Encrypted;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -14,13 +15,17 @@ import java.time.Instant;
 @NoArgsConstructor
 @AllArgsConstructor
 public class AuthenticationResponse implements AppsmithDomain {
+
+    @Encrypted
     String token;
 
+    @Encrypted
     String refreshToken;
 
     Instant issuedAt;
 
     Instant expiresAt;
 
+    @Encrypted
     Object tokenResponse;
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BasicAuth.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BasicAuth.java
new file mode 100644
index 0000000000..243ba06fcb
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BasicAuth.java
@@ -0,0 +1,26 @@
+package com.appsmith.external.models;
+
+import com.appsmith.external.annotations.documenttype.DocumentType;
+import com.appsmith.external.annotations.encryption.Encrypted;
+import com.appsmith.external.constants.Authentication;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@DocumentType(Authentication.BASIC)
+public class BasicAuth extends AuthenticationDTO {
+
+    String username;
+
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @Encrypted
+    String password;
+}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BearerTokenAuth.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BearerTokenAuth.java
new file mode 100644
index 0000000000..a025eb79ed
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BearerTokenAuth.java
@@ -0,0 +1,24 @@
+package com.appsmith.external.models;
+
+import com.appsmith.external.annotations.documenttype.DocumentType;
+import com.appsmith.external.annotations.encryption.Encrypted;
+import com.appsmith.external.constants.Authentication;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@DocumentType(Authentication.BEARER_TOKEN)
+public class BearerTokenAuth extends AuthenticationDTO {
+
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @Encrypted
+    String bearerToken;
+}
\ No newline at end of file
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DBAuth.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DBAuth.java
index bd8c2d1ddc..b0785b1765 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DBAuth.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DBAuth.java
@@ -1,8 +1,8 @@
 package com.appsmith.external.models;
 
 import com.appsmith.external.annotations.documenttype.DocumentType;
+import com.appsmith.external.annotations.encryption.Encrypted;
 import com.appsmith.external.constants.Authentication;
-import com.appsmith.external.constants.FieldName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -10,9 +10,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.Map;
-import java.util.Set;
-
 @Getter
 @Setter
 @ToString
@@ -29,31 +26,9 @@ public class DBAuth extends AuthenticationDTO {
 
     String username;
 
+    @Encrypted
     @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     String password;
 
     String databaseName;
-
-    @Override
-    public Map<String, String> getEncryptionFields() {
-        if (this.password != null && !this.password.isBlank()) {
-            return Map.of(FieldName.PASSWORD, this.password);
-        }
-        return Map.of();
-    }
-
-    @Override
-    public void setEncryptionFields(Map<String, String> encryptedFields) {
-        if (encryptedFields != null && encryptedFields.containsKey(FieldName.PASSWORD)) {
-            this.password = encryptedFields.get(FieldName.PASSWORD);
-        }
-    }
-
-    @Override
-    public Set<String> getEmptyEncryptionFields() {
-        if (this.password == null || this.password.isBlank()) {
-            return Set.of(FieldName.PASSWORD);
-        }
-        return Set.of();
-    }
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceConfiguration.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceConfiguration.java
index 687b906cc0..d1be13f4ea 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceConfiguration.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceConfiguration.java
@@ -3,17 +3,21 @@ package com.appsmith.external.models;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Setter;
 import lombok.ToString;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.List;
 
+@Builder(toBuilder = true)
 @Getter
 @Setter
 @ToString
 @EqualsAndHashCode
 @NoArgsConstructor
+@AllArgsConstructor
 @Document
 public class DatasourceConfiguration implements AppsmithDomain {
 
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceStructure.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceStructure.java
index cc88bd52a7..2c4ee693ac 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceStructure.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceStructure.java
@@ -2,10 +2,12 @@ package com.appsmith.external.models;
 
 import com.appsmith.external.exceptions.BaseException;
 import com.appsmith.external.exceptions.ErrorDTO;
+import com.google.gson.InstanceCreator;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.lang.reflect.Type;
 import java.util.List;
 
 @Data
@@ -30,6 +32,7 @@ public class DatasourceStructure {
     @AllArgsConstructor
     public static class Table {
         TableType type;
+        String schema;
         String name;
         List<Column> columns;
         List<Key> keys;
@@ -104,6 +107,7 @@ public class DatasourceStructure {
     public static class Template {
         String title;
         String body;
+        List<Property> pluginSpecifiedTemplates;
     }
 
     ErrorDTO error;
@@ -116,4 +120,22 @@ public class DatasourceStructure {
             this.error.setCode(((BaseException)error).getAppErrorCode());
         }
     }
+    
+    /**
+     * Instance creator is required while de-serialising using Gson as key instance can't be invoked with
+     * no-args constructor
+     */
+    public static class KeyInstanceCreator implements InstanceCreator<Key> {
+        @Override
+        public Key createInstance(Type type) {
+            Key key = new Key() {
+                @Override
+                public String getType() {
+                    return null;
+                }
+            };
+            return key;
+        }
+    }
+    
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DecryptedSensitiveFields.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DecryptedSensitiveFields.java
new file mode 100644
index 0000000000..6b6a64bb3f
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DecryptedSensitiveFields.java
@@ -0,0 +1,39 @@
+package com.appsmith.external.models;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * This class hold sensitive information, and fields that have a `@JsonIgnore` on them, so that such information
+ * can be serialized when an application is exported.
+ */
+@ToString
+@Getter
+@Setter
+@NoArgsConstructor
+public class DecryptedSensitiveFields {
+    
+    String password;
+    
+    String token;
+    
+    String refreshToken;
+    
+    Object tokenResponse;
+    
+    String authType;
+    
+    DBAuth dbAuth;
+    
+    BasicAuth basicAuth;
+    
+    OAuth2 openAuth2;
+    
+    public DecryptedSensitiveFields(AuthenticationResponse authResponse) {
+        this.token = authResponse.getToken();
+        this.refreshToken = authResponse.getRefreshToken();
+        this.tokenResponse = authResponse.getTokenResponse();
+    }
+}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/OAuth2.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/OAuth2.java
index e9f73e521a..96c35dedb4 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/OAuth2.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/OAuth2.java
@@ -1,8 +1,8 @@
 package com.appsmith.external.models;
 
 import com.appsmith.external.annotations.documenttype.DocumentType;
+import com.appsmith.external.annotations.encryption.Encrypted;
 import com.appsmith.external.constants.Authentication;
-import com.appsmith.external.constants.FieldName;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -18,9 +18,6 @@ import reactor.core.publisher.Mono;
 
 import java.time.Instant;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -46,6 +43,7 @@ public class OAuth2 extends AuthenticationDTO {
 
     String clientId;
 
+    @Encrypted
     @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     String clientSecret;
 
@@ -62,6 +60,10 @@ public class OAuth2 extends AuthenticationDTO {
 
     Set<Property> customTokenParameters;
 
+    String audience;
+
+    String resource;
+
     public String getScopeString() {
         if (scopeString != null && !scopeString.isBlank()) {
             return scopeString;
@@ -80,64 +82,6 @@ public class OAuth2 extends AuthenticationDTO {
         }
     }
 
-    @Override
-    public Map<String, String> getEncryptionFields() {
-        Map<String, String> map = new HashMap<>();
-        if (this.clientSecret != null) {
-            map.put(FieldName.CLIENT_SECRET, this.clientSecret);
-        }
-        if (this.getAuthenticationResponse() != null) {
-            if (this.authenticationResponse.getToken() != null) {
-                map.put(FieldName.TOKEN, this.authenticationResponse.getToken());
-            }
-            if (this.authenticationResponse.getRefreshToken() != null) {
-                map.put(FieldName.REFRESH_TOKEN, this.authenticationResponse.getRefreshToken());
-            }
-            if (this.authenticationResponse.getTokenResponse() != null) {
-                map.put(FieldName.TOKEN_RESPONSE, String.valueOf(this.authenticationResponse.getTokenResponse()));
-            }
-        }
-        return map;
-    }
-
-    @Override
-    public void setEncryptionFields(Map<String, String> encryptedFields) {
-        if (encryptedFields != null) {
-            if (encryptedFields.containsKey(FieldName.CLIENT_SECRET)) {
-                this.clientSecret = encryptedFields.get(FieldName.CLIENT_SECRET);
-            }
-            if (encryptedFields.containsKey(FieldName.TOKEN)) {
-                this.authenticationResponse.setToken(encryptedFields.get(FieldName.TOKEN));
-            }
-            if (encryptedFields.containsKey(FieldName.REFRESH_TOKEN)) {
-                this.authenticationResponse.setRefreshToken(encryptedFields.get(FieldName.REFRESH_TOKEN));
-            }
-            if (encryptedFields.containsKey(FieldName.TOKEN_RESPONSE)) {
-                this.authenticationResponse.setTokenResponse(encryptedFields.get(FieldName.TOKEN_RESPONSE));
-            }
-        }
-    }
-
-    @Override
-    public Set<String> getEmptyEncryptionFields() {
-        Set<String> set = new HashSet<>();
-        if (this.clientSecret == null || this.clientSecret.isEmpty()) {
-            set.add(FieldName.CLIENT_SECRET);
-        }
-        if (this.getAuthenticationResponse() != null) {
-            if (this.authenticationResponse.getToken() == null || this.authenticationResponse.getToken().isEmpty()) {
-                set.add(FieldName.TOKEN);
-            }
-            if (this.authenticationResponse.getRefreshToken() == null || this.authenticationResponse.getRefreshToken().isEmpty()) {
-                set.add(FieldName.REFRESH_TOKEN);
-            }
-            if (this.authenticationResponse.getTokenResponse() == null || (String.valueOf(this.authenticationResponse.getTokenResponse())).isEmpty()) {
-                set.add(FieldName.TOKEN_RESPONSE);
-            }
-        }
-        return set;
-    }
-
     @Override
     public Mono<Boolean> hasExpired() {
         if (this.authenticationResponse == null) {
@@ -146,6 +90,11 @@ public class OAuth2 extends AuthenticationDTO {
                     "Expected datasource to have valid authentication tokens at this point"));
         }
 
+        if (this.authenticationResponse.expiresAt == null) {
+            // If the token did not return with an expiry time, assume that it has always expired
+            return Mono.just(Boolean.TRUE);
+        }
+
         return Mono.just(authenticationResponse.expiresAt.isBefore(Instant.now().plusSeconds(60)));
     }
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Param.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Param.java
index 2e4d8278eb..5c4bb9234e 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Param.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Param.java
@@ -1,10 +1,14 @@
 package com.appsmith.external.models;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
+@ToString
 public class Param {
 
     String key;
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/PsParameterDTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/PsParameterDTO.java
new file mode 100644
index 0000000000..a268a99516
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/PsParameterDTO.java
@@ -0,0 +1,17 @@
+package com.appsmith.external.models;
+
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@JsonPropertyOrder({"value", "type"})
+public class PsParameterDTO {
+    String value;
+    String type;
+}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/RequestParamDTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/RequestParamDTO.java
index 64f25c1dea..7dcaa3d507 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/RequestParamDTO.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/RequestParamDTO.java
@@ -1,21 +1,27 @@
 package com.appsmith.external.models;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
 import java.util.List;
+import java.util.Map;
 
 @Setter
 @Getter
 @ToString
 @AllArgsConstructor
+@JsonPropertyOrder({"value", "psParams", "types", "label", "configProperty"})
 public class RequestParamDTO {
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @JsonIgnore
     private String configProperty; // Only meant for internal use. It won't be returned back to the client.
     private Object value;
-    private String label;
-    private List<ParsedDataType> types;
+    @JsonIgnore
+    private String label; // Only meant for internal use. It is returned as key for the RequestParamDTO object.
+    @JsonIgnore
+    private List<ParsedDataType> types; // Not getting used for now but still keeping it here for future use.
+    private Map<String, Object> substitutedParams;
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSLDetails.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSLDetails.java
index bd73608ccc..326a23538e 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSLDetails.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSLDetails.java
@@ -34,8 +34,21 @@ public class SSLDetails {
         CA_CERTIFICATE, SELF_SIGNED_CERTIFICATE
     }
 
+    public enum CACertificateType {
+        // In case user does not want to provide any certificate
+        NONE,
+
+        // Provide CA Certificate file
+        FILE,
+
+        // Some services provide CA certificate as a base64 encoded string instead of a file.
+        BASE64_STRING
+    }
+
     AuthType authType;
 
+    CACertificateType caCertificateType;
+
     UploadedFile keyFile;
 
     UploadedFile certificateFile;
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/UploadedFile.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/UploadedFile.java
index 38d7a36a20..93cc661edc 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/UploadedFile.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/UploadedFile.java
@@ -8,7 +8,6 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
-import reactor.core.publisher.Mono;
 
 import java.util.Base64;
 
@@ -20,14 +19,24 @@ import java.util.Base64;
 @AllArgsConstructor
 public class UploadedFile {
 
+    private static final String BASE64_DELIMITER = ";base64,";
+
     String name;
 
     @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     String base64Content;
 
     @JsonIgnore
-    public Mono<String> getDecodedContent() {
-        return Mono.just(new String(Base64.getDecoder().decode(base64Content)));
+    public byte[] getDecodedContent() {
+        if (base64Content == null) {
+            return null;
+        }
+
+        if (base64Content.contains(BASE64_DELIMITER)) {
+            return Base64.getDecoder().decode(base64Content.split(BASE64_DELIMITER)[1]);
+        }
+
+        return Base64.getDecoder().decode(base64Content);
     }
 
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/WidgetType.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/WidgetType.java
new file mode 100644
index 0000000000..9dad852b0f
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/WidgetType.java
@@ -0,0 +1,5 @@
+package com.appsmith.external.models;
+
+public enum WidgetType {
+    TEXT_WIDGET, LIST_WIDGET, DROP_DOWN_WIDGET, CHART_WIDGET, TABLE_WIDGET, INPUT_WIDGET
+}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/SmartSubstitutionInterface.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/SmartSubstitutionInterface.java
index 9f0a88aa4f..42fc69c946 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/SmartSubstitutionInterface.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/SmartSubstitutionInterface.java
@@ -50,7 +50,8 @@ public interface SmartSubstitutionInterface {
 
     // Default implementation does not do any substitution. The plugin doing intelligent substitution is responsible
     // for overriding this function.
-    default Object substituteValueInInput(int index, String binding, String value, Object input, List<Map.Entry<String, String>> insertedParams, Object... args) throws AppsmithPluginException {
+    default Object substituteValueInInput(int index, String binding, String value, Object input,
+                                          List<Map.Entry<String, String>> insertedParams, Object... args) throws AppsmithPluginException {
         return input;
     }
 }
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/plugins/AmazonS3Plugin.java b/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/plugins/AmazonS3Plugin.java
index fc4f5b2c62..c0eceed4b2 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/plugins/AmazonS3Plugin.java
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/plugins/AmazonS3Plugin.java
@@ -325,7 +325,7 @@ public class AmazonS3Plugin extends BasePlugin {
                 query[0] = s3Action.name();
 
                 requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(ACTION_PROPERTY_INDEX),
-                        properties.get(ACTION_PROPERTY_INDEX).getValue(), null, null));
+                        properties.get(ACTION_PROPERTY_INDEX).getValue(), null, null, null));
 
                 if (properties.size() < (1 + BUCKET_NAME_PROPERTY_INDEX)
                         || properties.get(BUCKET_NAME_PROPERTY_INDEX) == null) {
@@ -341,7 +341,7 @@ public class AmazonS3Plugin extends BasePlugin {
                 final String bucketName = (String) properties.get(BUCKET_NAME_PROPERTY_INDEX).getValue();
                 requestProperties.put("bucket", bucketName == null ? "" : bucketName);
                 requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(BUCKET_NAME_PROPERTY_INDEX),
-                        bucketName, null, null));
+                        bucketName, null, null, null));
 
                 if (StringUtils.isEmpty(bucketName)) {
                     return Mono.error(
@@ -390,7 +390,7 @@ public class AmazonS3Plugin extends BasePlugin {
                             prefix = (String) properties.get(PREFIX_PROPERTY_INDEX).getValue();
                         }
                         requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(PREFIX_PROPERTY_INDEX),
-                                prefix, null, null));
+                                prefix, null, null, null));
 
                         ArrayList<String> listOfFiles = listAllFilesInBucket(connection, bucketName, prefix);
 
@@ -398,7 +398,7 @@ public class AmazonS3Plugin extends BasePlugin {
                                 && properties.get(GET_SIGNED_URL_PROPERTY_INDEX) != null
                                 && properties.get(GET_SIGNED_URL_PROPERTY_INDEX).getValue().equals(YES)) {
                             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(GET_SIGNED_URL_PROPERTY_INDEX), YES, null,
-                                    null));
+                                    null, null));
 
                             int durationInMinutes;
                             if (properties.size() < (1 + URL_EXPIRY_DURATION_PROPERTY_INDEX)
@@ -424,7 +424,7 @@ public class AmazonS3Plugin extends BasePlugin {
                                 }
                             }
                             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(URL_EXPIRY_DURATION_PROPERTY_INDEX),
-                                    durationInMinutes, null, null));
+                                    durationInMinutes, null, null, null));
 
                             Calendar calendar = Calendar.getInstance();
                             calendar.add(Calendar.MINUTE, durationInMinutes);
@@ -455,7 +455,7 @@ public class AmazonS3Plugin extends BasePlugin {
                             }
                         } else {
                             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(GET_SIGNED_URL_PROPERTY_INDEX),
-                                    "", null, null));
+                                    "", null, null, null));
                             actionResult = new ArrayList<>();
                             for (int i = 0; i < listOfFiles.size(); i++) {
                                 HashMap<String, Object> fileInfo = new HashMap<>();
@@ -465,7 +465,7 @@ public class AmazonS3Plugin extends BasePlugin {
                         }
                         break;
                     case UPLOAD_FILE_FROM_BODY:
-                        requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null));
+                        requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
 
                         int durationInMinutes;
                         if (properties.size() < (1 + URL_EXPIRY_DURATION_FOR_UPLOAD_PROPERTY_INDEX)
@@ -503,11 +503,11 @@ public class AmazonS3Plugin extends BasePlugin {
                                 && properties.get(USING_FILEPICKER_FOR_UPLOAD_PROPERTY_INDEX) != null
                                 && properties.get(USING_FILEPICKER_FOR_UPLOAD_PROPERTY_INDEX).getValue().equals(YES)) {
                             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(USING_FILEPICKER_FOR_UPLOAD_PROPERTY_INDEX), "Base64",
-                                    null, null));
+                                    null, null, null));
                             signedUrl = uploadFileFromBody(connection, bucketName, path, body, true, expiryDateTime);
                         } else {
                             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(USING_FILEPICKER_FOR_UPLOAD_PROPERTY_INDEX),
-                                    "Text / Binary", null, null));
+                                    "Text / Binary", null, null, null));
                             signedUrl = uploadFileFromBody(connection, bucketName, path, body, false, expiryDateTime);
                         }
                         actionResult = new HashMap<String, Object>();
@@ -515,28 +515,28 @@ public class AmazonS3Plugin extends BasePlugin {
                         ((HashMap<String, Object>) actionResult).put("urlExpiryDate", expiryDateTimeString);
 
                         requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(URL_EXPIRY_DURATION_FOR_UPLOAD_PROPERTY_INDEX),
-                                expiryDateTimeString, null, null));
-                        requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  body, null, null));
+                                expiryDateTimeString, null, null, null));
+                        requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  body, null, null, null));
                         break;
                     case READ_FILE:
-                        requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null));
+                        requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
 
                         String result;
                         if (properties.size() > READ_WITH_BASE64_ENCODING_PROPERTY_INDEX
                                 && properties.get(READ_WITH_BASE64_ENCODING_PROPERTY_INDEX) != null
                                 && properties.get(READ_WITH_BASE64_ENCODING_PROPERTY_INDEX).getValue().equals(YES)) {
                             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(READ_WITH_BASE64_ENCODING_PROPERTY_INDEX),
-                                    YES, null, null));
+                                    YES, null, null, null));
                             result = readFile(connection, bucketName, path, true);
                         } else {
                             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(READ_WITH_BASE64_ENCODING_PROPERTY_INDEX),
-                                    NO, null, null));
+                                    NO, null, null, null));
                             result = readFile(connection, bucketName, path, false);
                         }
                         actionResult = Map.of("fileData", result);
                         break;
                     case DELETE_FILE:
-                        requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null));
+                        requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
 
                         /*
                          * - If attempting to delete an object that does not exist, Amazon S3 returns a success message
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/test/java/com/external/plugins/AmazonS3PluginTest.java b/app/server/appsmith-plugins/amazons3Plugin/src/test/java/com/external/plugins/AmazonS3PluginTest.java
index 7cc02be40d..13351f39d2 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/test/java/com/external/plugins/AmazonS3PluginTest.java
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/test/java/com/external/plugins/AmazonS3PluginTest.java
@@ -419,12 +419,12 @@ public class AmazonS3PluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
-                            "UPLOAD_FILE_FROM_BODY", null, null)); // Action
+                            "UPLOAD_FILE_FROM_BODY", null, null, null)); // Action
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(1), "bucket_name",
-                            null, null)); // Bucket name
-                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, dummyPath, null, null)); // Path
+                            null, null, null)); // Bucket name
+                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, dummyPath, null, null, null)); // Path
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(6), "Base64", null,
-                            null)); // File data type
+                            null, null)); // File data type
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -520,12 +520,12 @@ public class AmazonS3PluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0), "READ_FILE",
-                            null, null)); // Action
+                            null, null, null)); // Action
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(1), "bucket_name",
-                            null, null)); // Bucket name
-                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, dummyPath, null, null)); // Path
+                            null, null, null)); // Bucket name
+                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, dummyPath, null, null, null)); // Path
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(5), "YES", null,
-                            null)); // Base64 encode file
+                            null, null)); // Base64 encode file
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -568,10 +568,10 @@ public class AmazonS3PluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0), "DELETE_FILE",
-                            null, null)); // Action
+                            null, null, null)); // Action
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(1), "bucket_name",
-                            null, null)); // Bucket name
-                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, dummyPath, null, null)); // Path
+                            null, null, null)); // Bucket name
+                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, dummyPath, null, null, null)); // Path
                     assertEquals(result.getRequest().getRequestParams().toString(),
                             expectedRequestParams.toString());
                 })
@@ -800,15 +800,15 @@ public class AmazonS3PluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0), "LIST", null
-                            , null)); // Action
+                            , null, null)); // Action
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(1), "bucket_name",
-                            null, null)); // Bucket name
+                            null, null, null)); // Bucket name
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(4), "", null,
-                            null)); // Prefix
+                            null, null)); // Prefix
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(2), "YES", null,
-                            null)); // Generate signed URL
+                            null, null)); // Generate signed URL
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(3), "5", null,
-                            null)); // Expiry duration
+                            null, null)); // Expiry duration
                     assertEquals(result.getRequest().getRequestParams().toString(),
                             expectedRequestParams.toString());
                 })
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/plugin.properties b/app/server/appsmith-plugins/arangoDBPlugin/plugin.properties
new file mode 100644
index 0000000000..705334d194
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/plugin.properties
@@ -0,0 +1,5 @@
+plugin.id=arangodb-plugin
+plugin.class=com.external.plugins.ArangoDBPlugin
+plugin.version=1.0-SNAPSHOT
+plugin.provider=tech@appsmith.com
+plugin.dependencies=
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/pom.xml b/app/server/appsmith-plugins/arangoDBPlugin/pom.xml
new file mode 100644
index 0000000000..a0eaf4a419
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/pom.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.external.plugins</groupId>
+    <artifactId>arangodbPlugin</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <name>arangodbPlugin</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>11</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <plugin.id>arangodb-plugin</plugin.id>
+        <plugin.class>com.external.plugins.ArangoDBPlugin</plugin.class>
+        <plugin.version>1.0-SNAPSHOT</plugin.version>
+        <plugin.provider>tech@appsmith.com</plugin.provider>
+        <plugin.dependencies/>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.pf4j</groupId>
+            <artifactId>pf4j-spring</artifactId>
+            <version>0.6.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.appsmith</groupId>
+            <artifactId>interfaces</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.8</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.arangodb</groupId>
+            <artifactId>arangodb-java-driver</artifactId>
+            <version>6.12.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.3</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+
+        <dependency>
+            <groupId>com.github.goodforgod</groupId>
+            <artifactId>arangodb-testcontainer</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <version>3.3.5.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>1.15.0-rc2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <configuration>
+                    <minimizeJar>false</minimizeJar>
+                    <transformers>
+                        <transformer
+                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <manifestEntries>
+                                <Plugin-Id>${plugin.id}</Plugin-Id>
+                                <Plugin-Class>${plugin.class}</Plugin-Class>
+                                <Plugin-Version>${plugin.version}</Plugin-Version>
+                                <Plugin-Provider>${plugin.provider}</Plugin-Provider>
+                            </manifestEntries>
+                        </transformer>
+                    </transformers>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeScope>runtime</includeScope>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/plugins/ArangoDBPlugin.java b/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/plugins/ArangoDBPlugin.java
new file mode 100644
index 0000000000..07c6bf4196
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/plugins/ArangoDBPlugin.java
@@ -0,0 +1,353 @@
+package com.external.plugins;
+
+import com.appsmith.external.exceptions.pluginExceptions.StaleConnectionException;
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.ActionExecutionRequest;
+import com.appsmith.external.models.ActionExecutionResult;
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.DatasourceTestResult;
+import com.appsmith.external.models.Endpoint;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.appsmith.external.models.RequestParamDTO;
+import com.appsmith.external.models.SSLDetails;
+import com.appsmith.external.plugins.BasePlugin;
+import com.appsmith.external.plugins.PluginExecutor;
+import com.arangodb.ArangoCursor;
+import com.arangodb.ArangoDB.Builder;
+import com.arangodb.ArangoDBException;
+import com.arangodb.ArangoDatabase;
+import com.arangodb.Protocol;
+import com.arangodb.entity.CollectionEntity;
+import com.arangodb.model.CollectionsReadOptions;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.ObjectUtils;
+import org.pf4j.Extension;
+import org.pf4j.PluginWrapper;
+import org.pf4j.util.StringUtils;
+import org.springframework.util.CollectionUtils;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
+import reactor.core.scheduler.Schedulers;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
+import static com.external.utils.SSLUtils.isCaCertificateAvailable;
+import static com.external.utils.SSLUtils.setSSLContext;
+import static com.external.utils.SSLUtils.setSSLParam;
+import static com.external.utils.StructureUtils.generateTemplatesAndStructureForACollection;
+import static com.external.utils.StructureUtils.getOneDocumentQuery;
+
+public class ArangoDBPlugin extends BasePlugin {
+
+    private static long DEFAULT_PORT = 8529L;
+
+    public ArangoDBPlugin(PluginWrapper wrapper) {
+        super(wrapper);
+    }
+
+    @Slf4j
+    @Extension
+    public static class ArangoDBPluginExecutor implements PluginExecutor<ArangoDatabase> {
+
+        private final Scheduler scheduler = Schedulers.elastic();
+
+        @Override
+        public Mono<ActionExecutionResult> execute(ArangoDatabase db,
+                                                   DatasourceConfiguration datasourceConfiguration,
+                                                   ActionConfiguration actionConfiguration) {
+
+            if (!isConnectionValid(db)) {
+                return Mono.error(new StaleConnectionException());
+            }
+
+            String query = actionConfiguration.getBody();
+            List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
+                    query, null, null, null));
+            if (StringUtils.isNullOrEmpty(query)) {
+                return Mono.error(
+                        new AppsmithPluginException(
+                                AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
+                                "Missing required parameter: Query."
+                        )
+                );
+            }
+
+            return Mono.fromCallable(() -> {
+                ArangoCursor<Map> cursor = db.query(query, null, null, Map.class);
+                List<Map> docList = new ArrayList<>();
+                docList.addAll(cursor.asListRemaining());
+                ActionExecutionResult result = new ActionExecutionResult();
+                result.setBody(objectMapper.valueToTree(docList));
+                result.setIsExecutionSuccess(true);
+                System.out.println(Thread.currentThread().getName() + ": In the ArangoDBPlugin, got action execution result");
+                return result;
+            })
+                    .onErrorResume(error -> {
+                        ActionExecutionResult result = new ActionExecutionResult();
+                        result.setIsExecutionSuccess(false);
+                        result.setErrorInfo(error);
+                        return Mono.just(result);
+                    })
+                    // Now set the request in the result to be returned back to the server
+                    .flatMap(actionExecutionResult -> {
+                        ActionExecutionRequest request = new ActionExecutionRequest();
+                        request.setQuery(query);
+                        request.setRequestParams(requestParams);
+                        actionExecutionResult.setRequest(request);
+                        return Mono.just(actionExecutionResult);
+                    })
+                    .subscribeOn(scheduler);
+        }
+
+        /**
+         * - ArangoDatabase object does not seem to provide any API to check if connection object is valid, hence
+         * adding only null check for now.
+         */
+        private boolean isConnectionValid(ArangoDatabase db) {
+            if (db == null) {
+                return false;
+            }
+
+            return true;
+        }
+
+
+        @Override
+        public Mono<ArangoDatabase> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+
+            return (Mono<ArangoDatabase>) Mono.fromCallable(() -> {
+
+                List<Endpoint> nonEmptyEndpoints = datasourceConfiguration.getEndpoints().stream()
+                        .filter(endpoint -> isNonEmptyEndpoint(endpoint))
+                        .collect(Collectors.toList());
+
+                DBAuth auth = (DBAuth) datasourceConfiguration.getAuthentication();
+                Builder dbBuilder = getBasicBuilder(auth);
+                nonEmptyEndpoints.stream()
+                        .forEach(endpoint -> {
+                            String host = endpoint.getHost();
+                            int port = (int) (long) ObjectUtils.defaultIfNull(endpoint.getPort(), DEFAULT_PORT);
+                            dbBuilder.host(host, port);
+                        });
+
+                /**
+                 * - datasource.connection, datasource.connection.ssl, datasource.connection.ssl.authType objects
+                 * are never expected to be null because form.json always assigns a default value to authType object.
+                 */
+                SSLDetails.AuthType sslAuthType = datasourceConfiguration.getConnection().getSsl().getAuthType();
+                try {
+                    setSSLParam(dbBuilder, sslAuthType);
+                } catch (AppsmithPluginException e) {
+                    return Mono.error(e);
+                }
+
+                try {
+                    setSSLContext(dbBuilder, datasourceConfiguration);
+                } catch (AppsmithPluginException e) {
+                    return Mono.error(e);
+                }
+
+                String dbName = auth.getDatabaseName();
+
+                /**
+                 * - This instance is thread safe as ArangoDatabase has in-built connection pooling.
+                 * - src: https://www.arangodb.com/docs/stable/drivers/java-reference-setup.html
+                 */
+                return Mono.just(dbBuilder.build().db(dbName));
+            })
+                    .flatMap(obj -> obj)
+                    .subscribeOn(scheduler);
+        }
+
+        /**
+         * - Builder properties are explained here:
+         * https://www.arangodb.com/docs/stable/drivers/java-reference-setup.html
+         */
+        private Builder getBasicBuilder(DBAuth auth) {
+            String username = auth.getUsername();
+            String password = auth.getPassword();
+            Builder dbBuilder = new Builder()
+                    .maxConnections(5)
+                    .user(username)
+                    .password(password)
+                    .useProtocol(Protocol.HTTP_VPACK);
+
+            return dbBuilder;
+        }
+
+        private boolean isNonEmptyEndpoint(Endpoint endpoint) {
+            if (endpoint != null && StringUtils.isNotNullOrEmpty(endpoint.getHost())) {
+                return true;
+            }
+
+            return false;
+        }
+
+        private boolean isAuthenticationMissing(DBAuth auth) {
+            if (auth == null
+                    || StringUtils.isNullOrEmpty(auth.getUsername())
+                    || StringUtils.isNullOrEmpty(auth.getPassword())
+                    || StringUtils.isNullOrEmpty(auth.getDatabaseName())) {
+                return true;
+            }
+
+            return false;
+        }
+
+        @Override
+        public void datasourceDestroy(ArangoDatabase db) {
+            db.arango().shutdown();
+        }
+
+        @Override
+        public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            Set<String> invalids = new HashSet<>();
+
+            DBAuth auth = (DBAuth) datasourceConfiguration.getAuthentication();
+            if (isAuthenticationMissing(auth)) {
+               invalids.add(
+                       "Could not find required authentication info. At least one of 'Username', 'Password', " +
+                               "'Database Name' fields is missing. Please edit the 'Username', 'Password' and " +
+                               "'Database Name' fields to provide authentication info."
+               );
+            }
+
+            if (!isEndpointAvailable(datasourceConfiguration.getEndpoints())) {
+                invalids.add(
+                        "Could not find host address. Please edit the 'Host Address' field to provide the desired " +
+                                "endpoint."
+                );
+            }
+
+            SSLDetails.CACertificateType caCertificateType = datasourceConfiguration.getConnection().getSsl()
+                    .getCaCertificateType();
+            if (!SSLDetails.CACertificateType.NONE.equals(caCertificateType)
+                    && !isCaCertificateAvailable(datasourceConfiguration)) {
+                    invalids.add("Could not find CA certificate. Please provide a CA certificate.");
+            }
+
+            return invalids;
+        }
+
+        /**
+         * - Check if at least one non-null / non-empty endpoint is available.
+         */
+        private boolean isEndpointAvailable(List<Endpoint> endpoints) {
+            // Check if the list of endpoints is null or empty.
+            if (CollectionUtils.isEmpty(endpoints)) {
+                return false;
+            }
+
+            List<Endpoint> nonEmptyEndpoints = endpoints.stream()
+                    .filter(endpoint -> isNonEmptyEndpoint(endpoint))
+                    .collect(Collectors.toList());
+
+            // Check if at least one endpoint in the list is non-null and non-empty.
+            if (CollectionUtils.isEmpty(nonEmptyEndpoints)) {
+                return false;
+            }
+
+            return true;
+        }
+
+        @Override
+        public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
+            return datasourceCreate(datasourceConfiguration)
+                    .map(db -> {
+                        db.getVersion();
+
+                        if (db != null) {
+                            db.arango().shutdown();
+                        }
+
+                        return new DatasourceTestResult();
+                    })
+                    .onErrorResume(error -> {
+                        log.error("Error when testing ArangoDB datasource.", error);
+                        return Mono.just(new DatasourceTestResult(error.getMessage()));
+                    })
+                    .subscribeOn(scheduler);
+        }
+
+        @Override
+        public Mono<DatasourceStructure> getStructure(ArangoDatabase db, DatasourceConfiguration datasourceConfiguration) {
+            final DatasourceStructure structure = new DatasourceStructure();
+            List<DatasourceStructure.Table> tables = new ArrayList<>();
+            structure.setTables(tables);
+
+            CollectionsReadOptions options = new CollectionsReadOptions();
+            options.excludeSystem(true);
+            Collection<CollectionEntity> collections;
+            try {
+                collections = db.getCollections(options);
+            } catch (ArangoDBException e) {
+                return Mono.error(
+                        new AppsmithPluginException(
+                                AppsmithPluginError.PLUGIN_GET_STRUCTURE_ERROR,
+                                "Appsmith server has failed to fetch list of collections from database. Please check " +
+                                        "if the database credentials are valid and/or you have the required " +
+                                        "permissions."
+                        )
+                );
+            }
+
+            return Flux.fromIterable(collections)
+                    .filter(collectionEntity -> !collectionEntity.getIsSystem())
+                    .flatMap(collectionEntity -> {
+                        final ArrayList<DatasourceStructure.Column> columns = new ArrayList<>();
+                        final ArrayList<DatasourceStructure.Template> templates = new ArrayList<>();
+                        final String collectionName = collectionEntity.getName();
+                        tables.add(
+                                new DatasourceStructure.Table(
+                                        DatasourceStructure.TableType.COLLECTION,
+                                        null,
+                                        collectionName,
+                                        columns,
+                                        new ArrayList<>(),
+                                        templates
+                                )
+                        );
+
+                        ArangoCursor<Map> cursor = db.query(getOneDocumentQuery(collectionName), null, null, Map.class);
+                        Map document = new HashMap();
+                        List<Map> docList = cursor.asListRemaining();
+                        if (!CollectionUtils.isEmpty(docList)) {
+                            document = docList.get(0);
+                        }
+
+                        return Mono.zip(
+                                Mono.just(columns),
+                                Mono.just(templates),
+                                Mono.just(collectionName),
+                                Mono.just(document)
+                        );
+                    })
+                    .flatMap(tuple -> {
+                        final ArrayList<DatasourceStructure.Column> columns = tuple.getT1();
+                        final ArrayList<DatasourceStructure.Template> templates = tuple.getT2();
+                        String collectionName = tuple.getT3();
+                        Map document = tuple.getT4();
+
+                        generateTemplatesAndStructureForACollection(collectionName, document, columns,
+                                templates);
+
+                        return Mono.just(structure);
+                    })
+                    .collectList()
+                    .thenReturn(structure)
+                    .subscribeOn(scheduler);
+        }
+    }
+}
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/utils/SSLUtils.java b/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/utils/SSLUtils.java
new file mode 100644
index 0000000000..a76a8d92f3
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/utils/SSLUtils.java
@@ -0,0 +1,119 @@
+package com.external.utils;
+
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.SSLDetails;
+import com.arangodb.ArangoDB.Builder;
+import org.pf4j.util.StringUtils;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+
+public class SSLUtils {
+
+    private static final String X_509_TYPE = "X.509";
+    private static final String CERT_ALIAS = "caCert";
+    private static final String SSL_PROTOCOL = "TLS";
+
+    public static SSLContext getSslContext(DatasourceConfiguration datasourceConfiguration) throws CertificateException
+            , KeyStoreException, IOException, NoSuchAlgorithmException, KeyManagementException {
+        InputStream certificateIs =
+                new ByteArrayInputStream(datasourceConfiguration.getConnection().getSsl()
+                        .getCaCertificateFile().getDecodedContent());
+        CertificateFactory certificateFactory = CertificateFactory.getInstance(X_509_TYPE);
+        X509Certificate caCertificate =
+                (X509Certificate) certificateFactory.generateCertificate(certificateIs);
+
+        KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+        keyStore.load(null);
+        keyStore.setCertificateEntry(CERT_ALIAS, caCertificate);
+
+        TrustManagerFactory trustManagerFactory =
+                TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        trustManagerFactory.init(keyStore);
+
+        SSLContext sslContext = SSLContext.getInstance(SSL_PROTOCOL);
+        sslContext.init(null, trustManagerFactory.getTrustManagers(), null);
+
+        return sslContext;
+    }
+
+    public static boolean isCaCertificateAvailable(DatasourceConfiguration datasourceConfiguration) {
+        if (datasourceConfiguration.getConnection() != null
+                && datasourceConfiguration.getConnection().getSsl() != null
+                && datasourceConfiguration.getConnection().getSsl().getCaCertificateFile() != null
+                && StringUtils.isNotNullOrEmpty(datasourceConfiguration.getConnection().getSsl()
+                .getCaCertificateFile().getBase64Content())) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public static void setSSLParam(Builder builder, SSLDetails.AuthType authType) {
+        switch (authType) {
+            case DEFAULT:
+                /* do nothing i.e. use default driver setting */
+
+                break;
+            case ENABLED:
+                builder.useSsl(true);
+
+                break;
+            case DISABLED:
+                builder.useSsl(false);
+
+                break;
+            default:
+                throw new AppsmithPluginException(
+                        AppsmithPluginError.PLUGIN_ERROR,
+                        "Appsmith server has found an unexpected SSL option: " + authType + ". Please reach " +
+                                "out to Appsmith customer support to resolve this."
+                );
+        }
+    }
+
+    public static void setSSLContext(Builder builder, DatasourceConfiguration datasourceConfiguration) {
+
+        SSLDetails.CACertificateType caCertificateType = datasourceConfiguration.getConnection().getSsl()
+                .getCaCertificateType();
+
+        switch (caCertificateType) {
+            case NONE:
+                /* do nothing */
+
+                break;
+            case FILE:
+            case BASE64_STRING:
+                try {
+                    builder.sslContext(getSslContext(datasourceConfiguration));
+                } catch (CertificateException | KeyStoreException | IOException | NoSuchAlgorithmException
+                        | KeyManagementException e) {
+                    throw new AppsmithPluginException(
+                            AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR,
+                            "Appsmith server encountered an error when getting ssl context. Please contact Appsmith " +
+                                    "customer support to resolve this."
+                    );
+                }
+
+                break;
+            default:
+                throw new AppsmithPluginException(
+                        AppsmithPluginError.PLUGIN_ERROR,
+                        "Appsmith server has found an unexpected CA certificate option: " + caCertificateType + ". " +
+                        "Please reach out to Appsmith customer support to resolve this."
+                );
+        }
+    }
+}
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/utils/StructureUtils.java b/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/utils/StructureUtils.java
new file mode 100644
index 0000000000..23536bc8e5
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/utils/StructureUtils.java
@@ -0,0 +1,142 @@
+package com.external.utils;
+
+import com.appsmith.external.models.DatasourceStructure;
+import org.bson.types.Decimal128;
+import org.bson.types.ObjectId;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class StructureUtils {
+
+    public static void generateTemplatesAndStructureForACollection(String collectionName,
+                                                            Map document,
+                                                            ArrayList<DatasourceStructure.Column> columns,
+                                                            ArrayList<DatasourceStructure.Template> templates) {
+
+        for (Object entry : document.entrySet()) {
+            final String name = ((Map.Entry<String, Object>) entry).getKey();
+            final Object value = ((Map.Entry<String, Object>) entry).getValue();
+            String type;
+
+            if (value instanceof Integer) {
+                type = "Integer";
+            } else if (value instanceof Long) {
+                type = "Long";
+            } else if (value instanceof Double) {
+                type = "Double";
+            } else if (value instanceof Decimal128) {
+                type = "BigDecimal";
+            } else if (value instanceof String) {
+                type = "String";
+            } else if (value instanceof ObjectId) {
+                type = "ObjectId";
+            } else if (value instanceof Collection) {
+                type = "Array";
+            } else if (value instanceof Date) {
+                type = "Date";
+            } else {
+                type = "Object";
+            }
+
+            columns.add(new DatasourceStructure.Column(name, type, null));
+        }
+
+        columns.sort(Comparator.naturalOrder());
+
+        Map<String, Object> templateConfiguration = new HashMap<>();
+        templateConfiguration.put("collectionName", collectionName);
+        templateConfiguration.put("sampleValues", document);
+        templates.addAll(generateTemplate(templateConfiguration));
+    }
+
+    private static List<DatasourceStructure.Template> generateTemplate(Map<String, Object> templateConfiguration) {
+        List templates = new ArrayList();
+        templates.add(generateSelectTemplate(templateConfiguration));
+        templates.add(generateCreateTemplate(templateConfiguration));
+        templates.add(generateUpdateTemplate(templateConfiguration));
+        templates.add(generateRemoveTemplate(templateConfiguration));
+
+        return templates;
+    }
+
+    private static DatasourceStructure.Template generateSelectTemplate(Map<String, Object> templateConfiguration) {
+        String collectionName = (String) templateConfiguration.get("collectionName");
+        Map<String, String> sampleValues = (Map<String, String>) templateConfiguration.get("sampleValues");
+        String filterKey = "_key";
+        String filterValue = sampleValues.get("_key");
+
+        String rawQuery = "FOR document IN " + collectionName + "\n" +
+                "FILTER " + "document." + filterKey + " == \"" + filterValue + "\"\n" +
+                "RETURN document";
+
+        return new DatasourceStructure.Template(
+                "Select",
+                rawQuery,
+                null
+        );
+    }
+
+    private static DatasourceStructure.Template generateCreateTemplate(Map<String, Object> templateConfiguration) {
+        String collectionName = (String) templateConfiguration.get("collectionName");
+
+        String rawQuery = "INSERT \n" +
+                "{\n" +
+                "    insertKey: \"insertValue\"\n" +
+                "}\n" +
+                "INTO " + collectionName;
+
+        return new DatasourceStructure.Template(
+                "Create",
+                rawQuery,
+                null
+        );
+    }
+
+    private static DatasourceStructure.Template generateUpdateTemplate(Map<String, Object> templateConfiguration) {
+        String collectionName = (String) templateConfiguration.get("collectionName");
+        Map<String, String> sampleValues = (Map<String, String>) templateConfiguration.get("sampleValues");
+        String filterKey = "_key";
+        String filterValue = sampleValues.get("_key");
+
+        String rawQuery = "UPDATE\n" +
+                "{\n" +
+                "    " + filterKey + ": \"" + filterValue + "\"\n" +
+                "}\n" +
+                "WITH\n" +
+                "{\n" +
+                "    updateKey: \"updateVal\"\n" +
+                "}\n" +
+                "IN " + collectionName;
+
+        return new DatasourceStructure.Template(
+                "Update",
+                rawQuery,
+                null
+        );
+    }
+
+    private static DatasourceStructure.Template generateRemoveTemplate(Map<String, Object> templateConfiguration) {
+        String collectionName = (String) templateConfiguration.get("collectionName");
+        Map<String, String> sampleValues = (Map<String, String>) templateConfiguration.get("sampleValues");
+        String filterValue = sampleValues.get("_key");
+
+        String rawQuery = "REMOVE \"" + filterValue + "\" IN " + collectionName;
+
+        return new DatasourceStructure.Template(
+                "Delete",
+                rawQuery,
+                null
+        );
+    }
+
+    public static String getOneDocumentQuery(String collectionName) {
+        return "for doc in " + collectionName + " limit 1 return doc";
+    }
+
+}
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/editor.json
new file mode 100644
index 0000000000..7896a10ac6
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/editor.json
@@ -0,0 +1,15 @@
+{
+  "editor": [
+    {
+      "sectionName": "",
+      "id": 1,
+      "children": [
+        {
+          "label": "",
+          "configProperty": "actionConfiguration.body",
+          "controlType": "QUERY_DYNAMIC_TEXT"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/form.json
new file mode 100644
index 0000000000..07b31893c9
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/form.json
@@ -0,0 +1,133 @@
+{
+  "form": [
+    {
+      "sectionName": "Connection",
+      "id": 1,
+      "children": [
+        {
+          "sectionName": null,
+          "children": [
+            {
+              "label": "Host Address",
+              "configProperty": "datasourceConfiguration.endpoints[*].host",
+              "controlType": "KEYVALUE_ARRAY",
+              "validationMessage": "Please enter a valid host",
+              "validationRegex": "^((?![/:]).)*$"
+            },
+            {
+              "label": "Port",
+              "configProperty": "datasourceConfiguration.endpoints[*].port",
+              "dataType": "NUMBER",
+              "controlType": "KEYVALUE_ARRAY"
+            }
+          ]
+        },
+        {
+          "label": "Database Name",
+          "configProperty": "datasourceConfiguration.authentication.databaseName",
+          "controlType": "INPUT_TEXT",
+          "placeholderText": "Database name",
+          "initialValue": "default"
+        }
+      ]
+    },
+    {
+      "sectionName": "Authentication",
+      "id": 2,
+      "children": [
+        {
+          "sectionName": null,
+          "children": [
+            {
+              "label": "Username",
+              "configProperty": "datasourceConfiguration.authentication.username",
+              "controlType": "INPUT_TEXT",
+              "placeholderText": "Username"
+            },
+            {
+              "label": "Password",
+              "configProperty": "datasourceConfiguration.authentication.password",
+              "dataType": "PASSWORD",
+              "controlType": "INPUT_TEXT",
+              "placeholderText": "Password",
+              "encrypted": true
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 3,
+      "sectionName": "SSL (optional)",
+      "children": [
+        {
+          "label": "SSL Mode",
+          "configProperty": "datasourceConfiguration.connection.ssl.authType",
+          "controlType": "DROP_DOWN",
+          "initialValue": "DEFAULT",
+          "options": [
+            {
+              "label": "Default",
+              "value": "DEFAULT"
+            },
+            {
+              "label": "Enabled",
+              "value": "ENABLED"
+            },
+            {
+              "label": "Disabled",
+              "value": "DISABLED"
+            }
+          ]
+        },
+        {
+          "label": "Use CA Certificate",
+          "configProperty": "datasourceConfiguration.connection.ssl.caCertificateType",
+          "controlType": "DROP_DOWN",
+          "initialValue": "NONE",
+          "options": [
+            {
+              "label": "Disabled",
+              "value": "NONE"
+            },
+            {
+              "label": "Upload File",
+              "value": "FILE"
+            },
+            {
+              "label": "Base64 String",
+              "value": "BASE64_STRING"
+            }
+          ],
+          "hidden": {
+            "path": "datasourceConfiguration.connection.ssl.authType",
+            "comparison": "NOT_EQUALS",
+            "value": "ENABLED"
+          }
+        },
+        {
+          "label": "CA Certificate File",
+          "configProperty": "datasourceConfiguration.connection.ssl.caCertificateFile",
+          "controlType": "FILE_PICKER",
+          "encrypted": true,
+          "hidden": {
+            "path": "datasourceConfiguration.connection.ssl.caCertificateType",
+            "comparison": "NOT_EQUALS",
+            "value": "FILE"
+          }
+        },
+        {
+          "label": "Base64 Encoded CA Certificate String",
+          "configProperty": "datasourceConfiguration.connection.ssl.caCertificateFile.base64Content",
+          "controlType": "INPUT_TEXT",
+          "encrypted": true,
+          "hidden": {
+            "path": "datasourceConfiguration.connection.ssl.caCertificateType",
+            "comparison": "NOT_EQUALS",
+            "value": "BASE64_STRING"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/CREATE.aql b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/CREATE.aql
new file mode 100644
index 0000000000..a892c3f901
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/CREATE.aql
@@ -0,0 +1,9 @@
+INSERT {
+    name: "{{ nameInput.text }}",
+    gender: "{{ genderDropdown.selectedOptionValue }}",
+    email: "{{ nameInput.text }}"
+} INTO users
+
+// nameInput and genderDropdown are example widgets, replace them with your widget names. To understand more please
+// check out: https://docs.appsmith.com/core-concepts/capturing-data-write
+// Read more at https://www.arangodb.com/docs/stable/aql/
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/DELETE.aql b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/DELETE.aql
new file mode 100644
index 0000000000..ee95bd15eb
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/DELETE.aql
@@ -0,0 +1,5 @@
+REMOVE "1" IN users
+
+// Use widget data in a query by replacing static values with {{ widgetName.property }}. To understand more please
+// check out https://docs.appsmith.com/core-concepts/capturing-data-write
+// Read more at https://www.arangodb.com/docs/stable/aql/
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/SELECT.aql b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/SELECT.aql
new file mode 100644
index 0000000000..8aebe04c8c
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/SELECT.aql
@@ -0,0 +1,9 @@
+FOR user IN users
+FILTER user.role == "Admin"
+SORT user.id ASC
+LIMIT 10
+RETURN user
+
+// Use widget data in a query using {{ widgetName.property }}. To understand more, please check out:
+// https://docs.appsmith.com/core-concepts/capturing-data-write
+// Read more at https://www.arangodb.com/docs/stable/aql/
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/UPDATE.aql b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/UPDATE.aql
new file mode 100644
index 0000000000..c0c5827143
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/UPDATE.aql
@@ -0,0 +1,11 @@
+UPDATE
+"{{ usersTable.selectedRow.id }}"
+WITH
+{
+    status: "APPROVED"
+}
+IN users
+
+// usersTable is an example table widget from where the id is being read. Replace it with your own Table widget or a
+// static value. To understand more please check out: https://docs.appsmith.com/core-concepts/capturing-data-write
+// Read more at https://www.arangodb.com/docs/stable/aql/
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/meta.json b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/meta.json
new file mode 100644
index 0000000000..5151ffc93f
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/templates/meta.json
@@ -0,0 +1,16 @@
+{
+  "templates": [
+    {
+      "file": "CREATE.aql"
+    },
+    {
+      "file": "SELECT.aql"
+    },
+    {
+      "file": "UPDATE.aql"
+    },
+    {
+      "file": "DELETE.aql"
+    }
+  ]
+}
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/test/java/com/external/plugins/ArangoDBPluginTest.java b/app/server/appsmith-plugins/arangoDBPlugin/src/test/java/com/external/plugins/ArangoDBPluginTest.java
new file mode 100644
index 0000000000..18d5c4a9a6
--- /dev/null
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/test/java/com/external/plugins/ArangoDBPluginTest.java
@@ -0,0 +1,303 @@
+package com.external.plugins;
+
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.ActionExecutionResult;
+import com.appsmith.external.models.Connection;
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.DatasourceTestResult;
+import com.appsmith.external.models.Endpoint;
+import com.appsmith.external.models.SSLDetails;
+import com.arangodb.ArangoCollection;
+import com.arangodb.ArangoDB;
+import com.arangodb.ArangoDatabase;
+import com.arangodb.Protocol;
+import com.arangodb.entity.CollectionType;
+import com.arangodb.entity.Permissions;
+import com.arangodb.model.CollectionCreateOptions;
+import com.arangodb.model.CollectionSchema;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Unit tests for ArangoDBPlugin
+ */
+
+public class ArangoDBPluginTest {
+
+    ArangoDBPlugin.ArangoDBPluginExecutor pluginExecutor = new ArangoDBPlugin.ArangoDBPluginExecutor();
+
+    private static String address;
+    private static Integer port;
+    private static final String user = "root";
+    private static final String password = "openSesame";
+    private static final String dbName = "test";
+    private static final String collectionName = "users";
+    private static ArangoDB arangoDB;
+
+    @SuppressWarnings("rawtypes")
+    @ClassRule
+    public static GenericContainer container = new GenericContainer(DockerImageName.parse("arangodb/arangodb:3.7.12"))
+            .withEnv(Map.of("ARANGO_ROOT_PASSWORD", password))
+            .withExposedPorts(8529)
+            .waitingFor(Wait.forHttp("/"));
+
+
+    @BeforeClass
+    public static void setUp() {
+        address = container.getContainerIpAddress();
+        port = container.getFirstMappedPort();
+
+        //connect
+        arangoDB = new ArangoDB.Builder()
+                .host(address, port)
+                .user(user)
+                .password(password)
+                .useSsl(false)
+                .useProtocol(Protocol.HTTP_VPACK)
+                .build();
+
+
+        arangoDB.createDatabase(dbName);
+        ArangoDatabase arangoDatabase = arangoDB.db(dbName);
+
+        //create collection
+        CollectionSchema schema = new CollectionSchema();
+        schema.setRule("{\n" +
+                "  \"message\": \"\",\n" +
+                "  \"level\": \"strict\",\n" +
+                "  \"rule\": {\n" +
+                "    \"properties\": {\n" +
+                "      \"name\": {\n" +
+                "        \"type\": \"string\"\n" +
+                "      },\n" +
+                "      \"dob\": {\n" +
+                "        \"required\": [\n" +
+                "          \"day\",\n" +
+                "          \"month\",\n" +
+                "          \"year\"\n" +
+                "        ],\n" +
+                "        \"type\": \"object\",\n" +
+                "        \"properties\": {\n" +
+                "          \"year\": {\n" +
+                "            \"type\": \"integer\"\n" +
+                "          },\n" +
+                "          \"month\": {\n" +
+                "            \"type\": \"integer\"\n" +
+                "          },\n" +
+                "          \"day\": {\n" +
+                "            \"type\": \"integer\"\n" +
+                "          }\n" +
+                "        }\n" +
+                "      },\n" +
+                "      \"netWorth\": {\n" +
+                "        \"type\": \"string\"\n" +
+                "      },\n" +
+                "      \"age\": {\n" +
+                "        \"type\": \"integer\"\n" +
+                "      },\n" +
+                "      \"gender\": {\n" +
+                "        \"type\": \"string\"\n" +
+                "      },\n" +
+                "      \"luckyNumber\": {\n" +
+                "        \"type\": \"integer\"\n" +
+                "      }\n" +
+                "    },\n" +
+                "    \"$schema\": \"http://json-schema.org/draft-04/schema#\",\n" +
+                "    \"type\": \"object\",\n" +
+                "    \"required\": [\n" +
+                "      \"age\",\n" +
+                "      \"dob\",\n" +
+                "      \"gender\",\n" +
+                "      \"luckyNumber\",\n" +
+                "      \"name\",\n" +
+                "      \"netWorth\"\n" +
+                "    ]\n" +
+                "  }\n" +
+                "}");
+        schema.setMessage("");
+        schema.setLevel(CollectionSchema.Level.NONE);
+        CollectionCreateOptions options = new CollectionCreateOptions();
+        options.type(CollectionType.DOCUMENT);
+        options.setSchema(schema);
+
+        ArangoCollection collection = arangoDatabase.collection(collectionName);
+        if (collection.exists()) {
+            collection.drop();
+        }
+        arangoDatabase.createCollection(collectionName, options);
+        collection.grantAccess(user, Permissions.RW);
+
+        //insert test documents
+        collection.insertDocuments(
+        List.of(Map.of(
+                        "name", "Cierra Vega",
+                        "gender", "F",
+                        "age", 20,
+                        "luckyNumber", 987654321L,
+                        "dob", LocalDate.of(2018, 12, 31),
+                        "netWorth", new BigDecimal("123456.789012")
+                ),
+                Map.of("name", "Alden Cantrell", "gender", "M", "age", 30),
+                Map.of("name", "Kierra Gentry", "gender", "F", "age", 40)
+        ));
+    }
+
+    private DatasourceConfiguration createDatasourceConfiguration() {
+        Endpoint endpoint = new Endpoint();
+        endpoint.setHost(address);
+        endpoint.setPort(port.longValue());
+
+        Connection connection = new Connection();
+        connection.setMode(Connection.Mode.READ_WRITE);
+        connection.setType(Connection.Type.DIRECT);
+        connection.setDefaultDatabaseName(dbName);
+        connection.setSsl(new SSLDetails());
+        connection.getSsl().setAuthType(SSLDetails.AuthType.DEFAULT);
+        connection.getSsl().setCaCertificateType(SSLDetails.CACertificateType.NONE);
+
+        DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+        dsConfig.setConnection(connection);
+        dsConfig.setEndpoints(List.of(endpoint));
+
+        DBAuth authentication = new DBAuth();
+        authentication.setAuthType(DBAuth.Type.USERNAME_PASSWORD);
+        authentication.setUsername(user);
+        authentication.setPassword(password);
+        authentication.setDatabaseName(dbName);
+        dsConfig.setAuthentication(authentication);
+
+        return dsConfig;
+    }
+
+    @Test
+    public void testConnectToArangoDB() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<DatasourceTestResult> testDsResult = pluginExecutor.testDatasource(dsConfig);
+        StepVerifier.create(testDsResult)
+                .assertNext(datasourceTestResult -> {
+                    assertNotNull(datasourceTestResult);
+                    assertTrue(datasourceTestResult.isSuccess());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testExecuteReadQuery() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<ArangoDatabase> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setBody("FOR user IN users" +
+                " FILTER user.age > 30" +
+                " SORT user.id ASC" +
+                " LIMIT 10" +
+                " RETURN user");
+
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn ->
+                pluginExecutor.execute(conn, dsConfig, actionConfiguration));
+
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+
+                    // Only one entry exists with age > 30
+                    assertEquals(1, ((ArrayNode) result.getBody()).size());
+
+                    // Check if all fields are returned
+                    final JsonNode node = ((ArrayNode) result.getBody()).get(0);
+                    assertEquals("Kierra Gentry", node.get("name").asText());
+                    assertEquals("F", node.get("gender").asText());
+                    assertEquals("40", node.get("age").asText());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testExecuteWriteQuery() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<ArangoDatabase> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setBody("INSERT {" +
+                " name: 'John Smith'," +
+                " email: ['john@appsmith.com](mailto:%22john@appsmith.com)']," +
+                " gender: 'M'," +
+                " age: 50" +
+                " } INTO users");
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.execute(conn, dsConfig, actionConfiguration));
+
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+
+                    // On a successful update the server returns an empty array
+                    assertEquals(0, ((ArrayNode) result.getBody()).size());
+
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testStructure() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<DatasourceStructure> structureMono = pluginExecutor.datasourceCreate(dsConfig)
+                .flatMap(connection -> pluginExecutor.getStructure(connection, dsConfig));
+
+        StepVerifier.create(structureMono)
+                .assertNext(structure -> {
+                    assertNotNull(structure);
+                    assertEquals(1, structure.getTables().size());
+
+                    final DatasourceStructure.Table possessionsTable = structure.getTables().get(0);
+                    assertEquals("users", possessionsTable.getName());
+                    assertEquals(DatasourceStructure.TableType.COLLECTION, possessionsTable.getType());
+                    assertArrayEquals(
+                            new DatasourceStructure.Column[]{
+                                    new DatasourceStructure.Column("_id", "String", null),
+                                    new DatasourceStructure.Column("_key", "String", null),
+                                    new DatasourceStructure.Column("_rev", "String", null),
+                                    new DatasourceStructure.Column("age", "Long", null),
+                                    new DatasourceStructure.Column("dob", "Object", null),
+                                    new DatasourceStructure.Column("gender", "String", null),
+                                    new DatasourceStructure.Column("luckyNumber", "Long", null),
+                                    new DatasourceStructure.Column("name", "String", null),
+                                    new DatasourceStructure.Column("netWorth", "String", null),
+                            },
+                            possessionsTable.getColumns().toArray()
+                    );
+
+                    assertArrayEquals(
+                            new DatasourceStructure.Key[]{},
+                            possessionsTable.getKeys().toArray()
+                    );
+
+                })
+                .verifyComplete();
+    }
+}
diff --git a/app/server/appsmith-plugins/dynamoPlugin/src/main/java/com/external/plugins/DynamoPlugin.java b/app/server/appsmith-plugins/dynamoPlugin/src/main/java/com/external/plugins/DynamoPlugin.java
index a48fb7c120..51cc502782 100644
--- a/app/server/appsmith-plugins/dynamoPlugin/src/main/java/com/external/plugins/DynamoPlugin.java
+++ b/app/server/appsmith-plugins/dynamoPlugin/src/main/java/com/external/plugins/DynamoPlugin.java
@@ -297,8 +297,8 @@ public class DynamoPlugin extends BasePlugin {
                     );
                 }
                 requestData.put("action", action);
-                requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, action, null, null));
-                requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  body, null, null));
+                requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, action, null, null, null));
+                requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  body, null, null, null));
 
                 Map<String, Object> parameters = null;
                 try {
@@ -460,6 +460,7 @@ public class DynamoPlugin extends BasePlugin {
                 for (final String tableName : listTablesResponse.tableNames()) {
                     tables.add(new DatasourceStructure.Table(
                             DatasourceStructure.TableType.TABLE,
+                            null,
                             tableName,
                             Collections.emptyList(),
                             Collections.emptyList(),
diff --git a/app/server/appsmith-plugins/dynamoPlugin/src/test/java/com/external/plugins/DynamoPluginTest.java b/app/server/appsmith-plugins/dynamoPlugin/src/test/java/com/external/plugins/DynamoPluginTest.java
index afff939ade..98f6368c18 100644
--- a/app/server/appsmith-plugins/dynamoPlugin/src/test/java/com/external/plugins/DynamoPluginTest.java
+++ b/app/server/appsmith-plugins/dynamoPlugin/src/test/java/com/external/plugins/DynamoPluginTest.java
@@ -199,8 +199,8 @@ public class DynamoPluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, "DescribeTable", null,
-                            null));
-                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  body, null, null));
+                            null, null));
+                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  body, null, null, null));
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
diff --git a/app/server/appsmith-plugins/elasticSearchPlugin/src/main/java/com/external/plugins/ElasticSearchPlugin.java b/app/server/appsmith-plugins/elasticSearchPlugin/src/main/java/com/external/plugins/ElasticSearchPlugin.java
index d8f9059b90..8d692787ff 100644
--- a/app/server/appsmith-plugins/elasticSearchPlugin/src/main/java/com/external/plugins/ElasticSearchPlugin.java
+++ b/app/server/appsmith-plugins/elasticSearchPlugin/src/main/java/com/external/plugins/ElasticSearchPlugin.java
@@ -82,9 +82,9 @@ public class ElasticSearchPlugin extends BasePlugin {
                 HttpMethod httpMethod = actionConfiguration.getHttpMethod();
                 requestData.put("method", httpMethod.name());
                 requestParams.add(new RequestParamDTO("actionConfiguration.httpMethod", httpMethod.name(), null,
-                        null));
-                requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null));
-                requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null, null));
+                        null, null));
+                requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
+                requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null, null, null));
 
                 final Request request = new Request(httpMethod.toString(), path);
                 ContentType contentType = ContentType.APPLICATION_JSON;
diff --git a/app/server/appsmith-plugins/elasticSearchPlugin/src/test/java/com/external/plugins/ElasticSearchPluginTest.java b/app/server/appsmith-plugins/elasticSearchPlugin/src/test/java/com/external/plugins/ElasticSearchPluginTest.java
old mode 100644
new mode 100755
index d43fbc22c5..a2dadc3552
--- a/app/server/appsmith-plugins/elasticSearchPlugin/src/test/java/com/external/plugins/ElasticSearchPluginTest.java
+++ b/app/server/appsmith-plugins/elasticSearchPlugin/src/test/java/com/external/plugins/ElasticSearchPluginTest.java
@@ -15,6 +15,7 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.utility.DockerImageName;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -37,9 +38,8 @@ public class ElasticSearchPluginTest {
     ElasticSearchPlugin.ElasticSearchPluginExecutor pluginExecutor = new ElasticSearchPlugin.ElasticSearchPluginExecutor();
 
     @ClassRule
-    public static final ElasticsearchContainer container =
-            new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:6.4.1")
-                    .withEnv("discovery.type", "single-node");
+    public static final ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.12.1")
+            .withEnv("discovery.type", "single-node");
 
     private static final DatasourceConfiguration dsConfig = new DatasourceConfiguration();
     private static String host;
@@ -128,9 +128,9 @@ public class ElasticSearchPluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO("actionConfiguration.httpMethod", HttpMethod.GET.toString(),
-                            null, null));
-                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, "/planets/_mget", null, null));
-                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  contentJson, null, null));
+                            null, null, null));
+                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, "/planets/_mget", null, null, null));
+                    expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  contentJson, null, null, null));
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
index a20cfdf614..215bbaf429 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
@@ -57,6 +57,7 @@ import java.util.stream.StreamSupport;
 import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
 import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_PATH;
 import static com.appsmith.external.helpers.PluginUtils.getActionConfigurationPropertyPath;
+import static com.external.utils.WhereConditionUtils.applyWhereConditional;
 
 /**
  * Datasource properties:
@@ -71,9 +72,7 @@ public class FirestorePlugin extends BasePlugin {
 
     private static final int ORDER_PROPERTY_INDEX = 1;
     private static final int LIMIT_PROPERTY_INDEX = 2;
-    private static final int QUERY_PROPERTY_INDEX = 3;
-    private static final int OPERATOR_PROPERTY_INDEX = 4;
-    private static final int QUERY_VALUE_PROPERTY_INDEX = 5;
+    private static final int WHERE_CONDITIONAL_PROPERTY_INDEX = 3;
     private static final int START_AFTER_PROPERTY_INDEX = 6;
     private static final int END_BEFORE_PROPERTY_INDEX = 7;
     private static final int FIELDVALUE_TIMESTAMP_PROPERTY_INDEX = 8;
@@ -123,8 +122,8 @@ public class FirestorePlugin extends BasePlugin {
 
             List<RequestParamDTO> requestParams = new ArrayList<>();
             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0), method == null ? "" :
-                    method.toString(), null, null));
-            requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null));
+                    method.toString(), null, null, null));
+            requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
 
             final PaginationField paginationField = executeActionDTO == null ? null : executeActionDTO.getPaginationField();
 
@@ -278,7 +277,7 @@ public class FirestorePlugin extends BasePlugin {
                     && !StringUtils.isEmpty((String) properties.get(FIELDVALUE_DELETE_PROPERTY_INDEX).getValue())) {
                 String deletePaths = (String) properties.get(FIELDVALUE_DELETE_PROPERTY_INDEX).getValue();
                 requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(FIELDVALUE_DELETE_PROPERTY_INDEX),
-                        deletePaths, null, null));
+                        deletePaths, null, null, null));
                 List<String> deletePathsList;
                 try {
                     deletePathsList = objectMapper.readValue(deletePaths, new TypeReference<List<String>>(){});
@@ -327,7 +326,7 @@ public class FirestorePlugin extends BasePlugin {
                     && !StringUtils.isEmpty((String) properties.get(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX).getValue())) {
                 String timestampValuePaths = (String) properties.get(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX).getValue();
                 requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX),
-                        timestampValuePaths, null, null));
+                        timestampValuePaths, null, null, null));
                 List<String> timestampPathsStringList; // ["key1.key2", "key3.key4"]
                 try {
                     timestampPathsStringList = objectMapper.readValue(timestampValuePaths,
@@ -432,7 +431,7 @@ public class FirestorePlugin extends BasePlugin {
                                 case CREATE_DOCUMENT:
                                 case UPDATE_DOCUMENT:
                                     requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null,
-                                            null));
+                                            null, null));
                                     return Mono.justOrEmpty(DocumentReference.class.getMethod(methodName, Map.class));
                                 default:
                                     return Mono.error(new AppsmithPluginException(
@@ -513,7 +512,7 @@ public class FirestorePlugin extends BasePlugin {
                 return methodGetCollection(collection, properties, paginationField, requestParams);
 
             } else if (method == Method.ADD_TO_COLLECTION) {
-                requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null, null));
+                requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null, null, null));
                 return methodAddToCollection(collection, mapBody);
 
             }
@@ -543,17 +542,9 @@ public class FirestorePlugin extends BasePlugin {
                                                                 List<RequestParamDTO> requestParams) {
             final String limitString = getPropertyAt(properties, LIMIT_PROPERTY_INDEX, "10");
             final int limit = StringUtils.isEmpty(limitString) ? 10 : Integer.parseInt(limitString);
-
-            final String queryFieldPath = getPropertyAt(properties, QUERY_PROPERTY_INDEX, null);
-
-            final String operatorString = getPropertyAt(properties, OPERATOR_PROPERTY_INDEX, null);
-            final Op operator = StringUtils.isEmpty(operatorString) ? null : Op.valueOf(operatorString);
-
-            final String queryValue = getPropertyAt(properties, QUERY_VALUE_PROPERTY_INDEX, null);
-
             final String orderByString = getPropertyAt(properties, ORDER_PROPERTY_INDEX, "");
             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(ORDER_PROPERTY_INDEX),
-                    orderByString, null, null));
+                    orderByString, null, null, null));
 
             final List<String> orderings;
             try {
@@ -566,7 +557,7 @@ public class FirestorePlugin extends BasePlugin {
             Map<String, Object> startAfterTemp = null;
             final String startAfterJson = getPropertyAt(properties, START_AFTER_PROPERTY_INDEX, "{}");
             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(START_AFTER_PROPERTY_INDEX),
-                    startAfterJson, null, null));
+                    startAfterJson, null, null, null));
             if (PaginationField.NEXT.equals(paginationField)) {
                 try {
                     startAfterTemp = StringUtils.isEmpty(startAfterJson) ? Collections.emptyMap() : objectMapper.readValue(startAfterJson, Map.class);
@@ -578,7 +569,7 @@ public class FirestorePlugin extends BasePlugin {
             Map<String, Object> endBeforeTemp = null;
             final String endBeforeJson = getPropertyAt(properties, END_BEFORE_PROPERTY_INDEX, "{}");
             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(END_BEFORE_PROPERTY_INDEX),
-                    endBeforeJson, null, null));
+                    endBeforeJson, null, null, null));
             if (PaginationField.PREV.equals(paginationField)) {
                 try {
                     endBeforeTemp = StringUtils.isEmpty(endBeforeJson) ? Collections.emptyMap() : objectMapper.readValue(endBeforeJson, Map.class);
@@ -588,13 +579,7 @@ public class FirestorePlugin extends BasePlugin {
             }
 
             requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(LIMIT_PROPERTY_INDEX),
-                    limitString == null ? "" : limitString, null, null));
-            requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(QUERY_PROPERTY_INDEX),
-                    queryFieldPath == null ? "" : queryFieldPath, null, null));
-            requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(OPERATOR_PROPERTY_INDEX),
-                    operatorString == null ? "" : operatorString, null, null));
-            requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(QUERY_VALUE_PROPERTY_INDEX),
-                    queryValue == null ? "" : queryValue, null, null));
+                    limitString == null ? "" : limitString, null, null, null));
 
             final Map<String, Object> startAfter = startAfterTemp;
             final Map<String, Object> endBefore = endBeforeTemp;
@@ -633,53 +618,42 @@ public class FirestorePlugin extends BasePlugin {
                     })
                     // Apply where condition, if provided.
                     .flatMap(query1 -> {
-                        if (StringUtils.isEmpty(queryFieldPath) || operator == null || queryValue == null) {
+                        if (!isWhereMethodUsed(properties)) {
                             return Mono.just(query1);
                         }
 
-                        switch (operator) {
-                            case LT:
-                                return Mono.just(query1.whereLessThan(queryFieldPath, queryValue));
-                            case LTE:
-                                return Mono.just(query1.whereLessThanOrEqualTo(queryFieldPath, queryValue));
-                            case EQ:
-                                return Mono.just(query1.whereEqualTo(queryFieldPath, queryValue));
-                            // TODO: NOT_EQ operator support is awaited in the next version of Firestore driver.
-                            // case NOT_EQ:
-                            //     return Mono.just(query1.whereNotEqualTo(queryFieldPath, queryValue));
-                            case GT:
-                                return Mono.just(query1.whereGreaterThan(queryFieldPath, queryValue));
-                            case GTE:
-                                return Mono.just(query1.whereGreaterThanOrEqualTo(queryFieldPath, queryValue));
-                            case ARRAY_CONTAINS:
-                                return Mono.just(query1.whereArrayContains(queryFieldPath, queryValue));
-                            case ARRAY_CONTAINS_ANY:
-                                try {
-                                    return Mono.just(query1.whereArrayContainsAny(queryFieldPath, parseList(queryValue)));
-                                } catch (IOException e) {
-                                    return Mono.error(new AppsmithPluginException(
-                                            AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
-                                            "Unable to parse condition value as a JSON list."
-                                    ));
-                                }
-                            case IN:
-                                try {
-                                    return Mono.just(query1.whereIn(queryFieldPath, parseList(queryValue)));
-                                } catch (IOException e) {
-                                    return Mono.error(new AppsmithPluginException(
-                                            AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
-                                            "Unable to parse condition value as a JSON list."
-                                    ));
-                                }
-                                // TODO: NOT_IN operator support is awaited in the next version of Firestore driver.
-                                // case NOT_IN:
-                                //     return Mono.just(query1.whereNotIn(queryFieldPath, queryValue));
-                            default:
-                                return Mono.error(new AppsmithPluginException(
-                                        AppsmithPluginError.PLUGIN_ERROR,
-                                        "Unsupported operator for `where` condition " + operator.toString() + "."
-                                ));
+                        List<Object> conditionList = (List) properties.get(WHERE_CONDITIONAL_PROPERTY_INDEX).getValue();
+                        requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(WHERE_CONDITIONAL_PROPERTY_INDEX),
+                                conditionList, null, null, null));
+
+                        for(Object condition : conditionList) {
+                            String path = ((Map<String, String>)condition).get("path");
+                            String operatorString = ((Map<String, String>)condition).get("operator");
+                            String value = ((Map<String, String>)condition).get("value");
+
+                            /**
+                             * - If all values in all where condition tuples are null, then isWhereMethodUsed(...)
+                             *  function will indicate that where conditions are not used effectively and program
+                             *  execution would return without reaching here.
+                             */
+                            if (StringUtils.isEmpty(path) || StringUtils.isEmpty(operatorString) || StringUtils.isEmpty(value)) {
+                                return Mono.error(
+                                        new AppsmithPluginException(
+                                                AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
+                                                "One of the where condition fields has been found empty. Please fill " +
+                                                        "all the where condition fields and try again."
+                                        )
+                                );
+                            }
+
+                            try {
+                                query1 = applyWhereConditional(query1, path, operatorString, value);
+                            } catch (AppsmithPluginException e) {
+                                return Mono.error(e);
+                            }
                         }
+
+                        return Mono.just(query1);
                     })
                     // Apply limit, always provided, since without it we can inadvertently end up processing too much data.
                     .map(query1 -> query1.limit(limit))
@@ -710,6 +684,25 @@ public class FirestorePlugin extends BasePlugin {
                     });
         }
 
+        private boolean isWhereMethodUsed(List<Property> properties) {
+            // Check if the where property list does not exist or is null
+            if(properties.size() <= WHERE_CONDITIONAL_PROPERTY_INDEX || properties.get(WHERE_CONDITIONAL_PROPERTY_INDEX) == null
+                    || CollectionUtils.isEmpty((List) properties.get(WHERE_CONDITIONAL_PROPERTY_INDEX).getValue())) {
+                return false;
+            }
+
+            // Check if all values in the where property list are null.
+            boolean allValuesNull = ((List) properties.get(WHERE_CONDITIONAL_PROPERTY_INDEX).getValue()).stream()
+                    .allMatch(valueMap -> valueMap == null ||
+                            ((Map) valueMap).entrySet().stream().allMatch(e -> ((Map.Entry) e).getValue() == null));
+
+            if (allValuesNull) {
+                return false;
+            }
+
+            return true;
+        }
+
         private Mono<ActionExecutionResult> methodAddToCollection(CollectionReference collection, Map<String, Object> mapBody) {
             return Mono.justOrEmpty(collection.add(mapBody))
                     .flatMap(future -> {
@@ -878,10 +871,6 @@ public class FirestorePlugin extends BasePlugin {
             return invalids;
         }
 
-        private <T> List<T> parseList(String arrayJson) throws IOException {
-            return (List<T>) objectMapper.readValue(arrayJson, ArrayList.class);
-        }
-
         @Override
         public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
             return datasourceCreate(datasourceConfiguration)
@@ -901,6 +890,7 @@ public class FirestorePlugin extends BasePlugin {
                                     final ArrayList<DatasourceStructure.Template> templates = new ArrayList<>();
                                     return new DatasourceStructure.Table(
                                             DatasourceStructure.TableType.COLLECTION,
+                                            null,
                                             id,
                                             new ArrayList<>(),
                                             new ArrayList<>(),
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/utils/WhereConditionUtils.java b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/utils/WhereConditionUtils.java
new file mode 100644
index 0000000000..579e4aa430
--- /dev/null
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/utils/WhereConditionUtils.java
@@ -0,0 +1,90 @@
+package com.external.utils;
+
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.external.plugins.Op;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.cloud.firestore.FieldPath;
+import com.google.cloud.firestore.Query;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class WhereConditionUtils {
+
+    protected static final ObjectMapper objectMapper = new ObjectMapper();
+
+    public static Query applyWhereConditional(Query query, String path, String operatorString, String value) throws AppsmithPluginException {
+
+        if (query == null) {
+            throw new AppsmithPluginException(
+                    AppsmithPluginError.PLUGIN_ERROR,
+                    "Appsmith server has found null query object when applying where conditional on Firestore " +
+                            "query. Please contact Appsmith's customer support to resolve this."
+            );
+        }
+
+        Op operator;
+        try {
+            operator = StringUtils.isEmpty(operatorString) ? null : Op.valueOf(operatorString);
+        } catch (IllegalArgumentException e) {
+            throw new AppsmithPluginException(
+                    AppsmithPluginError.PLUGIN_ERROR,
+                    "Appsmith server has encountered an invalid operator for Firestore query's where conditional." +
+                            " Please contact Appsmith's customer support to resolve this."
+            );
+        }
+
+        FieldPath fieldPath = FieldPath.of(path.split("\\."));
+        switch (operator) {
+            case LT:
+                return query.whereLessThan(fieldPath, value);
+            case LTE:
+                return query.whereLessThanOrEqualTo(fieldPath, value);
+            case EQ:
+                return query.whereEqualTo(fieldPath, value);
+            // TODO: NOT_EQ operator support is awaited in the next version of Firestore driver.
+            // case NOT_EQ:
+            //     return Mono.just(query.whereNotEqualTo(path, value));
+            case GT:
+                return query.whereGreaterThan(fieldPath, value);
+            case GTE:
+                return query.whereGreaterThanOrEqualTo(fieldPath, value);
+            case ARRAY_CONTAINS:
+                return query.whereArrayContains(fieldPath, value);
+            case ARRAY_CONTAINS_ANY:
+                try {
+                    return query.whereArrayContainsAny(fieldPath, parseList(value));
+                } catch (IOException e) {
+                    throw new AppsmithPluginException(
+                            AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
+                            "Unable to parse condition value as a JSON list."
+                    );
+                }
+            case IN:
+                try {
+                    return query.whereIn(fieldPath, parseList(value));
+                } catch (IOException e) {
+                    throw new AppsmithPluginException(
+                            AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
+                            "Unable to parse condition value as a JSON list."
+                    );
+                }
+                // TODO: NOT_IN operator support is awaited in the next version of Firestore driver.
+                // case NOT_IN:
+                //     return Mono.just(query.whereNotIn(fieldPath, value));
+            default:
+                throw new AppsmithPluginException(
+                        AppsmithPluginError.PLUGIN_ERROR,
+                        "Appsmith server has encountered an invalid operator for Firestore query's where conditional." +
+                                " Please contact Appsmith's customer support to resolve this."
+                );
+        }
+    }
+
+    private static <T> List<T> parseList(String arrayJson) throws IOException {
+        return (List<T>) objectMapper.readValue(arrayJson, ArrayList.class);
+    }
+}
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor.json
index 464ed3b03a..308158cf77 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor.json
@@ -167,43 +167,32 @@
           "initialValue": "10"
         },
         {
-          "sectionName": "Query",
-          "id": 2,
-          "children": [
+          "label": "Where Conditions Key",
+          "configProperty": "actionConfiguration.pluginSpecifiedTemplates[3].key",
+          "controlType": "INPUT_TEXT",
+          "hidden": true,
+          "initialValue": "whereConditionTuples"
+        },
+        {
+          "label": "Where Conditions",
+          "configProperty": "actionConfiguration.pluginSpecifiedTemplates[3].value",
+          "controlType": "ARRAY_FIELD",
+          "hidden": {
+            "path": "actionConfiguration.pluginSpecifiedTemplates[0].value",
+            "comparison": "NOT_EQUALS",
+            "value": "GET_COLLECTION"
+          },
+          "schema": [
             {
-              "label": "Field Path Key",
-              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[3].key",
-              "controlType": "INPUT_TEXT",
-              "hidden": true,
-              "initialValue": "fieldPath"
-            },
-            {
-              "label": "Where Condition: Field Path (leave empty to not apply any conditions)",
-              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[3].value",
+              "label": "Path",
+              "key": "path",
               "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-              "hidden": {
-                "path": "actionConfiguration.pluginSpecifiedTemplates[0].value",
-                "comparison": "NOT_EQUALS",
-                "value": "GET_COLLECTION"
-              },
-              "initialValue": ""
+              "placeholderText": "key1/nestedKey2"
             },
             {
-              "label": "Operator Key",
-              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[4].key",
-              "controlType": "INPUT_TEXT",
-              "hidden": true,
-              "initialValue": "operator"
-            },
-            {
-              "label": "Where Condition: Operator",
-              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[4].value",
+              "label": "Operator",
+              "key": "operator",
               "controlType": "DROP_DOWN",
-              "hidden": {
-                "path": "actionConfiguration.pluginSpecifiedTemplates[0].value",
-                "comparison": "NOT_EQUALS",
-                "value": "GET_COLLECTION"
-              },
               "initialValue": "EQ",
               "options": [
                 {
@@ -241,22 +230,10 @@
               ]
             },
             {
-              "label": "Value Key",
-              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[5].key",
-              "controlType": "INPUT_TEXT",
-              "hidden": true,
-              "initialValue": "fieldValue"
-            },
-            {
-              "label": "Where Condition: Value",
-              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[5].value",
+              "label": "Value",
+              "key": "value",
               "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-              "hidden": {
-                "path": "actionConfiguration.pluginSpecifiedTemplates[0].value",
-                "comparison": "NOT_EQUALS",
-                "value": "GET_COLLECTION"
-              },
-              "initialValue": ""
+              "placeholderText": "value"
             }
           ]
         },
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java b/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java
index dc63cf037b..fd884b70c8 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java
+++ b/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java
@@ -9,6 +9,7 @@ import com.appsmith.external.models.ActionExecutionResult;
 import com.appsmith.external.models.DBAuth;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.PaginationField;
+import com.appsmith.external.models.Param;
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.RequestParamDTO;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -77,7 +78,8 @@ public class FirestorePluginTest {
                 .build()
                 .getService();
 
-        firestoreConnection.document("initial/one").set(Map.of("value", 1, "name", "one", "isPlural", false)).get();
+        firestoreConnection.document("initial/one").set(Map.of("value", 1, "name", "one", "isPlural", false,
+                "category", "test")).get();
         final Map<String, Object> twoData = new HashMap<>(Map.of(
                 "value", 2,
                 "name", "two",
@@ -85,7 +87,8 @@ public class FirestorePluginTest {
                 "geo", new GeoPoint(-90, 90),
                 "dt", FieldValue.serverTimestamp(),
                 "ref", firestoreConnection.document("initial/one"),
-                "bytes", Blob.fromBytes("abc def".getBytes(StandardCharsets.UTF_8))
+                "bytes", Blob.fromBytes("abc def".getBytes(StandardCharsets.UTF_8)),
+                "category", "test"
         ));
         twoData.put("null-ref", null);
         firestoreConnection.document("initial/two").set(twoData).get();
@@ -146,6 +149,7 @@ public class FirestorePluginTest {
                     assertFalse((Boolean) first.remove("isPlural"));
                     assertEquals(1L, first.remove("value"));
                     assertEquals(Map.of("id", "one", "path", "initial/one"), first.remove("_ref"));
+                    assertEquals("test", first.remove("category"));
                     assertEquals(Collections.emptyMap(), first);
 
                     /*
@@ -154,9 +158,9 @@ public class FirestorePluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
-                            "GET_DOCUMENT", null, null)); // Method
+                            "GET_DOCUMENT", null, null, null)); // Method
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
-                            null, null)); // Path
+                            null, null, null)); // Path
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -184,6 +188,7 @@ public class FirestorePluginTest {
                     assertEquals("abc def", ((Blob) doc.remove("bytes")).toByteString().toStringUtf8());
                     assertNull(doc.remove("null-ref"));
                     assertEquals(Map.of("id", "two", "path", "initial/two"), doc.remove("_ref"));
+                    assertEquals("test", doc.remove("category"));
                     assertEquals(Collections.emptyMap(), doc);
                 })
                 .verifyComplete();
@@ -240,6 +245,7 @@ public class FirestorePluginTest {
                     assertFalse((Boolean) first.remove("isPlural"));
                     assertEquals(1L, first.remove("value"));
                     assertEquals(Map.of("id", "one", "path", "initial/one"), first.remove("_ref"));
+                    assertEquals("test", first.remove("category"));
                     assertEquals(Collections.emptyMap(), first);
 
                     final Map<String, Object> second = results.stream().filter(d -> "two".equals(d.get("name"))).findFirst().orElse(null);
@@ -253,6 +259,7 @@ public class FirestorePluginTest {
                     assertEquals("abc def", ((Blob) second.remove("bytes")).toByteString().toStringUtf8());
                     assertNull(second.remove("null-ref"));
                     assertEquals(Map.of("id", "two", "path", "initial/two"), second.remove("_ref"));
+                    assertEquals("test", second.remove("category"));
                     assertEquals(Collections.emptyMap(), second);
 
                     final Map<String, Object> third = results.stream().filter(d -> "third".equals(d.get("name"))).findFirst().orElse(null);
@@ -297,11 +304,11 @@ public class FirestorePluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
-                            "SET_DOCUMENT", null, null)); // Method
+                            "SET_DOCUMENT", null, null, null)); // Method
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
-                            null, null)); // Path
+                            null, null, null)); // Path
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            actionConfiguration.getBody(), null, null)); // Body
+                            actionConfiguration.getBody(), null, null, null)); // Body
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -331,11 +338,11 @@ public class FirestorePluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
-                            "CREATE_DOCUMENT", null, null)); // Method
+                            "CREATE_DOCUMENT", null, null, null)); // Method
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
-                            null, null)); // Path
+                            null, null, null)); // Path
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            actionConfiguration.getBody(), null, null)); // Body
+                            actionConfiguration.getBody(), null, null, null)); // Body
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -394,9 +401,9 @@ public class FirestorePluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
-                            "DELETE_DOCUMENT", null, null)); // Method
+                            "DELETE_DOCUMENT", null, null, null)); // Method
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
-                            null, null)); // Path
+                            null, null, null)); // Path
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -428,11 +435,11 @@ public class FirestorePluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
-                            "ADD_TO_COLLECTION", null, null)); // Method
+                            "ADD_TO_COLLECTION", null, null, null)); // Method
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
-                            null, null)); // Path
+                            null, null, null)); // Path
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            actionConfiguration.getBody(), null, null)); // Body
+                            actionConfiguration.getBody(), null, null, null)); // Body
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -626,23 +633,17 @@ public class FirestorePluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
-                            "GET_COLLECTION", null, null)); // Method
+                            "GET_COLLECTION", null, null, null)); // Method
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
-                            null, null)); // Path
+                            null, null, null)); // Path
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(1),
-                            "[\"firm\", \"name\"]", null, null)); // Order by
+                            "[\"firm\", \"name\"]", null, null, null)); // Order by
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(6), "{}", null,
-                            null)); // Start after
+                            null, null)); // Start after
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(7), "{}", null,
-                            null)); // End before
+                            null, null)); // End before
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(2), "15", null,
-                            null)); // Limit
-                    expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(3), "", null,
-                            null)); // Field Path
-                    expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(4), "", null,
-                            null)); // Operator
-                    expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(5), "", null,
-                            null)); // Value
+                            null, null)); // Limit
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
 
                 })
@@ -695,6 +696,86 @@ public class FirestorePluginTest {
                 .verifyComplete();
     }
 
+    @Test
+    public void testWhereConditional() {
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setPath("initial");
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("method", "GET_COLLECTION"));
+        pluginSpecifiedTemplates.add(new Property("order", null));
+        pluginSpecifiedTemplates.add(new Property("limit", null));
+        Property whereProperty = new Property("where", null);
+        whereProperty.setValue(new ArrayList<>());
+        /*
+         * - get all documents where category == test.
+         * - this returns 2 documents.
+         */
+        ((List)whereProperty.getValue()).add(new HashMap<String, Object>() {{
+            put("path", "{{Input1.text}}");
+            put("operator", "EQ");
+            put("value", "{{Input2.text}}");
+        }});
+
+        /*
+         * - get all documents where name == two.
+         * - Of the two documents returned by above condition, this will narrow it down to one.
+         */
+        ((List)whereProperty.getValue()).add(new HashMap<String, Object>() {{
+            put("path", "{{Input3.text}}");
+            put("operator", "EQ");
+            put("value", "{{Input4.text}}");
+        }});
+
+        pluginSpecifiedTemplates.add(whereProperty);
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
+
+        List params = new ArrayList();
+        Param param = new Param();
+        param.setKey("Input1.text");
+        param.setValue("category");
+        params.add(param);
+        param = new Param();
+        param.setKey("Input2.text");
+        param.setValue("test");
+        params.add(param);
+        param = new Param();
+        param.setKey("Input3.text");
+        param.setValue("name");
+        params.add(param);
+        param = new Param();
+        param.setKey("Input4.text");
+        param.setValue("two");
+        params.add(param);
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        executeActionDTO.setParams(params);
+        Mono<ActionExecutionResult> resultMono = pluginExecutor
+                .executeParameterized(firestoreConnection, executeActionDTO, dsConfig, actionConfiguration);
+
+        StepVerifier.create(resultMono)
+                .assertNext(result -> {
+                    assertTrue(result.getIsExecutionSuccess());
+
+                    List<Map<String, Object>> results = (List) result.getBody();
+                    assertEquals(1, results.size());
+
+                    final Map<String, Object> second = results.stream().findFirst().orElse(null);
+                    assertNotNull(second);
+                    assertEquals("two", second.remove("name"));
+                    assertTrue((Boolean) second.remove("isPlural"));
+                    assertEquals(2L, second.remove("value"));
+                    assertEquals(Map.of("path", "initial/one", "id", "one"), second.remove("ref"));
+                    assertEquals(new GeoPoint(-90, 90), second.remove("geo"));
+                    assertNotNull(second.remove("dt"));
+                    assertEquals("abc def", ((Blob) second.remove("bytes")).toByteString().toStringUtf8());
+                    assertNull(second.remove("null-ref"));
+                    assertEquals(Map.of("id", "two", "path", "initial/two"), second.remove("_ref"));
+                    assertEquals("test", second.remove("category"));
+                    assertEquals(Collections.emptyMap(), second);
+                })
+                .verifyComplete();
+    }
+
     @Test
     public void testUpdateDocumentWithFieldValueTimestamp() {
         List<Property> properties = new ArrayList<>();
@@ -783,13 +864,13 @@ public class FirestorePluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
-                            "UPDATE_DOCUMENT", null, null)); // Method
+                            "UPDATE_DOCUMENT", null, null, null)); // Method
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
-                            null, null)); // Path
+                            null, null, null)); // Path
                     expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(9),
-                            "[\"value\"]", null, null)); // Method
+                            "[\"value\"]", null, null, null)); // Method
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            actionConfiguration.getBody(), null, null)); // Body
+                            actionConfiguration.getBody(), null, null, null)); // Body
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -952,4 +1033,57 @@ public class FirestorePluginTest {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    public void testDynamicBindingSubstitutionInActionConfiguration() {
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setPath("{{Input1.text}}");
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("method", "GET_COLLECTION"));
+        pluginSpecifiedTemplates.add(new Property("order", null));
+        pluginSpecifiedTemplates.add(new Property("limit", null));
+        Property whereProperty = new Property("where", null);
+        whereProperty.setValue(new ArrayList<>());
+        /*
+         * - get all documents where category == test.
+         * - this returns 2 documents.
+         */
+        ((List)whereProperty.getValue()).add(new HashMap<String, Object>() {{
+            put("path", "{{Input2.text}}");
+            put("operator", "EQ");
+            put("value", "{{Input3.text}}");
+        }});
+
+        pluginSpecifiedTemplates.add(whereProperty);
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
+
+        List params = new ArrayList();
+        Param param = new Param();
+        param.setKey("Input1.text");
+        param.setValue("initial");
+        params.add(param);
+        param = new Param();
+        param.setKey("Input2.text");
+        param.setValue("category");
+        params.add(param);
+        param = new Param();
+        param.setKey("Input3.text");
+        param.setValue("test");
+        params.add(param);
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        executeActionDTO.setParams(params);
+
+        // Substitute dynamic binding values
+        pluginExecutor
+                .prepareConfigurationsForExecution(executeActionDTO, actionConfiguration, null);
+
+        // check if dynamic binding values have been substituted correctly
+        assertEquals("initial", actionConfiguration.getPath());
+        assertEquals("category",
+                ((Map)((List)actionConfiguration.getPluginSpecifiedTemplates().get(3).getValue()).get(0)).get(
+                        "path"));
+        assertEquals("test",
+                ((Map)((List)actionConfiguration.getPluginSpecifiedTemplates().get(3).getValue()).get(0)).get(
+                        "value"));
+    }
 }
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java
index 72d06fb9dc..e1134ef260 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java
@@ -83,7 +83,7 @@ public class GoogleSheetsPlugin extends BasePlugin {
 
             // Authentication will already be valid at this point
             final OAuth2 oauth2 = (OAuth2) datasourceConfiguration.getAuthentication();
-            assert (!oauth2.getIsEncrypted() && oauth2.getAuthenticationResponse() != null);
+            assert (oauth2.getAuthenticationResponse() != null);
 
             // Triggering the actual REST API call
             return method.executePrerequisites(methodConfig, oauth2)
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
index 72b7f0faf1..b6c41225e9 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
@@ -1,5 +1,6 @@
 package com.external.plugins;
 
+import com.appsmith.external.constants.DisplayDataType;
 import com.appsmith.external.dtos.ExecuteActionDTO;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
@@ -9,13 +10,13 @@ import com.appsmith.external.helpers.MustacheHelper;
 import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.ActionExecutionRequest;
 import com.appsmith.external.models.ActionExecutionResult;
-import com.appsmith.external.constants.DisplayDataType;
 import com.appsmith.external.models.Connection;
 import com.appsmith.external.models.DBAuth;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.DatasourceStructure;
 import com.appsmith.external.models.DatasourceTestResult;
 import com.appsmith.external.models.Endpoint;
+import com.appsmith.external.models.Param;
 import com.appsmith.external.models.ParsedDataType;
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.RequestParamDTO;
@@ -24,6 +25,7 @@ import com.appsmith.external.plugins.BasePlugin;
 import com.appsmith.external.plugins.PluginExecutor;
 import com.appsmith.external.plugins.SmartSubstitutionInterface;
 import com.mongodb.MongoCommandException;
+import com.mongodb.MongoSocketWriteException;
 import com.mongodb.MongoTimeoutException;
 import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.MongoClients;
@@ -31,8 +33,6 @@ import com.mongodb.reactivestreams.client.MongoDatabase;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.bson.conversions.Bson;
-import org.bson.types.Decimal128;
-import org.bson.types.ObjectId;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.pf4j.Extension;
@@ -46,25 +46,43 @@ import reactor.core.scheduler.Schedulers;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
+import static com.external.plugins.MongoPluginUtils.convertMongoFormInputToRawCommand;
+import static com.external.plugins.MongoPluginUtils.generateTemplatesAndStructureForACollection;
+import static com.external.plugins.MongoPluginUtils.getDatabaseName;
+import static com.external.plugins.MongoPluginUtils.isRawCommand;
+import static com.external.plugins.MongoPluginUtils.urlEncode;
+import static com.external.plugins.MongoPluginUtils.validConfigurationPresent;
+import static com.external.plugins.constants.ConfigurationIndex.AGGREGATE_PIPELINE;
+import static com.external.plugins.constants.ConfigurationIndex.COUNT_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.DELETE_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.DISTINCT_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_PROJECTION;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_SORT;
+import static com.external.plugins.constants.ConfigurationIndex.INSERT_DOCUMENT;
+import static com.external.plugins.constants.ConfigurationIndex.SMART_BSON_SUBSTITUTION;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_ONE_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_ONE_SORT;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_ONE_UPDATE;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_UPDATE;
 import static java.lang.Boolean.TRUE;
 
 public class MongoPlugin extends BasePlugin {
@@ -83,14 +101,63 @@ public class MongoPlugin extends BasePlugin {
 
     public static final String N_MODIFIED = "nModified";
 
-    private static final String VALUE_STR = "value";
+    private static final String VALUE = "value";
+
+    private static final String VALUES = "values";
 
     private static final int TEST_DATASOURCE_TIMEOUT_SECONDS = 15;
 
-    private static final int SMART_BSON_SUBSTITUTION_INDEX = 0;
+    /*
+     * - The regex matches the following two pattern types:
+     *   - mongodb+srv://user:pass@some-url/some-db....
+     *   - mongodb://user:pass@some-url:port,some-url:port,../some-db....
+     * - It has been grouped like this: (mongodb+srv://)((user):(pass))(@some-url/(some-db....))
+     */
+    private static final String MONGO_URI_REGEX = "^(mongodb(\\+srv)?:\\/\\/)((.+):(.+))(@.+\\/(.+))$";
+
+    private static final int REGEX_GROUP_HEAD = 1;
+
+    private static final int REGEX_GROUP_USERNAME = 4;
+
+    private static final int REGEX_GROUP_PASSWORD = 5;
+
+    private static final int REGEX_GROUP_TAIL = 6;
+
+    private static final int REGEX_GROUP_DBNAME = 7;
+
+    private static final String KEY_USERNAME = "username";
+
+    private static final String KEY_PASSWORD = "password";
+
+    private static final String KEY_URI_HEAD = "uriHead";
+
+    private static final String KEY_URI_TAIL = "uriTail";
+
+    private static final String KEY_URI_DBNAME = "dbName";
+
+    private static final String YES = "Yes";
+
+    private static final int DATASOURCE_CONFIG_USE_MONGO_URI_PROPERTY_INDEX = 0;
+
+    private static final int DATASOURCE_CONFIG_MONGO_URI_PROPERTY_INDEX = 1;
 
     private static final Integer MONGO_COMMAND_EXCEPTION_UNAUTHORIZED_ERROR_CODE = 13;
 
+    private static final Set<Integer> bsonFields = new HashSet<>(Arrays.asList(AGGREGATE_PIPELINE,
+            COUNT_QUERY,
+            DELETE_QUERY,
+            DISTINCT_QUERY,
+            FIND_QUERY,
+            FIND_SORT,
+            FIND_PROJECTION,
+            INSERT_DOCUMENT,
+            UPDATE_QUERY,
+            UPDATE_UPDATE,
+            UPDATE_ONE_QUERY,
+            UPDATE_ONE_SORT,
+            UPDATE_ONE_UPDATE
+    ));
+
     public MongoPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
@@ -123,57 +190,59 @@ public class MongoPlugin extends BasePlugin {
             final List<Property> properties = actionConfiguration.getPluginSpecifiedTemplates();
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
 
+            // Default smart substitution to true
             if (CollectionUtils.isEmpty(properties)) {
-                /**
-                 * TODO :
-                 * In case the smart bson substitution configuration is missing, default to true once smart bson
-                 * substitution is no longer in beta.
-                 */
-                smartBsonSubstitution = false;
+
+                smartBsonSubstitution = true;
 
                 // Since properties is not empty, we are guaranteed to find the first property.
-            } else if (properties.get(SMART_BSON_SUBSTITUTION_INDEX) != null){
-                Object ssubValue = properties.get(SMART_BSON_SUBSTITUTION_INDEX).getValue();
-                if (ssubValue instanceof  Boolean) {
+            } else if (properties.get(SMART_BSON_SUBSTITUTION) != null) {
+                Object ssubValue = properties.get(SMART_BSON_SUBSTITUTION).getValue();
+                if (ssubValue instanceof Boolean) {
                     smartBsonSubstitution = (Boolean) ssubValue;
                 } else if (ssubValue instanceof String) {
                     smartBsonSubstitution = Boolean.parseBoolean((String) ssubValue);
                 } else {
-                    smartBsonSubstitution = false;
+                    smartBsonSubstitution = true;
                 }
             } else {
-                smartBsonSubstitution = false;
+                smartBsonSubstitution = true;
             }
 
             // Smartly substitute in actionConfiguration.body and replace all the bindings with values.
             if (TRUE.equals(smartBsonSubstitution)) {
-                // Do smart replacements in BSON body
-                if (actionConfiguration.getBody() != null) {
 
-                    // First extract all the bindings in order
-                    List<String> mustacheKeysInOrder = MustacheHelper.extractMustacheKeysInOrder(actionConfiguration.getBody());
-                    // Replace all the bindings with a ? as expected in a prepared statement.
-                    String updatedBody = MustacheHelper.replaceMustacheWithQuestionMark(actionConfiguration.getBody(), mustacheKeysInOrder);
-
-                    try {
-                        updatedBody = (String) smartSubstitutionOfBindings(updatedBody,
-                                mustacheKeysInOrder,
-                                executeActionDTO.getParams(),
-                                parameters);
-                    } catch (AppsmithPluginException e) {
-                        ActionExecutionResult errorResult = new ActionExecutionResult();
-                        errorResult.setStatusCode(AppsmithPluginError.PLUGIN_ERROR.getAppErrorCode().toString());
-                        errorResult.setIsExecutionSuccess(false);
-                        errorResult.setBody(e.getMessage());
-                        return Mono.just(errorResult);
+                // If not raw, then it must be form input.
+                if (!isRawCommand(actionConfiguration.getPluginSpecifiedTemplates())) {
+                    List<Property> updatedTemplates = smartSubstituteFormCommand(actionConfiguration.getPluginSpecifiedTemplates(),
+                            executeActionDTO.getParams(), parameters);
+                    actionConfiguration.setPluginSpecifiedTemplates(updatedTemplates);
+                } else {
+                    // For raw queries do smart replacements in BSON body
+                    if (actionConfiguration.getBody() != null) {
+                        try {
+                            String updatedRawQuery = smartSubstituteBSON(actionConfiguration.getBody(),
+                                    executeActionDTO.getParams(), parameters);
+                            actionConfiguration.setBody(updatedRawQuery);
+                        } catch (AppsmithPluginException e) {
+                            ActionExecutionResult errorResult = new ActionExecutionResult();
+                            errorResult.setStatusCode(AppsmithPluginError.PLUGIN_ERROR.getAppErrorCode().toString());
+                            errorResult.setIsExecutionSuccess(false);
+                            errorResult.setBody(e.getMessage());
+                            return Mono.just(errorResult);
+                        }
                     }
-
-                    actionConfiguration.setBody(updatedBody);
                 }
             }
 
             prepareConfigurationsForExecution(executeActionDTO, actionConfiguration, datasourceConfiguration);
 
+            // In case the input type is form instead of raw, parse the same into BSON command
+            String parsedRawCommand = convertMongoFormInputToRawCommand(actionConfiguration);
+            if (parsedRawCommand != null) {
+                actionConfiguration.setBody(parsedRawCommand);
+            }
+
             return this.executeCommon(mongoClient, datasourceConfiguration, actionConfiguration, parameters);
         }
 
@@ -204,8 +273,8 @@ public class MongoPlugin extends BasePlugin {
 
             Mono<Document> mongoOutputMono = Mono.from(database.runCommand(command));
             ActionExecutionResult result = new ActionExecutionResult();
-            List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null
-                    , null));
+            List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY, query, null
+                    , null, null));
 
             return mongoOutputMono
                     .onErrorMap(
@@ -222,6 +291,12 @@ public class MongoPlugin extends BasePlugin {
                                     error.getErrorMessage()
                             )
                     )
+                    // This is an experimental fix to handle the scenario where after a period of inactivity, the mongo
+                    // database drops the connection which makes the client throw the following exception.
+                    .onErrorMap(
+                            MongoSocketWriteException.class,
+                            error -> new StaleConnectionException()
+                    )
                     .flatMap(mongoOutput -> {
                         try {
                             JSONObject outputJson = new JSONObject(mongoOutput.toJson());
@@ -242,9 +317,9 @@ public class MongoPlugin extends BasePlugin {
                                  * we either get the modified new value or the pre-modified old value (depending on the
                                  * `new` field in the command. Let's return that value to the user.
                                  */
-                                if (outputJson.has(VALUE_STR)) {
+                                if (outputJson.has(VALUE)) {
                                     result.setBody(objectMapper.readTree(
-                                            cleanUp(new JSONObject().put(VALUE_STR, outputJson.get(VALUE_STR))).toString()
+                                            cleanUp(new JSONObject().put(VALUE, outputJson.get(VALUE))).toString()
                                     ));
                                 }
 
@@ -265,7 +340,7 @@ public class MongoPlugin extends BasePlugin {
                                  */
                                 if (outputJson.has("n")) {
                                     JSONObject body = new JSONObject().put("n", outputJson.getBigInteger("n"));
-                                    result.setBody(body);
+                                    result.setBody(objectMapper.readTree(body.toString()));
                                     headerArray.put(body);
                                 }
 
@@ -275,10 +350,19 @@ public class MongoPlugin extends BasePlugin {
                                  */
                                 if (outputJson.has(N_MODIFIED)) {
                                     JSONObject body = new JSONObject().put(N_MODIFIED, outputJson.getBigInteger(N_MODIFIED));
-                                    result.setBody(body);
+                                    result.setBody(objectMapper.readTree(body.toString()));
                                     headerArray.put(body);
                                 }
 
+                                /**
+                                 * The json contains key "values" when distinct command is used.
+                                 */
+                                if (outputJson.has(VALUES)) {
+                                    JSONArray outputResult = (JSONArray) cleanUp(
+                                            outputJson.getJSONArray("values"));
+                                    result.setBody(objectMapper.readTree(outputResult.toString()));
+                                }
+
                                 /** TODO
                                  * Go through all the possible fields that are returned in the output JSON and add all the fields
                                  * that are important to the headerArray.
@@ -296,6 +380,7 @@ public class MongoPlugin extends BasePlugin {
                     })
                     .onErrorResume(error -> {
                         if (error instanceof StaleConnectionException) {
+                            log.debug("The mongo connection seems to have been invalidated or doesn't exist anymore");
                             return Mono.error(error);
                         }
                         ActionExecutionResult actionExecutionResult = new ActionExecutionResult();
@@ -319,17 +404,36 @@ public class MongoPlugin extends BasePlugin {
                     .subscribeOn(scheduler);
         }
 
-        private String getDatabaseName(DatasourceConfiguration datasourceConfiguration) {
-            // Explicitly set default database.
-            String databaseName = datasourceConfiguration.getConnection().getDefaultDatabaseName();
+        private String smartSubstituteBSON(String rawQuery,
+                                           List<Param> params,
+                                           List<Map.Entry<String, String>> parameters) throws AppsmithPluginException {
 
-            // If that's not available, pick the authentication database.
-            final DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
-            if (StringUtils.isEmpty(databaseName) && authentication != null) {
-                databaseName = authentication.getDatabaseName();
+            // First extract all the bindings in order
+            List<String> mustacheKeysInOrder = MustacheHelper.extractMustacheKeysInOrder(rawQuery);
+            // Replace all the bindings with a ? as expected in a prepared statement.
+            String updatedQuery = MustacheHelper.replaceMustacheWithQuestionMark(rawQuery, mustacheKeysInOrder);
+
+            updatedQuery = (String) smartSubstitutionOfBindings(updatedQuery,
+                    mustacheKeysInOrder,
+                    params,
+                    parameters);
+
+            return updatedQuery;
+        }
+
+        private List<Property> smartSubstituteFormCommand(List<Property> templates,
+                                                          List<Param> params,
+                                                          List<Map.Entry<String, String>> parameters) throws AppsmithPluginException {
+
+            for (int i = 0; i < templates.size(); i++) {
+                if (validConfigurationPresent(templates, i) && bsonFields.contains(i)) {
+                    Property configuration = templates.get(i);
+                    // Do Smart Substitution for each BSON field
+                    configuration.setValue(smartSubstituteBSON((String) configuration.getValue(), params, parameters));
+                }
             }
 
-            return databaseName;
+            return templates;
         }
 
         @Override
@@ -367,9 +471,81 @@ public class MongoPlugin extends BasePlugin {
                     .subscribeOn(scheduler);
         }
 
-        public static String buildClientURI(DatasourceConfiguration datasourceConfiguration) throws AppsmithPluginException {
-            StringBuilder builder = new StringBuilder();
+        private boolean isUsingURI(DatasourceConfiguration datasourceConfiguration) {
+            List<Property> properties = datasourceConfiguration.getProperties();
+            if (properties != null && properties.size() > DATASOURCE_CONFIG_USE_MONGO_URI_PROPERTY_INDEX
+                    && properties.get(DATASOURCE_CONFIG_USE_MONGO_URI_PROPERTY_INDEX) != null
+                    && YES.equals(properties.get(DATASOURCE_CONFIG_USE_MONGO_URI_PROPERTY_INDEX).getValue())) {
+                return true;
+            }
 
+            return false;
+        }
+
+        private boolean hasNonEmptyURI(DatasourceConfiguration datasourceConfiguration) {
+            List<Property> properties = datasourceConfiguration.getProperties();
+            if (properties != null && properties.size() > DATASOURCE_CONFIG_MONGO_URI_PROPERTY_INDEX
+                    && properties.get(DATASOURCE_CONFIG_MONGO_URI_PROPERTY_INDEX) != null
+                    && !StringUtils.isEmpty(properties.get(DATASOURCE_CONFIG_MONGO_URI_PROPERTY_INDEX).getValue())) {
+                return true;
+            }
+
+            return false;
+        }
+
+        private Map extractInfoFromConnectionStringURI(String uri, String regex) {
+            if (uri.matches(regex)) {
+                Pattern pattern = Pattern.compile(regex);
+                Matcher matcher = pattern.matcher(uri);
+                if (matcher.find()) {
+                    Map extractedInfoMap = new HashMap();
+                    String username = matcher.group(REGEX_GROUP_USERNAME);
+                    extractedInfoMap.put(KEY_USERNAME, username == null ? "" : username);
+                    String password = matcher.group(REGEX_GROUP_PASSWORD);
+                    extractedInfoMap.put(KEY_PASSWORD, password == null ? "" : password);
+                    extractedInfoMap.put(KEY_URI_HEAD, matcher.group(REGEX_GROUP_HEAD));
+                    extractedInfoMap.put(KEY_URI_TAIL, matcher.group(REGEX_GROUP_TAIL));
+                    extractedInfoMap.put(KEY_URI_DBNAME, matcher.group(REGEX_GROUP_DBNAME).split("\\?")[0]);
+                    return extractedInfoMap;
+                }
+            }
+
+            return null;
+        }
+
+        private String buildURIfromExtractedInfo(Map extractedInfo, String password) {
+            return extractedInfo.get(KEY_URI_HEAD) + (extractedInfo.get(KEY_USERNAME) == null ? "" :
+                    extractedInfo.get(KEY_USERNAME) + ":") + (password == null ? "" : password)
+                    + extractedInfo.get(KEY_URI_TAIL);
+        }
+
+        public String buildClientURI(DatasourceConfiguration datasourceConfiguration) throws AppsmithPluginException {
+            List<Property> properties = datasourceConfiguration.getProperties();
+            if (isUsingURI(datasourceConfiguration)) {
+                if (hasNonEmptyURI(datasourceConfiguration)) {
+                    String uriWithHiddenPassword =
+                            (String) properties.get(DATASOURCE_CONFIG_MONGO_URI_PROPERTY_INDEX).getValue();
+                    Map extractedInfo = extractInfoFromConnectionStringURI(uriWithHiddenPassword, MONGO_URI_REGEX);
+                    if (extractedInfo != null) {
+                        String password = ((DBAuth) datasourceConfiguration.getAuthentication()).getPassword();
+                        return buildURIfromExtractedInfo(extractedInfo, password);
+                    } else {
+                        throw new AppsmithPluginException(
+                                AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR,
+                                "Appsmith server has failed to parse the Mongo connection string URI. Please check " +
+                                        "if the URI has the correct format."
+                        );
+                    }
+                } else {
+                    throw new AppsmithPluginException(
+                            AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR,
+                            "Could not find any Mongo connection string URI. Please edit the 'Mongo Connection String" +
+                                    " URI' field to provide the URI to connect to."
+                    );
+                }
+            }
+
+            StringBuilder builder = new StringBuilder();
             final Connection connection = datasourceConfiguration.getConnection();
             final List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
 
@@ -480,55 +656,107 @@ public class MongoPlugin extends BasePlugin {
             }
         }
 
+        private boolean hostStringHasConnectionURIHead(String host) {
+            if (!StringUtils.isEmpty(host) && (host.contains("mongodb://") || host.contains("mongodb+srv"))) {
+                return true;
+            }
+
+            return false;
+        }
+
+        private boolean isHostStringConnectionURI(Endpoint endpoint) {
+            if (endpoint != null && hostStringHasConnectionURIHead(endpoint.getHost())) {
+                return true;
+            }
+
+            return false;
+        }
+
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
             Set<String> invalids = new HashSet<>();
-
-            List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
-            if (CollectionUtils.isEmpty(endpoints)) {
-                invalids.add("Missing endpoint(s).");
-
-            } else if (Connection.Type.REPLICA_SET.equals(datasourceConfiguration.getConnection().getType())) {
-                if (endpoints.size() == 1 && endpoints.get(0).getPort() != null) {
-                    invalids.add("REPLICA_SET connections should not be given a port." +
-                            " If you are trying to specify all the shards, please add more than one.");
-                }
-
-            }
-
-            if (!CollectionUtils.isEmpty(endpoints)) {
-                boolean usingSrvUrl = endpoints
-                        .stream()
-                        .anyMatch(endPoint -> endPoint.getHost().contains("mongodb+srv"));
-
-                if (usingSrvUrl) {
-                    invalids.add("MongoDb SRV URLs are not yet supported. Please extract the individual fields from " +
-                            "the SRV URL into the datasource configuration form.");
-                }
-            }
-
+            List<Property> properties = datasourceConfiguration.getProperties();
             DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
-            if (authentication != null) {
-                DBAuth.Type authType = authentication.getAuthType();
+            if (isUsingURI(datasourceConfiguration)) {
+                if (!hasNonEmptyURI(datasourceConfiguration)) {
+                    invalids.add("'Mongo Connection String URI' field is empty. Please edit the 'Mongo Connection " +
+                            "URI' field to provide a connection uri to connect with.");
+                } else {
+                    String mongoUri = (String) properties.get(DATASOURCE_CONFIG_MONGO_URI_PROPERTY_INDEX).getValue();
+                    if (!mongoUri.matches(MONGO_URI_REGEX)) {
+                        invalids.add("Mongo Connection String URI does not seem to be in the correct format. Please " +
+                                "check the URI once.");
+                    } else {
+                        Map extractedInfo = extractInfoFromConnectionStringURI(mongoUri, MONGO_URI_REGEX);
+                        if (extractedInfo == null) {
+                            invalids.add("Mongo Connection String URI does not seem to be in the correct format. " +
+                                    "Please check the URI once.");
+                        } else if (!isAuthenticated(authentication, mongoUri)) {
+                            String mongoUriWithHiddenPassword = buildURIfromExtractedInfo(extractedInfo, "****");
+                            properties.get(DATASOURCE_CONFIG_MONGO_URI_PROPERTY_INDEX).setValue(mongoUriWithHiddenPassword);
+                            authentication = (authentication == null) ? new DBAuth() : authentication;
+                            authentication.setUsername((String) extractedInfo.get(KEY_USERNAME));
+                            authentication.setPassword((String) extractedInfo.get(KEY_PASSWORD));
+                            authentication.setDatabaseName((String) extractedInfo.get(KEY_URI_DBNAME));
+                            datasourceConfiguration.setAuthentication(authentication);
+
+                            // remove any default db set via form auto-fill via browser
+                            if (datasourceConfiguration.getConnection() != null) {
+                                datasourceConfiguration.getConnection().setDefaultDatabaseName(null);
+                            }
+                        }
+                    }
+                }
+            } else {
+                List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
+                if (CollectionUtils.isEmpty(endpoints)) {
+                    invalids.add("Missing endpoint(s).");
+
+                } else if (Connection.Type.REPLICA_SET.equals(datasourceConfiguration.getConnection().getType())) {
+                    if (endpoints.size() == 1 && endpoints.get(0).getPort() != null) {
+                        invalids.add("REPLICA_SET connections should not be given a port." +
+                                " If you are trying to specify all the shards, please add more than one.");
+                    }
 
-                if (authType == null || !VALID_AUTH_TYPES.contains(authType)) {
-                    invalids.add("Invalid authType. Must be one of " + VALID_AUTH_TYPES_STR);
                 }
 
-                if (StringUtils.isEmpty(authentication.getDatabaseName())) {
-                    invalids.add("Missing database name.");
+                if (!CollectionUtils.isEmpty(endpoints)) {
+                    boolean usingUri = endpoints
+                            .stream()
+                            .anyMatch(endPoint -> isHostStringConnectionURI(endPoint));
+
+                    if (usingUri) {
+                        invalids.add("It seems that you are trying to use a mongo connection string URI. Please " +
+                                "extract relevant fields and fill the form with extracted values. For " +
+                                "details, please check out the Appsmith's documentation for Mongo database. " +
+                                "Alternatively, you may use 'Import from Connection String URI' option from the " +
+                                "dropdown labelled 'Use Mongo Connection String URI' to use the URI connection string" +
+                                " directly.");
+                    }
                 }
 
-            }
+                if (authentication != null) {
+                    DBAuth.Type authType = authentication.getAuthType();
 
-            /*
-             * - Ideally, it is never expected to be null because the SSL dropdown is set to a initial value.
-             */
-            if (datasourceConfiguration.getConnection() == null
-                    || datasourceConfiguration.getConnection().getSsl() == null
-                    || datasourceConfiguration.getConnection().getSsl().getAuthType() == null) {
-                invalids.add("Appsmith server has failed to fetch SSL configuration from datasource configuration " +
-                        "form. Please reach out to Appsmith customer support to resolve this.");
+                    if (authType == null || !VALID_AUTH_TYPES.contains(authType)) {
+                        invalids.add("Invalid authType. Must be one of " + VALID_AUTH_TYPES_STR);
+                    }
+
+                    if (StringUtils.isEmpty(authentication.getDatabaseName())) {
+                        invalids.add("Missing database name.");
+                    }
+
+                }
+
+                /*
+                 * - Ideally, it is never expected to be null because the SSL dropdown is set to a initial value.
+                 */
+                if (datasourceConfiguration.getConnection() == null
+                        || datasourceConfiguration.getConnection().getSsl() == null
+                        || datasourceConfiguration.getConnection().getSsl().getAuthType() == null) {
+                    invalids.add("Appsmith server has failed to fetch SSL configuration from datasource configuration " +
+                            "form. Please reach out to Appsmith customer support to resolve this.");
+                }
             }
 
             return invalids;
@@ -581,6 +809,7 @@ public class MongoPlugin extends BasePlugin {
             final DatasourceStructure structure = new DatasourceStructure();
             List<DatasourceStructure.Table> tables = new ArrayList<>();
             structure.setTables(tables);
+
             final MongoDatabase database = mongoClient.getDatabase(getDatabaseName(datasourceConfiguration));
 
             return Flux.from(database.listCollectionNames())
@@ -589,6 +818,7 @@ public class MongoPlugin extends BasePlugin {
                         final ArrayList<DatasourceStructure.Template> templates = new ArrayList<>();
                         tables.add(new DatasourceStructure.Table(
                                 DatasourceStructure.TableType.COLLECTION,
+                                null,
                                 collectionName,
                                 columns,
                                 new ArrayList<>(),
@@ -631,145 +861,6 @@ public class MongoPlugin extends BasePlugin {
                     .subscribeOn(scheduler);
         }
 
-        private static void generateTemplatesAndStructureForACollection(String collectionName,
-                                                                        Document document,
-                                                                        ArrayList<DatasourceStructure.Column> columns,
-                                                                        ArrayList<DatasourceStructure.Template> templates) {
-            String filterFieldName = null;
-            String filterFieldValue = null;
-            Map<String, String> sampleInsertValues = new LinkedHashMap<>();
-
-            for (Map.Entry<String, Object> entry : document.entrySet()) {
-                final String name = entry.getKey();
-                final Object value = entry.getValue();
-                String type;
-
-                if (value instanceof Integer) {
-                    type = "Integer";
-                    sampleInsertValues.put(name, "1");
-                } else if (value instanceof Long) {
-                    type = "Long";
-                    sampleInsertValues.put(name, "NumberLong(\"1\")");
-                } else if (value instanceof Double) {
-                    type = "Double";
-                    sampleInsertValues.put(name, "1");
-                } else if (value instanceof Decimal128) {
-                    type = "BigDecimal";
-                    sampleInsertValues.put(name, "NumberDecimal(\"1\")");
-                } else if (value instanceof String) {
-                    type = "String";
-                    sampleInsertValues.put(name, "\"new value\"");
-                    if (filterFieldName == null || filterFieldName.compareTo(name) > 0) {
-                        filterFieldName = name;
-                        filterFieldValue = (String) value;
-                    }
-                } else if (value instanceof ObjectId) {
-                    type = "ObjectId";
-                    if (!value.equals("_id")) {
-                        sampleInsertValues.put(name, "ObjectId(\"a_valid_object_id_hex\")");
-                    }
-                } else if (value instanceof Collection) {
-                    type = "Array";
-                    sampleInsertValues.put(name, "[1, 2, 3]");
-                } else if (value instanceof Date) {
-                    type = "Date";
-                    sampleInsertValues.put(name, "new Date(\"2019-07-01\")");
-                } else {
-                    type = "Object";
-                    sampleInsertValues.put(name, "{}");
-                }
-
-                columns.add(new DatasourceStructure.Column(name, type, null));
-            }
-
-            columns.sort(Comparator.naturalOrder());
-
-            templates.add(
-                    new DatasourceStructure.Template(
-                            "Find",
-                            "{\n" +
-                                    "  \"find\": \"" + collectionName + "\",\n" +
-                                    (
-                                            filterFieldName == null ? "" :
-                                                    "  \"filter\": {\n" +
-                                                            "    \"" + filterFieldName + "\": \"" + filterFieldValue + "\"\n" +
-                                                            "  },\n"
-                                    ) +
-                                    "  \"sort\": {\n" +
-                                    "    \"_id\": 1\n" +
-                                    "  },\n" +
-                                    "  \"limit\": 10\n" +
-                                    "}\n"
-                    )
-            );
-
-            templates.add(
-                    new DatasourceStructure.Template(
-                            "Find by ID",
-                            "{\n" +
-                                    "  \"find\": \"" + collectionName + "\",\n" +
-                                    "  \"filter\": {\n" +
-                                    "    \"_id\": ObjectId(\"id_to_query_with\")\n" +
-                                    "  }\n" +
-                                    "}\n"
-                    )
-            );
-
-            sampleInsertValues.entrySet().stream()
-                    .map(entry -> "      \"" + entry.getKey() + "\": " + entry.getValue() + ",\n")
-                    .collect(Collectors.joining(""));
-            templates.add(
-                    new DatasourceStructure.Template(
-                            "Insert",
-                            "{\n" +
-                                    "  \"insert\": \"" + collectionName + "\",\n" +
-                                    "  \"documents\": [\n" +
-                                    "    {\n" +
-                                    sampleInsertValues.entrySet().stream()
-                                            .map(entry -> "      \"" + entry.getKey() + "\": " + entry.getValue() + ",\n")
-                                            .sorted()
-                                            .collect(Collectors.joining("")) +
-                                    "    }\n" +
-                                    "  ]\n" +
-                                    "}\n"
-                    )
-            );
-
-            templates.add(
-                    new DatasourceStructure.Template(
-                            "Update",
-                            "{\n" +
-                                    "  \"update\": \"" + collectionName + "\",\n" +
-                                    "  \"updates\": [\n" +
-                                    "    {\n" +
-                                    "      \"q\": {\n" +
-                                    "        \"_id\": ObjectId(\"id_of_document_to_update\")\n" +
-                                    "      },\n" +
-                                    "      \"u\": { \"$set\": { \"" + filterFieldName + "\": \"new value\" } }\n" +
-                                    "    }\n" +
-                                    "  ]\n" +
-                                    "}\n"
-                    )
-            );
-
-            templates.add(
-                    new DatasourceStructure.Template(
-                            "Delete",
-                            "{\n" +
-                                    "  \"delete\": \"" + collectionName + "\",\n" +
-                                    "  \"deletes\": [\n" +
-                                    "    {\n" +
-                                    "      \"q\": {\n" +
-                                    "        \"_id\": \"id_of_document_to_delete\"\n" +
-                                    "      },\n" +
-                                    "      \"limit\": 1\n" +
-                                    "    }\n" +
-                                    "  ]\n" +
-                                    "}\n"
-                    )
-            );
-        }
-
         @Override
         public Object substituteValueInInput(int index,
                                              String binding,
@@ -790,10 +881,6 @@ public class MongoPlugin extends BasePlugin {
         }
     }
 
-    private static String urlEncode(String text) {
-        return URLEncoder.encode(text, StandardCharsets.UTF_8);
-    }
-
     private static Object cleanUp(Object object) {
         if (object instanceof JSONObject) {
             JSONObject jsonObject = (JSONObject) object;
@@ -834,4 +921,13 @@ public class MongoPlugin extends BasePlugin {
         return object;
     }
 
+    private static boolean isAuthenticated(DBAuth authentication, String mongoUri) {
+        if (authentication != null && authentication.getUsername() != null
+                && authentication.getPassword() != null && mongoUri.contains("****")) {
+
+            return true;
+        }
+        return false;
+    }
+
 }
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPluginUtils.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPluginUtils.java
new file mode 100644
index 0000000000..f3bded5b38
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPluginUtils.java
@@ -0,0 +1,229 @@
+package com.external.plugins;
+
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.Property;
+import com.external.plugins.commands.Aggregate;
+import com.external.plugins.commands.Count;
+import com.external.plugins.commands.Delete;
+import com.external.plugins.commands.Distinct;
+import com.external.plugins.commands.Find;
+import com.external.plugins.commands.Insert;
+import com.external.plugins.commands.MongoCommand;
+import com.external.plugins.commands.UpdateMany;
+import com.external.plugins.commands.UpdateOne;
+import org.bson.Document;
+import org.bson.json.JsonParseException;
+import org.bson.types.Decimal128;
+import org.bson.types.ObjectId;
+import org.springframework.util.StringUtils;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.external.plugins.constants.ConfigurationIndex.COMMAND;
+import static com.external.plugins.constants.ConfigurationIndex.MAX_SIZE;
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+
+public class MongoPluginUtils {
+
+    public static Boolean validConfigurationPresent(List<Property> pluginSpecifiedTemplates, int index) {
+        if (pluginSpecifiedTemplates != null) {
+            if (pluginSpecifiedTemplates.size() > index) {
+                if (pluginSpecifiedTemplates.get(index) != null) {
+                    if (pluginSpecifiedTemplates.get(index).getValue() != null) {
+                        return Boolean.TRUE;
+                    }
+                }
+            }
+        }
+
+        return Boolean.FALSE;
+    }
+
+    public static Document parseSafely(String fieldName, String input) {
+        try {
+            return Document.parse(input);
+        } catch (JsonParseException e) {
+            throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, fieldName + " could not be parsed into expected JSON format.");
+        }
+    }
+
+    public static List<Property> generateMongoFormConfigTemplates(Map<Integer, Object> configuration) {
+        List<Property> templates = new ArrayList<>();
+        for (int i = 0; i < MAX_SIZE; i++) {
+            Property template = new Property();
+            if (configuration.containsKey(i)) {
+                template.setValue(configuration.get(i));
+            }
+            templates.add(template);
+        }
+        return templates;
+    }
+
+    public static Boolean isRawCommand(List<Property> templates) {
+        if ((templates.size() >= (1 + COMMAND)) &&
+                (templates.get(COMMAND) != null) &&
+                ("RAW".equals(templates.get(COMMAND).getValue()))) {
+            return TRUE;
+        }
+        return FALSE;
+    }
+
+    public static String convertMongoFormInputToRawCommand(ActionConfiguration actionConfiguration) {
+        List<Property> templates = actionConfiguration.getPluginSpecifiedTemplates();
+        if (templates != null) {
+            // If its not raw command, then it must be one of the mongo form commands
+            if (!isRawCommand(templates)) {
+
+                // Parse the commands into raw appropriately
+                MongoCommand command = null;
+                switch ((String) templates.get(COMMAND).getValue()) {
+                    case "INSERT":
+                        command = new Insert(actionConfiguration);
+                        break;
+                    case "FIND":
+                        command = new Find(actionConfiguration);
+                        break;
+                    case "UPDATE":
+                        command = new UpdateMany(actionConfiguration);
+                        break;
+                    case "UPDATE_ONE":
+                        command = new UpdateOne(actionConfiguration);
+                        break;
+                    case "DELETE":
+                        command = new Delete(actionConfiguration);
+                        break;
+                    case "COUNT":
+                        command = new Count(actionConfiguration);
+                        break;
+                    case "DISTINCT":
+                        command = new Distinct(actionConfiguration);
+                        break;
+                    case "AGGREGATE":
+                        command = new Aggregate(actionConfiguration);
+                        break;
+                    default:
+                        throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "No valid mongo command found. Please select a command from the \"Command\" dropdown and try again");
+                }
+                if (!command.isValid()) {
+                    throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "Try again after configuring the fields : " + command.getFieldNamesWithNoConfiguration());
+                }
+
+                return command.parseCommand().toJson();
+            }
+        }
+
+        // We reached here. This means either this is a RAW command input or some configuration error has happened
+        // in which case, we default to RAW
+        return actionConfiguration.getBody();
+    }
+
+    public static String getDatabaseName(DatasourceConfiguration datasourceConfiguration) {
+        // Explicitly set default database.
+        String databaseName = datasourceConfiguration.getConnection().getDefaultDatabaseName();
+
+        // If that's not available, pick the authentication database.
+        final DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
+        if (StringUtils.isEmpty(databaseName) && authentication != null) {
+            databaseName = authentication.getDatabaseName();
+        }
+
+        return databaseName;
+    }
+
+    public static void generateTemplatesAndStructureForACollection(String collectionName,
+                                                                    Document document,
+                                                                    ArrayList<DatasourceStructure.Column> columns,
+                                                                    ArrayList<DatasourceStructure.Template> templates) {
+        String filterFieldName = null;
+        String filterFieldValue = null;
+        Map<String, String> sampleInsertValues = new LinkedHashMap<>();
+
+        for (Map.Entry<String, Object> entry : document.entrySet()) {
+            final String name = entry.getKey();
+            final Object value = entry.getValue();
+            String type;
+
+            if (value instanceof Integer) {
+                type = "Integer";
+                sampleInsertValues.put(name, "1");
+            } else if (value instanceof Long) {
+                type = "Long";
+                sampleInsertValues.put(name, "NumberLong(\"1\")");
+            } else if (value instanceof Double) {
+                type = "Double";
+                sampleInsertValues.put(name, "1");
+            } else if (value instanceof Decimal128) {
+                type = "BigDecimal";
+                sampleInsertValues.put(name, "NumberDecimal(\"1\")");
+            } else if (value instanceof String) {
+                type = "String";
+                sampleInsertValues.put(name, "\"new value\"");
+                if (filterFieldName == null || filterFieldName.compareTo(name) > 0) {
+                    filterFieldName = name;
+                    filterFieldValue = (String) value;
+                }
+            } else if (value instanceof ObjectId) {
+                type = "ObjectId";
+                if (!value.equals("_id")) {
+                    sampleInsertValues.put(name, "ObjectId(\"a_valid_object_id_hex\")");
+                }
+            } else if (value instanceof Collection) {
+                type = "Array";
+                sampleInsertValues.put(name, "[1, 2, 3]");
+            } else if (value instanceof Date) {
+                type = "Date";
+                sampleInsertValues.put(name, "new Date(\"2019-07-01\")");
+            } else {
+                type = "Object";
+                sampleInsertValues.put(name, "{}");
+            }
+
+            columns.add(new DatasourceStructure.Column(name, type, null));
+        }
+
+        columns.sort(Comparator.naturalOrder());
+
+        Map<String, Object> templateConfiguration = new HashMap<>();
+        templateConfiguration.put("collectionName", collectionName);
+        templateConfiguration.put("filterFieldName", filterFieldName);
+        templateConfiguration.put("filterFieldValue", filterFieldValue);
+        templateConfiguration.put("sampleInsertValues", sampleInsertValues);
+
+        templates.addAll(
+                new Find().generateTemplate(templateConfiguration)
+        );
+
+
+        templates.addAll(
+                new Insert().generateTemplate(templateConfiguration)
+        );
+
+        templates.addAll(
+                new UpdateMany().generateTemplate(templateConfiguration)
+        );
+
+        templates.addAll(
+                new Delete().generateTemplate(templateConfiguration)
+        );
+    }
+
+    public static String urlEncode(String text) {
+        return URLEncoder.encode(text, StandardCharsets.UTF_8);
+    }
+
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Aggregate.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Aggregate.java
new file mode 100644
index 0000000000..690e8b8778
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Aggregate.java
@@ -0,0 +1,82 @@
+package com.external.plugins.commands;
+
+import com.appsmith.external.constants.DataType;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.appsmith.external.helpers.DataTypeStringUtils;
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.Property;
+import lombok.Getter;
+import lombok.Setter;
+import org.bson.Document;
+import org.pf4j.util.StringUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.external.plugins.MongoPluginUtils.parseSafely;
+import static com.external.plugins.MongoPluginUtils.validConfigurationPresent;
+import static com.external.plugins.constants.ConfigurationIndex.AGGREGATE_PIPELINE;
+
+@Getter
+@Setter
+public class Aggregate extends MongoCommand {
+    String pipeline;
+
+    public Aggregate(ActionConfiguration actionConfiguration) {
+        super(actionConfiguration);
+
+        List<Property> pluginSpecifiedTemplates = actionConfiguration.getPluginSpecifiedTemplates();
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, AGGREGATE_PIPELINE)) {
+            this.pipeline = (String) pluginSpecifiedTemplates.get(AGGREGATE_PIPELINE).getValue();
+        }
+    }
+
+    @Override
+    public Boolean isValid() {
+        if (super.isValid()) {
+            if (!StringUtils.isNullOrEmpty(pipeline)) {
+                return Boolean.TRUE;
+            } else {
+                fieldNamesWithNoConfiguration.add("Array of Pipelines");
+            }
+        }
+
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public Document parseCommand() {
+        Document commandDocument = new Document();
+
+        commandDocument.put("aggregate", this.collection);
+
+        DataType dataType = DataTypeStringUtils.stringToKnownDataTypeConverter(this.pipeline);
+        if (dataType.equals(DataType.ARRAY)) {
+            try {
+                List arrayListFromInput = objectMapper.readValue(this.pipeline, List.class);
+                if (arrayListFromInput.isEmpty()) {
+                    commandDocument.put("pipeline", "[]");
+                } else {
+                    commandDocument.put("pipeline", arrayListFromInput);
+                }
+            } catch (IOException e) {
+                throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "Array of Pipelines could not be parsed into expected JSON Array format.");
+            }
+        } else {
+            // The command expects the pipelines to be sent in an array. Parse and create a single element array
+            Document document = parseSafely("Array of Pipelines", this.pipeline);
+            ArrayList<Document> documentArrayList = new ArrayList<>();
+            documentArrayList.add(document);
+
+            commandDocument.put("pipeline", documentArrayList);
+        }
+
+        // Add default cursor
+        commandDocument.put("cursor", parseSafely("cursor", "{}"));
+
+        return commandDocument;
+    }
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Count.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Count.java
new file mode 100644
index 0000000000..6bb6db0b98
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Count.java
@@ -0,0 +1,53 @@
+package com.external.plugins.commands;
+
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.Property;
+import lombok.Getter;
+import lombok.Setter;
+import org.bson.Document;
+import org.pf4j.util.StringUtils;
+
+import java.util.List;
+
+import static com.external.plugins.MongoPluginUtils.parseSafely;
+import static com.external.plugins.MongoPluginUtils.validConfigurationPresent;
+import static com.external.plugins.constants.ConfigurationIndex.COUNT_QUERY;
+
+@Getter
+@Setter
+public class Count extends MongoCommand {
+    String query;
+
+    public Count(ActionConfiguration actionConfiguration) {
+        super(actionConfiguration);
+
+        List<Property> pluginSpecifiedTemplates = actionConfiguration.getPluginSpecifiedTemplates();
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, COUNT_QUERY)) {
+            this.query = (String) pluginSpecifiedTemplates.get(COUNT_QUERY).getValue();
+        }
+    }
+
+    @Override
+    public Boolean isValid() {
+        if (super.isValid()) {
+            if (!StringUtils.isNullOrEmpty(query)) {
+                return Boolean.TRUE;
+            } else {
+                fieldNamesWithNoConfiguration.add("Query");
+            }
+        }
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public Document parseCommand() {
+        Document document = new Document();
+
+        document.put("count", this.collection);
+
+        document.put("query", parseSafely("Query", this.query));
+
+        return document;
+    }
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Delete.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Delete.java
new file mode 100644
index 0000000000..4a9ac56690
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Delete.java
@@ -0,0 +1,118 @@
+package com.external.plugins.commands;
+
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.Property;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.bson.Document;
+import org.pf4j.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.external.plugins.MongoPluginUtils.generateMongoFormConfigTemplates;
+import static com.external.plugins.MongoPluginUtils.parseSafely;
+import static com.external.plugins.MongoPluginUtils.validConfigurationPresent;
+import static com.external.plugins.constants.ConfigurationIndex.SMART_BSON_SUBSTITUTION;
+import static com.external.plugins.constants.ConfigurationIndex.COLLECTION;
+import static com.external.plugins.constants.ConfigurationIndex.COMMAND;
+import static com.external.plugins.constants.ConfigurationIndex.DELETE_LIMIT;
+import static com.external.plugins.constants.ConfigurationIndex.DELETE_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.INPUT_TYPE;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class Delete extends MongoCommand {
+    String query;
+    Integer limit = 1; // Can be only 0 or 1. 0 indicates all matching documents, 1 indicates single matching document
+
+    public Delete(ActionConfiguration actionConfiguration) {
+        super(actionConfiguration);
+
+        List<Property> pluginSpecifiedTemplates = actionConfiguration.getPluginSpecifiedTemplates();
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, DELETE_QUERY)) {
+            this.query = (String) pluginSpecifiedTemplates.get(DELETE_QUERY).getValue();
+        }
+
+        // Default for this is 1 to indicate deleting only one document at a time.
+        if (validConfigurationPresent(pluginSpecifiedTemplates, DELETE_LIMIT)) {
+            String limitOption = (String) pluginSpecifiedTemplates.get(DELETE_LIMIT).getValue();
+            if ("ALL".equals(limitOption)) {
+                this.limit = 0;
+            }
+        }
+    }
+
+    @Override
+    public Boolean isValid() {
+        if (super.isValid()) {
+            if (!StringUtils.isNullOrEmpty(query)) {
+                return Boolean.TRUE;
+            } else {
+                fieldNamesWithNoConfiguration.add("Query");
+            }
+        }
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public Document parseCommand() {
+        Document document = new Document();
+
+        document.put("delete", this.collection);
+
+        Document queryDocument = parseSafely("Query", this.query);
+
+        Document delete = new Document();
+        delete.put("q", queryDocument);
+        delete.put("limit", this.limit);
+
+        List<Document> deletes = new ArrayList<>();
+        deletes.add(delete);
+
+        document.put("deletes", deletes);
+
+        return document;
+    }
+
+    @Override
+    public List<DatasourceStructure.Template> generateTemplate(Map<String, Object> templateConfiguration) {
+        String collectionName = (String) templateConfiguration.get("collectionName");
+
+        Map<Integer, Object> configMap = new HashMap<>();
+
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.TRUE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "DELETE");
+        configMap.put(COLLECTION, collectionName);
+        configMap.put(DELETE_QUERY, "{ \"_id\": ObjectId(\"id_of_document_to_delete\") }");
+        configMap.put(DELETE_LIMIT, "SINGLE");
+
+        List<Property> pluginSpecifiedTemplates = generateMongoFormConfigTemplates(configMap);
+
+        String rawQuery = "{\n" +
+                "  \"delete\": \"" + collectionName + "\",\n" +
+                "  \"deletes\": [\n" +
+                "    {\n" +
+                "      \"q\": {\n" +
+                "        \"_id\": \"id_of_document_to_delete\"\n" +
+                "      },\n" +
+                "      \"limit\": 1\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}\n";
+
+        return Collections.singletonList(new DatasourceStructure.Template(
+                "Delete",
+                rawQuery,
+                pluginSpecifiedTemplates
+        ));
+    }
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Distinct.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Distinct.java
new file mode 100644
index 0000000000..3d9d0edde6
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Distinct.java
@@ -0,0 +1,67 @@
+package com.external.plugins.commands;
+
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.Property;
+import lombok.Getter;
+import lombok.Setter;
+import org.bson.Document;
+import org.pf4j.util.StringUtils;
+
+import java.util.List;
+
+import static com.external.plugins.MongoPluginUtils.parseSafely;
+import static com.external.plugins.MongoPluginUtils.validConfigurationPresent;
+import static com.external.plugins.constants.ConfigurationIndex.DISTINCT_KEY;
+import static com.external.plugins.constants.ConfigurationIndex.DISTINCT_QUERY;
+
+@Getter
+@Setter
+public class Distinct extends MongoCommand {
+    String query;
+    String key;
+
+    public Distinct(ActionConfiguration actionConfiguration) {
+        super(actionConfiguration);
+
+        List<Property> pluginSpecifiedTemplates = actionConfiguration.getPluginSpecifiedTemplates();
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, DISTINCT_QUERY)) {
+            this.query = (String) pluginSpecifiedTemplates.get(DISTINCT_QUERY).getValue();
+        }
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, DISTINCT_KEY)) {
+            this.key = (String) pluginSpecifiedTemplates.get(DISTINCT_KEY).getValue();
+        }
+    }
+
+    @Override
+    public Boolean isValid() {
+        if (super.isValid()) {
+            if (!StringUtils.isNullOrEmpty(query) && !StringUtils.isNullOrEmpty(key)) {
+                return Boolean.TRUE;
+            } else {
+                if (StringUtils.isNullOrEmpty(query)) {
+                    fieldNamesWithNoConfiguration.add("Query");
+                }
+                if (StringUtils.isNullOrEmpty(key)) {
+                    fieldNamesWithNoConfiguration.add("Key/Field");
+                }
+            }
+        }
+
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public Document parseCommand() {
+        Document document = new Document();
+
+        document.put("distinct", this.collection);
+
+        document.put("query", parseSafely("Query", this.query));
+
+        document.put("key", this.key);
+
+        return document;
+    }
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Find.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Find.java
new file mode 100644
index 0000000000..53f3bcc318
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Find.java
@@ -0,0 +1,186 @@
+package com.external.plugins.commands;
+
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.Property;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.bson.Document;
+import org.pf4j.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.external.plugins.MongoPluginUtils.generateMongoFormConfigTemplates;
+import static com.external.plugins.MongoPluginUtils.parseSafely;
+import static com.external.plugins.MongoPluginUtils.validConfigurationPresent;
+import static com.external.plugins.constants.ConfigurationIndex.SMART_BSON_SUBSTITUTION;
+import static com.external.plugins.constants.ConfigurationIndex.COLLECTION;
+import static com.external.plugins.constants.ConfigurationIndex.COMMAND;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_LIMIT;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_PROJECTION;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_SKIP;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_SORT;
+import static com.external.plugins.constants.ConfigurationIndex.INPUT_TYPE;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class Find extends MongoCommand {
+    String query;
+    String sort;
+    String projection;
+    String limit;
+    String skip;
+
+    public Find(ActionConfiguration actionConfiguration) {
+        super(actionConfiguration);
+
+        List<Property> pluginSpecifiedTemplates = actionConfiguration.getPluginSpecifiedTemplates();
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, FIND_QUERY)) {
+            this.query = (String) pluginSpecifiedTemplates.get(FIND_QUERY).getValue();
+        }
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, FIND_SORT)) {
+            this.sort = (String) pluginSpecifiedTemplates.get(FIND_SORT).getValue();
+        }
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, FIND_PROJECTION)) {
+            this.projection = (String) pluginSpecifiedTemplates.get(FIND_PROJECTION).getValue();
+        }
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, FIND_LIMIT)) {
+            this.limit = (String) pluginSpecifiedTemplates.get(FIND_LIMIT).getValue();
+        }
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, FIND_SKIP)) {
+            this.skip = (String) pluginSpecifiedTemplates.get(FIND_SKIP).getValue();
+        }
+    }
+
+    @Override
+    public Boolean isValid() {
+        if (super.isValid()) {
+            if (!StringUtils.isNullOrEmpty(query)) {
+                return Boolean.TRUE;
+            } else {
+                fieldNamesWithNoConfiguration.add("Query");
+            }
+        }
+
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public Document parseCommand() {
+        Document document = new Document();
+
+        document.put("find", this.collection);
+
+        document.put("filter", parseSafely("Query", this.query));
+
+        if (!StringUtils.isNullOrEmpty(this.sort)) {
+            document.put("sort", parseSafely("Sort", this.sort));
+        }
+
+        if (!StringUtils.isNullOrEmpty(this.projection)) {
+            document.put("projection", parseSafely("Projection", this.projection));
+        }
+
+        // Default to returning 10 documents if not mentioned
+        int limit = 10;
+        if (!StringUtils.isNullOrEmpty(this.limit)) {
+            limit = Integer.parseInt(this.limit);
+        }
+        document.put("limit", limit);
+        document.put("batchSize", limit);
+
+        if (!StringUtils.isNullOrEmpty(this.skip)) {
+            document.put("skip", Long.parseLong(this.skip));
+        }
+
+        return document;
+    }
+
+    @Override
+    public List<DatasourceStructure.Template> generateTemplate(Map<String, Object> templateConfiguration) {
+        String collectionName = (String) templateConfiguration.get("collectionName");
+        String filterFieldName = (String) templateConfiguration.get("filterFieldName");
+        String filterFieldValue = (String) templateConfiguration.get("filterFieldValue");
+
+        List<DatasourceStructure.Template> templates = new ArrayList<>();
+
+        templates.add(generateFindTemplate(collectionName, filterFieldName, filterFieldValue));
+
+        templates.add(generateFindByIdTemplate(collectionName));
+
+        return templates;
+    }
+
+    private DatasourceStructure.Template generateFindTemplate(String collectionName, String filterFieldName, String filterFieldValue) {
+        Map<Integer, Object> configMap = new HashMap<>();
+
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.TRUE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "FIND");
+        configMap.put(COLLECTION, collectionName);
+        configMap.put(FIND_SORT, "{\"_id\": 1}");
+        configMap.put(FIND_LIMIT, "10");
+
+        String query = filterFieldName == null ? "{}" :
+                "{ \"" + filterFieldName + "\": \"" + filterFieldValue + "\"}";
+        configMap.put(FIND_QUERY, query);
+
+        List<Property> pluginSpecifiedTemplates = generateMongoFormConfigTemplates(configMap);
+
+        String rawQuery = "{\n" +
+                "  \"find\": \"" + collectionName + "\",\n" +
+                (
+                        filterFieldName == null ? "" :
+                                "  \"filter\": {\n" +
+                                        "    \"" + filterFieldName + "\": \"" + filterFieldValue + "\"\n" +
+                                        "  },\n"
+                ) +
+                "  \"sort\": {\n" +
+                "    \"_id\": 1\n" +
+                "  },\n" +
+                "  \"limit\": 10\n" +
+                "}\n";
+
+        return new DatasourceStructure.Template(
+                "Find",
+                rawQuery,
+                pluginSpecifiedTemplates
+        );
+    }
+
+    private DatasourceStructure.Template generateFindByIdTemplate(String collectionName) {
+        Map<Integer, Object> configMap = new HashMap<>();
+
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.TRUE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "FIND");
+        configMap.put(FIND_QUERY, "{\"_id\": ObjectId(\"id_to_query_with\")}");
+        configMap.put(COLLECTION, collectionName);
+
+        List<Property> pluginSpecifiedTemplates = generateMongoFormConfigTemplates(configMap);
+
+        String rawQuery = "{\n" +
+                "  \"find\": \"" + collectionName + "\",\n" +
+                "  \"filter\": {\n" +
+                "    \"_id\": ObjectId(\"id_to_query_with\")\n" +
+                "  }\n" +
+                "}\n";
+
+        return new DatasourceStructure.Template(
+                "Find by ID",
+                rawQuery,
+                pluginSpecifiedTemplates
+        );
+    }
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Insert.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Insert.java
new file mode 100644
index 0000000000..dc64192645
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/Insert.java
@@ -0,0 +1,126 @@
+package com.external.plugins.commands;
+
+import com.appsmith.external.constants.DataType;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.appsmith.external.helpers.DataTypeStringUtils;
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.Property;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.bson.Document;
+import org.pf4j.util.StringUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.external.plugins.MongoPluginUtils.generateMongoFormConfigTemplates;
+import static com.external.plugins.MongoPluginUtils.parseSafely;
+import static com.external.plugins.MongoPluginUtils.validConfigurationPresent;
+import static com.external.plugins.constants.ConfigurationIndex.SMART_BSON_SUBSTITUTION;
+import static com.external.plugins.constants.ConfigurationIndex.COLLECTION;
+import static com.external.plugins.constants.ConfigurationIndex.COMMAND;
+import static com.external.plugins.constants.ConfigurationIndex.INPUT_TYPE;
+import static com.external.plugins.constants.ConfigurationIndex.INSERT_DOCUMENT;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class Insert extends MongoCommand {
+    String documents;
+
+    public Insert(ActionConfiguration actionConfiguration) {
+        super(actionConfiguration);
+
+        List<Property> pluginSpecifiedTemplates = actionConfiguration.getPluginSpecifiedTemplates();
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, INSERT_DOCUMENT)) {
+            this.documents = (String) pluginSpecifiedTemplates.get(INSERT_DOCUMENT).getValue();
+        }
+    }
+
+    @Override
+    public Boolean isValid() {
+        if (super.isValid()) {
+            if (!StringUtils.isNullOrEmpty(documents)) {
+                return Boolean.TRUE;
+            } else {
+                fieldNamesWithNoConfiguration.add("Documents");
+            }
+        }
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public Document parseCommand() {
+        Document commandDocument = new Document();
+
+        commandDocument.put("insert", this.collection);
+
+        DataType dataType = DataTypeStringUtils.stringToKnownDataTypeConverter(this.documents);
+        if (dataType.equals(DataType.ARRAY)) {
+            try {
+                List arrayListFromInput = objectMapper.readValue(this.documents, List.class);
+                if (arrayListFromInput.isEmpty()) {
+                    commandDocument.put("documents", "[]");
+                } else {
+                    commandDocument.put("documents", arrayListFromInput);
+                }
+            } catch (IOException e) {
+                throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "Documents" + " could not be parsed into expected JSON Array format.");
+            }
+        } else {
+            // The command expects the documents to be sent in an array. Parse and create a single element array
+            Document document = parseSafely("Documents", this.documents);
+            ArrayList<Document> documentArrayList = new ArrayList<>();
+            documentArrayList.add(document);
+
+            commandDocument.put("documents", documentArrayList);
+        }
+
+        return commandDocument;
+    }
+
+    @Override
+    public List<DatasourceStructure.Template> generateTemplate(Map<String, Object> templateConfiguration) {
+        String collectionName = (String) templateConfiguration.get("collectionName");
+        Map<String, String> sampleInsertValues = (Map<String, String>) templateConfiguration.get("sampleInsertValues");
+
+        String sampleInsertDocuments = sampleInsertValues.entrySet().stream()
+                .map(entry -> "      \"" + entry.getKey() + "\": " + entry.getValue() + ",\n")
+                .sorted()
+                .collect(Collectors.joining(""));
+
+        Map<Integer, Object> configMap = new HashMap<>();
+
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.TRUE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "INSERT");
+        configMap.put(INSERT_DOCUMENT, "[{" + sampleInsertDocuments + "}]");
+        configMap.put(COLLECTION, collectionName);
+
+        List<Property> pluginSpecifiedTemplates = generateMongoFormConfigTemplates(configMap);
+
+        String rawQuery = "{\n" +
+                "  \"insert\": \"" + collectionName + "\",\n" +
+                "  \"documents\": [\n" +
+                "    {\n" +
+                sampleInsertDocuments +
+                "    }\n" +
+                "  ]\n" +
+                "}\n";
+
+        return Collections.singletonList(new DatasourceStructure.Template(
+                "Insert",
+                rawQuery,
+                pluginSpecifiedTemplates
+        ));
+    }
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/MongoCommand.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/MongoCommand.java
new file mode 100644
index 0000000000..2a42d87acc
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/MongoCommand.java
@@ -0,0 +1,61 @@
+package com.external.plugins.commands;
+
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.Property;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.bson.Document;
+import org.pf4j.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static com.external.plugins.MongoPluginUtils.validConfigurationPresent;
+import static com.external.plugins.constants.ConfigurationIndex.COLLECTION;
+
+/**
+ * This is the base class which every Mongo Command extends. Common functions across all mongo commands
+ * are implemented here including reading and validating the collection. This also defines functions which should be
+ * implemented by all the commands.
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public abstract class MongoCommand {
+    String collection;
+    List<String> fieldNamesWithNoConfiguration;
+    protected static final ObjectMapper objectMapper = new ObjectMapper();
+
+    public MongoCommand(ActionConfiguration actionConfiguration) {
+
+        this.fieldNamesWithNoConfiguration = new ArrayList<>();
+
+        List<Property> pluginSpecifiedTemplates = actionConfiguration.getPluginSpecifiedTemplates();
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, COLLECTION)) {
+            this.collection = (String) pluginSpecifiedTemplates.get(COLLECTION).getValue();
+        }
+    }
+
+    public Boolean isValid() {
+        if (StringUtils.isNullOrEmpty(this.collection)) {
+            fieldNamesWithNoConfiguration.add("Collection");
+            return Boolean.FALSE;
+        }
+        return Boolean.TRUE;
+    }
+
+    public Document parseCommand() {
+        throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, "Unsupported Operation : All mongo commands must implement parseCommand");
+    }
+
+    public List<DatasourceStructure.Template> generateTemplate(Map<String, Object> templateConfiguration) {
+        throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, "Unsupported Operation : All mongo commands must implement generateTemplate");
+    }
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/UpdateMany.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/UpdateMany.java
new file mode 100644
index 0000000000..2ab5f9d86f
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/UpdateMany.java
@@ -0,0 +1,134 @@
+package com.external.plugins.commands;
+
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.Property;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.bson.Document;
+import org.pf4j.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.external.plugins.MongoPluginUtils.generateMongoFormConfigTemplates;
+import static com.external.plugins.MongoPluginUtils.parseSafely;
+import static com.external.plugins.MongoPluginUtils.validConfigurationPresent;
+import static com.external.plugins.constants.ConfigurationIndex.COLLECTION;
+import static com.external.plugins.constants.ConfigurationIndex.COMMAND;
+import static com.external.plugins.constants.ConfigurationIndex.INPUT_TYPE;
+import static com.external.plugins.constants.ConfigurationIndex.SMART_BSON_SUBSTITUTION;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_LIMIT;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_UPDATE;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class UpdateMany extends MongoCommand {
+    String query;
+    String update;
+    Boolean multi = Boolean.FALSE;
+
+    public UpdateMany(ActionConfiguration actionConfiguration) {
+        super(actionConfiguration);
+
+        List<Property> pluginSpecifiedTemplates = actionConfiguration.getPluginSpecifiedTemplates();
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, UPDATE_QUERY)) {
+            this.query = (String) pluginSpecifiedTemplates.get(UPDATE_QUERY).getValue();
+        }
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, UPDATE_UPDATE)) {
+            this.update = (String) pluginSpecifiedTemplates.get(UPDATE_UPDATE).getValue();
+        }
+
+        // Default for this is 1 to indicate updating only one document at a time.
+        if (validConfigurationPresent(pluginSpecifiedTemplates, UPDATE_LIMIT)) {
+            String limitOption = (String) pluginSpecifiedTemplates.get(UPDATE_LIMIT).getValue();
+            if ("ALL".equals(limitOption)) {
+                this.multi = Boolean.TRUE;
+            }
+        }
+    }
+
+    @Override
+    public Boolean isValid() {
+        if (super.isValid()) {
+            if (!StringUtils.isNullOrEmpty(query) && !StringUtils.isNullOrEmpty(update)) {
+                return Boolean.TRUE;
+            } else {
+                if (StringUtils.isNullOrEmpty(query)) {
+                    fieldNamesWithNoConfiguration.add("Query");
+                }
+                if (StringUtils.isNullOrEmpty(update)) {
+                    fieldNamesWithNoConfiguration.add("Update");
+                }
+            }
+        }
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public Document parseCommand() {
+        Document document = new Document();
+
+        document.put("update", this.collection);
+
+        Document queryDocument = parseSafely("Query", this.query);
+
+        Document updateDocument = parseSafely("Update", this.update);
+
+        Document update = new Document();
+        update.put("q", queryDocument);
+        update.put("u", updateDocument);
+        update.put("multi", multi);
+
+        List<Document> updates = new ArrayList<>();
+        updates.add(update);
+
+        document.put("updates", updates);
+
+        return document;
+    }
+
+    @Override
+    public List<DatasourceStructure.Template> generateTemplate(Map<String, Object> templateConfiguration) {
+        String collectionName = (String) templateConfiguration.get("collectionName");
+        String filterFieldName = (String) templateConfiguration.get("filterFieldName");
+
+        Map<Integer, Object> configMap = new HashMap<>();
+
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.TRUE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "UPDATE");
+        configMap.put(COLLECTION, collectionName);
+        configMap.put(UPDATE_QUERY, "{ \"_id\": ObjectId(\"id_of_document_to_update\") }");
+        configMap.put(UPDATE_UPDATE, "{ \"$set\": { \"" + filterFieldName + "\": \"new value\" } }");
+        configMap.put(UPDATE_LIMIT, "ALL");
+
+        List<Property> pluginSpecifiedTemplates = generateMongoFormConfigTemplates(configMap);
+
+        String rawQuery = "{\n" +
+                "  \"update\": \"" + collectionName + "\",\n" +
+                "  \"updates\": [\n" +
+                "    {\n" +
+                "      \"q\": {\n" +
+                "        \"_id\": ObjectId(\"id_of_document_to_update\")\n" +
+                "      },\n" +
+                "      \"u\": { \"$set\": { \"" + filterFieldName + "\": \"new value\" } }\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}\n";
+
+        return Collections.singletonList(new DatasourceStructure.Template(
+                "Update",
+                rawQuery,
+                pluginSpecifiedTemplates
+        ));
+    }
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/UpdateOne.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/UpdateOne.java
new file mode 100644
index 0000000000..09afe82145
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/UpdateOne.java
@@ -0,0 +1,80 @@
+package com.external.plugins.commands;
+
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.Property;
+import lombok.Getter;
+import lombok.Setter;
+import org.bson.Document;
+import org.pf4j.util.StringUtils;
+
+import java.util.List;
+
+import static com.external.plugins.MongoPluginUtils.parseSafely;
+import static com.external.plugins.MongoPluginUtils.validConfigurationPresent;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_ONE_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_ONE_SORT;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_ONE_UPDATE;
+
+@Getter
+@Setter
+@Deprecated
+public class UpdateOne extends MongoCommand {
+    String query;
+    String sort;
+    String update;
+
+    public UpdateOne(ActionConfiguration actionConfiguration) {
+        super(actionConfiguration);
+
+        List<Property> pluginSpecifiedTemplates = actionConfiguration.getPluginSpecifiedTemplates();
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, UPDATE_ONE_QUERY)) {
+            this.query = (String) pluginSpecifiedTemplates.get(UPDATE_ONE_QUERY).getValue();
+        }
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, UPDATE_ONE_SORT)) {
+            this.sort = (String) pluginSpecifiedTemplates.get(UPDATE_ONE_SORT).getValue();
+        }
+
+        if (validConfigurationPresent(pluginSpecifiedTemplates, UPDATE_ONE_UPDATE)) {
+            this.update = (String) pluginSpecifiedTemplates.get(UPDATE_ONE_UPDATE).getValue();
+        }
+    }
+
+    @Override
+    public Boolean isValid() {
+        if (super.isValid()) {
+            if (!StringUtils.isNullOrEmpty(query) && !StringUtils.isNullOrEmpty(update)) {
+                return Boolean.TRUE;
+            } else {
+                if (StringUtils.isNullOrEmpty(query)) {
+                    fieldNamesWithNoConfiguration.add("Query");
+                }
+                if (StringUtils.isNullOrEmpty(update)) {
+                    fieldNamesWithNoConfiguration.add("Update");
+                }
+            }
+        }
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public Document parseCommand() {
+        Document document = new Document();
+
+        document.put("findAndModify", this.collection);
+
+        document.put("query", parseSafely("Query", this.query));
+
+        if (!StringUtils.isNullOrEmpty(this.sort)) {
+            document.put("sort", parseSafely("Sort", this.sort));
+        }
+
+        document.put("update", parseSafely("Update", this.update));
+
+        // Return the newly modified document
+        document.put("new", Boolean.TRUE);
+
+        return document;
+    }
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/constants/ConfigurationIndex.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/constants/ConfigurationIndex.java
new file mode 100644
index 0000000000..9c6c03caf8
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/constants/ConfigurationIndex.java
@@ -0,0 +1,35 @@
+package com.external.plugins.constants;
+
+public class ConfigurationIndex {
+    public static final int SMART_BSON_SUBSTITUTION = 0;
+
+    @Deprecated
+    public static final int INPUT_TYPE = 1; // Input type is no longer used. Raw type is now a type of command
+
+    public static final int COMMAND = 2;
+    public static final int COLLECTION = 19;
+    public static final int FIND_QUERY = 3;
+    public static final int FIND_SORT = 4;
+    public static final int FIND_PROJECTION = 5;
+    public static final int FIND_LIMIT = 6;
+    public static final int FIND_SKIP = 7;
+    public static final int UPDATE_ONE_QUERY = 8;
+    public static final int UPDATE_ONE_SORT = 9;
+    public static final int UPDATE_ONE_UPDATE = 10;
+    public static final int UPDATE_QUERY = 11;
+    public static final int UPDATE_UPDATE = 12;
+    public static final int UPDATE_LIMIT = 21;
+    public static final int DELETE_QUERY = 13;
+    public static final int DELETE_LIMIT = 20;
+    public static final int COUNT_QUERY = 14;
+    public static final int DISTINCT_QUERY = 15;
+    public static final int DISTINCT_KEY = 16;
+    public static final int AGGREGATE_PIPELINE = 17;
+    public static final int INSERT_DOCUMENT = 18;
+
+    /**
+     * !!! WARNING !!!
+     * Please update the size variable below whenever adding a new property in plugin specified templates
+     */
+    public static final int MAX_SIZE = 22;
+}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor.json
index b5ab09ce68..8297c14b4f 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor.json
@@ -4,6 +4,342 @@
       "sectionName": "",
       "id": 1,
       "children": [
+        {
+          "label": "Command",
+          "configProperty": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+          "controlType": "DROP_DOWN",
+          "initialValue": "FIND",
+          "options": [
+            {
+              "label": "Insert Document(s)",
+              "value": "INSERT"
+            },
+            {
+              "label": "Find Document(s)",
+              "value": "FIND"
+            },
+            {
+              "label": "Update Document(s)",
+              "value": "UPDATE"
+            },
+            {
+              "label": "Delete Document(s)",
+              "value": "DELETE"
+            },
+            {
+              "label": "Count",
+              "value": "COUNT"
+            },
+            {
+              "label": "Distinct",
+              "value": "DISTINCT"
+            },
+            {
+              "label": "Aggregate",
+              "value": "AGGREGATE"
+            },
+            {
+              "label": "Raw",
+              "value": "RAW"
+            }
+          ],
+          "hidden": {
+            "path": "actionConfiguration.pluginSpecifiedTemplates[1].value",
+            "comparison": "EQUALS",
+            "value": "RAW"
+          }
+        },
+        {
+          "label": "Collection Name",
+          "configProperty": "actionConfiguration.pluginSpecifiedTemplates[19].value",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "hidden": {
+            "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+            "comparison": "EQUALS",
+            "value": "RAW"
+          }
+        },
+        {
+          "sectionName": "",
+          "id": 2,
+          "serverLabel": "findCommandForm",
+          "hidden" : {
+            "conditionType": "OR",
+            "conditions": [
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+                "comparison": "NOT_EQUALS",
+                "value": "FIND"
+              }
+            ]
+          },
+          "children": [
+            {
+              "label": "Query",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[3].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{rating : {$gte : 9}}"
+            },
+            {
+              "label": "Sort",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[4].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{name : 1}"
+            },
+            {
+              "label": "Projection",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[5].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{name : 1}"
+            },
+            {
+              "label": "Limit",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[6].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "10"
+            },
+            {
+              "label": "Skip",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[7].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "0"
+            }
+          ]
+        },
+        {
+          "sectionName": "",
+          "id": 3,
+          "serverLabel": "updateOne",
+          "hidden" : {
+            "conditionType": "OR",
+            "conditions": [
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+                "comparison": "NOT_EQUALS",
+                "value": "UPDATE_ONE"
+              }
+            ]
+          },
+          "children": [
+            {
+              "label": "Query",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[8].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{rating : {$gte : 9}}"
+            },
+            {
+              "label": "Sort",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[9].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{name : 1}"
+            },
+            {
+              "label": "Update",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[10].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{ $inc: { score: 1 } }"
+            }
+          ]
+        },
+        {
+          "sectionName": "",
+          "id": 4,
+          "serverLabel": "updateMany",
+          "hidden" : {
+            "conditionType": "OR",
+            "conditions": [
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+                "comparison": "NOT_EQUALS",
+                "value": "UPDATE"
+              }
+            ]
+          },
+          "children": [
+            {
+              "label": "Query",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[11].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{rating : {$gte : 9}}"
+            },
+            {
+              "label": "Update",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[12].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{ $inc: { score: 1 } }"
+            },
+            {
+              "label": "Limit",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[21].value",
+              "controlType": "DROP_DOWN",
+              "initialValue": "SINGLE",
+              "options": [
+                {
+                  "label": "Single Document",
+                  "value": "SINGLE"
+                },
+                {
+                  "label": "All Matching Documents",
+                  "value": "ALL"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "sectionName": "",
+          "id": 5,
+          "serverLabel": "delete",
+          "hidden" : {
+            "conditionType": "OR",
+            "conditions": [
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+                "comparison": "NOT_EQUALS",
+                "value": "DELETE"
+              }
+            ]
+          },
+          "children": [
+            {
+              "label": "Query",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[13].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{rating : {$gte : 9}}"
+            },
+            {
+              "label": "Limit",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[20].value",
+              "controlType": "DROP_DOWN",
+              "initialValue": "SINGLE",
+              "options": [
+                {
+                  "label": "Single Document",
+                  "value": "SINGLE"
+                },
+                {
+                  "label": "All Matching Documents",
+                  "value": "ALL"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "sectionName": "",
+          "id": 6,
+          "serverLabel": "count",
+          "hidden" : {
+            "conditionType": "OR",
+            "conditions": [
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+                "comparison": "NOT_EQUALS",
+                "value": "COUNT"
+              }
+            ]
+          },
+          "children": [
+            {
+              "label": "Query",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[14].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{rating : {$gte : 9}}"
+            }
+          ]
+        },
+        {
+          "sectionName": "",
+          "id": 7,
+          "serverLabel": "distinct",
+          "hidden" : {
+            "conditionType": "OR",
+            "conditions": [
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+                "comparison": "NOT_EQUALS",
+                "value": "DISTINCT"
+              }
+            ]
+          },
+          "children": [
+            {
+              "label": "Query",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[15].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "{rating : {$gte : 9}}"
+            },
+            {
+              "label": "Key",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[16].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "name"
+            }
+          ]
+        },
+        {
+          "sectionName": "",
+          "id": 8,
+          "serverLabel": "aggregate",
+          "hidden" : {
+            "conditionType": "OR",
+            "conditions": [
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+                "comparison": "NOT_EQUALS",
+                "value": "AGGREGATE"
+              }
+            ]
+          },
+          "children": [
+            {
+              "label": "Array of Pipelines",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[17].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "[{ $project: { tags: 1 } }, { $unwind: \"$tags\" }, { $group: { _id: \"$tags\", count: { $sum : 1 } } }  ]"
+            }
+          ]
+        },
+        {
+          "sectionName": "",
+          "id": 9,
+          "serverLabel": "insert",
+          "hidden" : {
+            "conditionType": "OR",
+            "conditions": [
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+                "comparison": "NOT_EQUALS",
+                "value": "INSERT"
+              }
+            ]
+          },
+          "children": [
+            {
+              "label": "Documents",
+              "configProperty": "actionConfiguration.pluginSpecifiedTemplates[18].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE",
+              "placeholderText" : "[ { _id: 1, user: \"abc123\", status: \"A\" } ]"
+            }
+          ]
+        },
         {
           "label": "",
           "internalLabel": "Query",
@@ -11,9 +347,19 @@
           "controlType": "QUERY_DYNAMIC_TEXT",
           "evaluationSubstitutionType": "SMART_SUBSTITUTE",
           "hidden": {
-            "path": "actionConfiguration.pluginSpecifiedTemplates[0].value",
-            "comparison": "EQUALS",
-            "value": false
+            "conditionType": "OR",
+            "conditions": [
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+                "comparison": "NOT_EQUALS",
+                "value": "RAW"
+              },
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[0].value",
+                "comparison": "EQUALS",
+                "value": false
+              }
+            ]
           }
         },
         {
@@ -23,9 +369,19 @@
           "controlType": "QUERY_DYNAMIC_TEXT",
           "evaluationSubstitutionType": "TEMPLATE",
           "hidden": {
-            "path": "actionConfiguration.pluginSpecifiedTemplates[0].value",
-            "comparison": "EQUALS",
-            "value": true
+            "conditionType": "OR",
+            "conditions": [
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[2].value",
+                "comparison": "NOT_EQUALS",
+                "value": "RAW"
+              },
+              {
+                "path": "actionConfiguration.pluginSpecifiedTemplates[0].value",
+                "comparison": "EQUALS",
+                "value": true
+              }
+            ]
           }
         }
       ]
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json
index 0ee963a8f7..1878ba55df 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json
@@ -3,6 +3,47 @@
     {
       "sectionName": "Connection",
       "children": [
+        {
+          "label": "Use Mongo Connection String URI Key",
+          "configProperty": "datasourceConfiguration.properties[0].key",
+          "controlType": "INPUT_TEXT",
+          "initialValue": "Use Mongo Connection String URI",
+          "hidden": true
+        },
+        {
+          "label": "Use Mongo Connection String URI",
+          "configProperty": "datasourceConfiguration.properties[0].value",
+          "controlType": "DROP_DOWN",
+          "initialValue": "No",
+          "options": [
+            {
+              "label": "Yes",
+              "value": "Yes"
+            },
+            {
+              "label": "No",
+              "value": "No"
+            }
+          ]
+        },
+        {
+          "label": "Connection String URI Key",
+          "configProperty": "datasourceConfiguration.properties[1].key",
+          "controlType": "INPUT_TEXT",
+          "initialValue": "Connection String URI",
+          "hidden": true
+        },
+        {
+          "label": "Connection String URI",
+          "placeholderText": "mongodb+srv://<username>:<password>@test-db.swrsq.mongodb.net/myDatabase",
+          "configProperty": "datasourceConfiguration.properties[1].value",
+          "controlType": "INPUT_TEXT",
+          "hidden": {
+            "path": "datasourceConfiguration.properties[0].value",
+            "comparison": "NOT_EQUALS",
+            "value": "Yes"
+          }
+        },
         {
           "label": "Connection Mode",
           "configProperty": "datasourceConfiguration.connection.mode",
@@ -17,7 +58,12 @@
               "label": "Read / Write",
               "value": "READ_WRITE"
             }
-          ]
+          ],
+          "hidden": {
+            "path": "datasourceConfiguration.properties[0].value",
+            "comparison": "EQUALS",
+            "value": "Yes"
+          }
         },
         {
           "label": "Connection Type",
@@ -33,7 +79,12 @@
               "label": "Replica set",
               "value": "REPLICA_SET"
             }
-          ]
+          ],
+          "hidden": {
+            "path": "datasourceConfiguration.properties[0].value",
+            "comparison": "EQUALS",
+            "value": "Yes"
+          }
         },
         {
           "sectionName": null,
@@ -44,13 +95,23 @@
               "controlType": "KEYVALUE_ARRAY",
               "validationMessage": "Please enter a valid host",
               "validationRegex": "^((?![/:]).)*$",
-              "placeholderText": "myapp.abcde.mongodb.net"
+              "placeholderText": "myapp.abcde.mongodb.net",
+              "hidden": {
+                "path": "datasourceConfiguration.properties[0].value",
+                "comparison": "EQUALS",
+                "value": "Yes"
+              }
             },
             {
               "label": "Port",
               "configProperty": "datasourceConfiguration.endpoints[*].port",
               "dataType": "NUMBER",
-              "controlType": "KEYVALUE_ARRAY"
+              "controlType": "KEYVALUE_ARRAY",
+              "hidden": {
+                "path": "datasourceConfiguration.properties[0].value",
+                "comparison": "EQUALS",
+                "value": "Yes"
+              }
             }
           ]
         },
@@ -58,12 +119,22 @@
           "label": "Default Database Name",
           "placeholderText": "(Optional)",
           "configProperty": "datasourceConfiguration.connection.defaultDatabaseName",
-          "controlType": "INPUT_TEXT"
+          "controlType": "INPUT_TEXT",
+          "hidden": {
+            "path": "datasourceConfiguration.properties[0].value",
+            "comparison": "EQUALS",
+            "value": "Yes"
+          }
         }
       ]
     },
     {
       "sectionName": "Authentication",
+      "hidden": {
+        "path": "datasourceConfiguration.properties[0].value",
+        "comparison": "EQUALS",
+        "value": "Yes"
+      },
       "children": [
         {
           "label": "Database Name",
@@ -108,13 +179,18 @@
               "controlType": "INPUT_TEXT",
               "placeholderText": "Password",
               "encrypted": true
-            }
+              }
           ]
         }
       ]
     },
     {
       "sectionName": "SSL (optional)",
+      "hidden": {
+        "path": "datasourceConfiguration.properties[0].value",
+        "comparison": "EQUALS",
+        "value": "Yes"
+      },
       "children": [
         {
           "label": "SSL Mode",
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 a155ed421b..d0d7304253 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
@@ -17,11 +17,11 @@
           "info": "Ask confirmation from the user each time before refreshing data"
         },
         {
-          "label": "[Beta] Smart BSON Substitution",
+          "label": "Smart BSON Substitution",
           "info": "Turning on this property fixes the BSON substitution of bindings in the Mongo BSON document by adding/removing quotes intelligently and reduces developer errors",
           "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
           "controlType": "SWITCH",
-          "initialValue": false
+          "initialValue": true
         },
         {
           "label": "Query timeout (in milliseconds)",
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginTest.java b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginTest.java
index 7013c2f308..339e4917cd 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginTest.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginTest.java
@@ -1,8 +1,8 @@
 package com.external.plugins;
 
 import com.appsmith.external.dtos.ExecuteActionDTO;
-import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.ActionExecutionRequest;
 import com.appsmith.external.models.ActionExecutionResult;
@@ -38,14 +38,34 @@ import reactor.test.StepVerifier;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
+import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
 import static com.appsmith.external.constants.DisplayDataType.JSON;
 import static com.appsmith.external.constants.DisplayDataType.RAW;
-import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
+import static com.external.plugins.MongoPluginUtils.generateMongoFormConfigTemplates;
+import static com.external.plugins.constants.ConfigurationIndex.AGGREGATE_PIPELINE;
+import static com.external.plugins.constants.ConfigurationIndex.COLLECTION;
+import static com.external.plugins.constants.ConfigurationIndex.COMMAND;
+import static com.external.plugins.constants.ConfigurationIndex.COUNT_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.DELETE_LIMIT;
+import static com.external.plugins.constants.ConfigurationIndex.DELETE_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.DISTINCT_KEY;
+import static com.external.plugins.constants.ConfigurationIndex.DISTINCT_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_LIMIT;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_PROJECTION;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.FIND_SORT;
+import static com.external.plugins.constants.ConfigurationIndex.INPUT_TYPE;
+import static com.external.plugins.constants.ConfigurationIndex.INSERT_DOCUMENT;
+import static com.external.plugins.constants.ConfigurationIndex.SMART_BSON_SUBSTITUTION;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_LIMIT;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_QUERY;
+import static com.external.plugins.constants.ConfigurationIndex.UPDATE_UPDATE;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -83,26 +103,27 @@ public class MongoPluginTest {
         final MongoClient mongoClient = MongoClients.create(uri);
 
         Flux.from(mongoClient.getDatabase("test").listCollectionNames()).collectList().
-        flatMap(collectionNamesList -> {
-            final MongoCollection<Document> usersCollection = mongoClient.getDatabase("test").getCollection(
-                    "users");
-            if(collectionNamesList.size() == 0) {
-                Mono.from(usersCollection.insertMany(List.of(
-                        new Document(Map.of(
-                                "name", "Cierra Vega",
-                                "gender", "F",
-                                "age", 20,
-                                "luckyNumber", 987654321L,
-                                "dob", LocalDate.of(2018, 12, 31),
-                                "netWorth", new BigDecimal("123456.789012")
-                        )),
-                        new Document(Map.of("name", "Alden Cantrell", "gender", "M", "age", 30)),
-                        new Document(Map.of("name", "Kierra Gentry", "gender", "F", "age", 40))
-                ))).block();
-            }
+                flatMap(collectionNamesList -> {
+                    final MongoCollection<Document> usersCollection = mongoClient.getDatabase("test").getCollection(
+                            "users");
+                    if (collectionNamesList.size() == 0) {
+                        Mono.from(usersCollection.insertMany(List.of(
+                                new Document(Map.of(
+                                        "name", "Cierra Vega",
+                                        "gender", "F",
+                                        "age", 20,
+                                        "luckyNumber", 987654321L,
+                                        "dob", LocalDate.of(2018, 12, 31),
+                                        "netWorth", new BigDecimal("123456.789012"),
+                                        "updatedByCommand", false
+                                )),
+                                new Document(Map.of("name", "Alden Cantrell", "gender", "M", "age", 30)),
+                                new Document(Map.of("name", "Kierra Gentry", "gender", "F", "age", 40))
+                        ))).block();
+                    }
 
-            return Mono.just(usersCollection);
-        }).block();
+                    return Mono.just(usersCollection);
+                }).block();
     }
 
     private DatasourceConfiguration createDatasourceConfiguration() {
@@ -182,7 +203,7 @@ public class MongoPluginTest {
          *      - On calling testDatasource(...) -> call the real method.
          *      - On calling datasourceCreate(...) -> throw the mock exception defined above.
          */
-        MongoPlugin.MongoPluginExecutor mongoPluginExecutor    = new MongoPlugin.MongoPluginExecutor();
+        MongoPlugin.MongoPluginExecutor mongoPluginExecutor = new MongoPlugin.MongoPluginExecutor();
         MongoPlugin.MongoPluginExecutor spyMongoPluginExecutor = spy(mongoPluginExecutor);
         /* Please check this out before modifying this line: https://stackoverflow
          * .com/questions/11620103/mockito-trying-to-spy-on-method-is-calling-the-original-method
@@ -213,6 +234,11 @@ public class MongoPluginTest {
                 "      sort: { id: 1 },\n" +
                 "      limit: 10,\n" +
                 "    }");
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("jsonSmartSubstitution", "true"));
+        pluginSpecifiedTemplates.add(null);
+        pluginSpecifiedTemplates.add(new Property("command", "RAW"));
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
 
         Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
 
@@ -235,7 +261,7 @@ public class MongoPluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            actionConfiguration.getBody(), null, null));
+                            actionConfiguration.getBody(), null, null, null));
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -253,6 +279,11 @@ public class MongoPluginTest {
                 "      sort: { id: 1 },\n" +
                 "      limit: 10,\n" +
                 "    }");
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("jsonSmartSubstitution", "true"));
+        pluginSpecifiedTemplates.add(null);
+        pluginSpecifiedTemplates.add(new Property("command", "RAW"));
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
 
         Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
 
@@ -271,7 +302,7 @@ public class MongoPluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            actionConfiguration.getBody(), null, null));
+                            actionConfiguration.getBody(), null, null, null));
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -294,6 +325,11 @@ public class MongoPluginTest {
                 "        },\n" +
                 "      ],\n" +
                 "    }");
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("jsonSmartSubstitution", "true"));
+        pluginSpecifiedTemplates.add(null);
+        pluginSpecifiedTemplates.add(new Property("command", "RAW"));
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
         Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
 
         StepVerifier.create(executeMono)
@@ -308,6 +344,19 @@ public class MongoPluginTest {
                     );
                 })
                 .verifyComplete();
+
+        // Clean up this newly inserted value
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "DELETE");
+        configMap.put(COLLECTION, "users");
+        configMap.put(DELETE_QUERY, "{\"name\": \"John Smith\"}");
+        configMap.put(DELETE_LIMIT, "SINGLE");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+        // Run the delete command
+        dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration)).block();
     }
 
     @Test
@@ -324,6 +373,11 @@ public class MongoPluginTest {
                 " },\n" +
                 "  update: { $set: { gender: \"F\" }}\n" +
                 "}");
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("jsonSmartSubstitution", "true"));
+        pluginSpecifiedTemplates.add(null);
+        pluginSpecifiedTemplates.add(new Property("command", "RAW"));
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
         Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
 
         StepVerifier.create(executeMono)
@@ -355,6 +409,11 @@ public class MongoPluginTest {
                 "      find: \"users\",\n" +
                 "      limit: 1,\n" +
                 "    }");
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("jsonSmartSubstitution", "true"));
+        pluginSpecifiedTemplates.add(null);
+        pluginSpecifiedTemplates.add(new Property("command", "RAW"));
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
 
         Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
 
@@ -390,9 +449,9 @@ public class MongoPluginTest {
                     assertNotNull(structure);
                     assertEquals(1, structure.getTables().size());
 
-                    final DatasourceStructure.Table possessionsTable = structure.getTables().get(0);
-                    assertEquals("users", possessionsTable.getName());
-                    assertEquals(DatasourceStructure.TableType.COLLECTION, possessionsTable.getType());
+                    final DatasourceStructure.Table usersTable = structure.getTables().get(0);
+                    assertEquals("users", usersTable.getName());
+                    assertEquals(DatasourceStructure.TableType.COLLECTION, usersTable.getType());
                     assertArrayEquals(
                             new DatasourceStructure.Column[]{
                                     new DatasourceStructure.Column("_id", "ObjectId", null),
@@ -402,87 +461,244 @@ public class MongoPluginTest {
                                     new DatasourceStructure.Column("luckyNumber", "Long", null),
                                     new DatasourceStructure.Column("name", "String", null),
                                     new DatasourceStructure.Column("netWorth", "BigDecimal", null),
+                                    new DatasourceStructure.Column("updatedByCommand", "Object", null),
                             },
-                            possessionsTable.getColumns().toArray()
+                            usersTable.getColumns().toArray()
                     );
 
                     assertArrayEquals(
                             new DatasourceStructure.Key[]{},
-                            possessionsTable.getKeys().toArray()
+                            usersTable.getKeys().toArray()
                     );
+                    List<DatasourceStructure.Template> templates = usersTable.getTemplates();
 
-                    assertArrayEquals(
-                            new DatasourceStructure.Template[]{
-                                    new DatasourceStructure.Template("Find", "{\n" +
-                                            "  \"find\": \"users\",\n" +
-                                            "  \"filter\": {\n" +
-                                            "    \"gender\": \"F\"\n" +
-                                            "  },\n" +
-                                            "  \"sort\": {\n" +
-                                            "    \"_id\": 1\n" +
-                                            "  },\n" +
-                                            "  \"limit\": 10\n" +
-                                            "}\n"),
-                                    new DatasourceStructure.Template("Find by ID", "{\n" +
-                                            "  \"find\": \"users\",\n" +
-                                            "  \"filter\": {\n" +
-                                            "    \"_id\": ObjectId(\"id_to_query_with\")\n" +
-                                            "  }\n" +
-                                            "}\n"),
-                                    new DatasourceStructure.Template("Insert", "{\n" +
-                                            "  \"insert\": \"users\",\n" +
-                                            "  \"documents\": [\n" +
-                                            "    {\n" +
-                                            "      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n" +
-                                            "      \"age\": 1,\n" +
-                                            "      \"dob\": new Date(\"2019-07-01\"),\n" +
-                                            "      \"gender\": \"new value\",\n" +
-                                            "      \"luckyNumber\": NumberLong(\"1\"),\n" +
-                                            "      \"name\": \"new value\",\n" +
-                                            "      \"netWorth\": NumberDecimal(\"1\"),\n" +
-                                            "    }\n" +
-                                            "  ]\n" +
-                                            "}\n"),
-                                    new DatasourceStructure.Template("Update", "{\n" +
-                                            "  \"update\": \"users\",\n" +
-                                            "  \"updates\": [\n" +
-                                            "    {\n" +
-                                            "      \"q\": {\n" +
-                                            "        \"_id\": ObjectId(\"id_of_document_to_update\")\n" +
-                                            "      },\n" +
-                                            "      \"u\": { \"$set\": { \"gender\": \"new value\" } }\n" +
-                                            "    }\n" +
-                                            "  ]\n" +
-                                            "}\n"),
-                                    new DatasourceStructure.Template("Delete", "{\n" +
-                                            "  \"delete\": \"users\",\n" +
-                                            "  \"deletes\": [\n" +
-                                            "    {\n" +
-                                            "      \"q\": {\n" +
-                                            "        \"_id\": \"id_of_document_to_delete\"\n" +
-                                            "      },\n" +
-                                            "      \"limit\": 1\n" +
-                                            "    }\n" +
-                                            "  ]\n" +
-                                            "}\n"),
-                            },
-                            possessionsTable.getTemplates().toArray()
-                    );
+                    //Assert Find command
+                    DatasourceStructure.Template findTemplate = templates.get(0);
+                    assertEquals(findTemplate.getTitle(), "Find");
+                    assertEquals(findTemplate.getBody(), "{\n" +
+                            "  \"find\": \"users\",\n" +
+                            "  \"filter\": {\n" +
+                            "    \"gender\": \"F\"\n" +
+                            "  },\n" +
+                            "  \"sort\": {\n" +
+                            "    \"_id\": 1\n" +
+                            "  },\n" +
+                            "  \"limit\": 10\n" +
+                            "}\n");
+                    assertEquals(findTemplate.getPluginSpecifiedTemplates().get(COMMAND).getValue(), "FIND");
+                    assertEquals(findTemplate.getPluginSpecifiedTemplates().get(FIND_QUERY).getValue(), "{ \"gender\": \"F\"}");
+                    assertEquals(findTemplate.getPluginSpecifiedTemplates().get(FIND_SORT).getValue(), "{\"_id\": 1}");
+
+                    //Assert Find By Id command
+                    DatasourceStructure.Template findByIdTemplate = templates.get(1);
+                    assertEquals(findByIdTemplate.getTitle(), "Find by ID");
+                    assertEquals(findByIdTemplate.getBody(), "{\n" +
+                            "  \"find\": \"users\",\n" +
+                            "  \"filter\": {\n" +
+                            "    \"_id\": ObjectId(\"id_to_query_with\")\n" +
+                            "  }\n" +
+                            "}\n");
+                    assertEquals(findByIdTemplate.getPluginSpecifiedTemplates().get(COMMAND).getValue(), "FIND");
+                    assertEquals(findByIdTemplate.getPluginSpecifiedTemplates().get(FIND_QUERY).getValue(), "{\"_id\": ObjectId(\"id_to_query_with\")}");
+
+                    // Assert Insert command
+                    DatasourceStructure.Template insertTemplate = templates.get(2);
+                    assertEquals(insertTemplate.getTitle(), "Insert");
+                    assertEquals(insertTemplate.getBody(), "{\n" +
+                            "  \"insert\": \"users\",\n" +
+                            "  \"documents\": [\n" +
+                            "    {\n" +
+                            "      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n" +
+                            "      \"age\": 1,\n" +
+                            "      \"dob\": new Date(\"2019-07-01\"),\n" +
+                            "      \"gender\": \"new value\",\n" +
+                            "      \"luckyNumber\": NumberLong(\"1\"),\n" +
+                            "      \"name\": \"new value\",\n" +
+                            "      \"netWorth\": NumberDecimal(\"1\"),\n" +
+                            "      \"updatedByCommand\": {},\n" +
+                            "    }\n" +
+                            "  ]\n" +
+                            "}\n");
+                    assertEquals(insertTemplate.getPluginSpecifiedTemplates().get(COMMAND).getValue(), "INSERT");
+                    assertEquals(insertTemplate.getPluginSpecifiedTemplates().get(INSERT_DOCUMENT).getValue(),
+                            "[{      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n" +
+                                    "      \"age\": 1,\n" +
+                                    "      \"dob\": new Date(\"2019-07-01\"),\n" +
+                                    "      \"gender\": \"new value\",\n" +
+                                    "      \"luckyNumber\": NumberLong(\"1\"),\n" +
+                                    "      \"name\": \"new value\",\n" +
+                                    "      \"netWorth\": NumberDecimal(\"1\"),\n" +
+                                    "      \"updatedByCommand\": {},\n" +
+                                    "}]");
+
+                    // Assert Update command
+                    DatasourceStructure.Template updateTemplate = templates.get(3);
+                    assertEquals(updateTemplate.getTitle(), "Update");
+                    assertEquals(updateTemplate.getBody(), "{\n" +
+                            "  \"update\": \"users\",\n" +
+                            "  \"updates\": [\n" +
+                            "    {\n" +
+                            "      \"q\": {\n" +
+                            "        \"_id\": ObjectId(\"id_of_document_to_update\")\n" +
+                            "      },\n" +
+                            "      \"u\": { \"$set\": { \"gender\": \"new value\" } }\n" +
+                            "    }\n" +
+                            "  ]\n" +
+                            "}\n");
+                    assertEquals(updateTemplate.getPluginSpecifiedTemplates().get(COMMAND).getValue(), "UPDATE");
+                    assertEquals(updateTemplate.getPluginSpecifiedTemplates().get(UPDATE_QUERY).getValue(), "{ \"_id\": ObjectId(\"id_of_document_to_update\") }");
+                    assertEquals(updateTemplate.getPluginSpecifiedTemplates().get(UPDATE_UPDATE).getValue(), "{ \"$set\": { \"gender\": \"new value\" } }");
+
+                    // Assert Delete Command
+                    DatasourceStructure.Template deleteTemplate = templates.get(4);
+                    assertEquals(deleteTemplate.getTitle(), "Delete");
+                    assertEquals(deleteTemplate.getBody(), "{\n" +
+                            "  \"delete\": \"users\",\n" +
+                            "  \"deletes\": [\n" +
+                            "    {\n" +
+                            "      \"q\": {\n" +
+                            "        \"_id\": \"id_of_document_to_delete\"\n" +
+                            "      },\n" +
+                            "      \"limit\": 1\n" +
+                            "    }\n" +
+                            "  ]\n" +
+                            "}\n");
+                    assertEquals(deleteTemplate.getPluginSpecifiedTemplates().get(COMMAND).getValue(), "DELETE");
+                    assertEquals(deleteTemplate.getPluginSpecifiedTemplates().get(DELETE_QUERY).getValue(), "{ \"_id\": ObjectId(\"id_of_document_to_delete\") }");
+                    assertEquals(deleteTemplate.getPluginSpecifiedTemplates().get(DELETE_LIMIT).getValue(), "SINGLE");
                 })
                 .verifyComplete();
     }
 
     @Test
-    public void testErrorMessageOnSrvUrl() {
+    public void testErrorMessageOnSrvUriWithFormInterface() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        dsConfig.getEndpoints().get(0).setHost("mongodb+srv:://url.net");
+        dsConfig.getEndpoints().get(0).setHost("mongodb+srv://user:pass@url.net/dbName");
+        dsConfig.setProperties(List.of(new Property("Import from URI", "No")));
         Mono<Set<String>> invalidsMono = Mono.just(pluginExecutor.validateDatasource(dsConfig));
 
         StepVerifier.create(invalidsMono)
                 .assertNext(invalids -> {
                     assertTrue(invalids
                             .stream()
-                            .anyMatch(error -> error.contains("MongoDb SRV URLs are not yet supported")));
+                            .anyMatch(error -> error.contains("It seems that you are trying to use a mongo connection" +
+                                    " string URI. Please extract relevant fields and fill the form with extracted " +
+                                    "values. For details, please check out the Appsmith's documentation for Mongo " +
+                                    "database. Alternatively, you may use 'Import from Connection String URI' option " +
+                                    "from the dropdown labelled 'Use Mongo Connection String URI' to use the URI " +
+                                    "connection string directly.")));
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testErrorMessageOnNonSrvUri() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        List<Endpoint> endpoints = new ArrayList<>();
+        endpoints.add(new Endpoint("url", 123L));
+        endpoints.add(null);
+        endpoints.add(new Endpoint(null, 123L));
+        endpoints.add(new Endpoint("mongodb://user:pass@url.net:1234,url.net:1234/dbName", 123L));
+        dsConfig.setEndpoints(endpoints);
+        dsConfig.setProperties(List.of(new Property("Import from URI", "No")));
+        Mono<Set<String>> invalidsMono = Mono.just(pluginExecutor.validateDatasource(dsConfig));
+
+        StepVerifier.create(invalidsMono)
+                .assertNext(invalids -> {
+                    assertTrue(invalids
+                            .stream()
+                            .anyMatch(error -> error.contains("It seems that you are trying to use a mongo connection" +
+                                    " string URI. Please extract relevant fields and fill the form with extracted " +
+                                    "values. For details, please check out the Appsmith's documentation for Mongo " +
+                                    "database. Alternatively, you may use 'Import from Connection String URI' option " +
+                                    "from the dropdown labelled 'Use Mongo Connection String URI' to use the URI " +
+                                    "connection string directly.")));
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testInvalidsOnMissingUri() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        dsConfig.setProperties(List.of(new Property("Import from URI", "Yes")));
+        Mono<Set<String>> invalidsMono = Mono.just(pluginExecutor.validateDatasource(dsConfig));
+
+        StepVerifier.create(invalidsMono)
+                .assertNext(invalids -> {
+                    assertTrue(invalids
+                            .stream()
+                            .anyMatch(error -> error.contains("'Mongo Connection String URI' field is empty. Please " +
+                                    "edit the 'Mongo Connection URI' field to provide a connection uri to connect with.")));
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testInvalidsOnBadSrvUriFormat() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        List<Property> properties = new ArrayList<>();
+        properties.add(new Property("Import from URI", "Yes"));
+        properties.add(new Property("Srv Url", "mongodb+srv::username:password//url.net"));
+        dsConfig.setProperties(properties);
+        Mono<Set<String>> invalidsMono = Mono.just(pluginExecutor.validateDatasource(dsConfig));
+
+        StepVerifier.create(invalidsMono)
+                .assertNext(invalids -> {
+                    assertTrue(invalids
+                            .stream()
+                            .anyMatch(error -> error.contains("Mongo Connection String URI does not seem to be in the" +
+                                    " correct format. Please check the URI once.")));
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testInvalidsOnBadNonSrvUriFormat() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        List<Property> properties = new ArrayList<>();
+        properties.add(new Property("Import from URI", "Yes"));
+        properties.add(new Property("Srv Url", "mongodb::username:password//url.net"));
+        dsConfig.setProperties(properties);
+        Mono<Set<String>> invalidsMono = Mono.just(pluginExecutor.validateDatasource(dsConfig));
+
+        StepVerifier.create(invalidsMono)
+                .assertNext(invalids -> {
+                    assertTrue(invalids
+                            .stream()
+                            .anyMatch(error -> error.contains("Mongo Connection String URI does not seem to be in the" +
+                                    " correct format. Please check the URI once.")));
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testInvalidsEmptyOnCorrectSrvUriFormat() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        List<Property> properties = new ArrayList<>();
+        properties.add(new Property("Import from URI", "Yes"));
+        properties.add(new Property("Srv Url", "mongodb+srv://username:password@url.net/dbname"));
+        dsConfig.setProperties(properties);
+        Mono<Set<String>> invalidsMono = Mono.just(pluginExecutor.validateDatasource(dsConfig));
+
+        StepVerifier.create(invalidsMono)
+                .assertNext(invalids -> {
+                    assertTrue(invalids.isEmpty());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testInvalidsEmptyOnCorrectNonSrvUriFormat() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        List<Property> properties = new ArrayList<>();
+        properties.add(new Property("Import from URI", "Yes"));
+        properties.add(new Property("Srv Url", "mongodb://username:password@url-1.net:1234,url-2:1234/dbname"));
+        dsConfig.setProperties(properties);
+        Mono<Set<String>> invalidsMono = Mono.just(pluginExecutor.validateDatasource(dsConfig));
+
+        StepVerifier.create(invalidsMono)
+                .assertNext(invalids -> {
+                    assertTrue(invalids.isEmpty());
                 })
                 .verifyComplete();
     }
@@ -543,6 +759,11 @@ public class MongoPluginTest {
                 "      sort: { id: 1 },\n" +
                 "      limit: 10,\n" +
                 "    }");
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("jsonSmartSubstitution", "true"));
+        pluginSpecifiedTemplates.add(null);
+        pluginSpecifiedTemplates.add(new Property("command", "RAW"));
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
 
         Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
         Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn,
@@ -577,6 +798,11 @@ public class MongoPluginTest {
                 "      sort: { id: 1 },\n" +
                 "      limit: 10,\n" +
                 "    }");
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("jsonSmartSubstitution", "true"));
+        pluginSpecifiedTemplates.add(null);
+        pluginSpecifiedTemplates.add(new Property("command", "RAW"));
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
 
         Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
         Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn,
@@ -611,6 +837,11 @@ public class MongoPluginTest {
                 "      sort: { id: 1 },\n" +
                 "      limit: 10,\n" +
                 "    }");
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("jsonSmartSubstitution", "true"));
+        pluginSpecifiedTemplates.add(null);
+        pluginSpecifiedTemplates.add(new Property("command", "RAW"));
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
 
         Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
         Mono<ActionExecutionResult> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn,
@@ -643,6 +874,8 @@ public class MongoPluginTest {
                 "    }");
         List<Property> pluginSpecifiedTemplates = new ArrayList<>();
         pluginSpecifiedTemplates.add(new Property("jsonSmartSubstitution", "true"));
+        pluginSpecifiedTemplates.add(null);
+        pluginSpecifiedTemplates.add(new Property("command", "RAW"));
         actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
 
         ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
@@ -681,7 +914,8 @@ public class MongoPluginTest {
 
                     // Assert the debug request parameters are getting set.
                     ActionExecutionRequest request = result.getRequest();
-                    List<Map.Entry<String, String>> parameters = (List<Map.Entry<String, String>>) request.getProperties().get("smart-substitution-parameters");
+                    List<Map.Entry<String, String>> parameters =
+                            (List<Map.Entry<String, String>>) request.getProperties().get("smart-substitution-parameters");
                     assertEquals(parameters.size(), 4);
 
                     Map.Entry<String, String> parameterEntry = parameters.get(0);
@@ -689,21 +923,31 @@ public class MongoPluginTest {
                     assertEquals(parameterEntry.getValue(), "STRING");
 
                     parameterEntry = parameters.get(1);
-                    assertEquals(parameterEntry.getKey(),"{ age: { \"$gte\": 30 } }");
+                    assertEquals(parameterEntry.getKey(), "{ age: { \"$gte\": 30 } }");
                     assertEquals(parameterEntry.getValue(), "BSON");
 
                     parameterEntry = parameters.get(2);
-                    assertEquals(parameterEntry.getKey(),"1");
+                    assertEquals(parameterEntry.getKey(), "1");
                     assertEquals(parameterEntry.getValue(), "INTEGER");
 
                     parameterEntry = parameters.get(3);
-                    assertEquals(parameterEntry.getKey(),"10");
+                    assertEquals(parameterEntry.getKey(), "10");
                     assertEquals(parameterEntry.getValue(), "INTEGER");
 
                     assertEquals(
                             List.of(new ParsedDataType(JSON), new ParsedDataType(RAW)).toString(),
                             result.getDataTypes().toString()
                     );
+
+                    String expectedQuery = "{\n" +
+                            "      find: \"users\",\n" +
+                            "      filter: { age: { \"$gte\": 30 } },\n" +
+                            "      sort: { id: 1 },\n" +
+                            "      limit: 10\n" +
+                            "    }";
+                    // check that bindings are not replaced with actual values and not '$i' or '?'
+                    assertEquals(expectedQuery,
+                            ((RequestParamDTO)(((List)result.getRequest().getRequestParams())).get(0)).getValue());
                 })
                 .verifyComplete();
     }
@@ -724,10 +968,478 @@ public class MongoPluginTest {
 
         StepVerifier.create(structureMono)
                 .verifyErrorSatisfies(error -> {
-                   assertTrue(error instanceof AppsmithPluginException);
-                   String expectedMessage = "Appsmith has failed to get database structure. Please provide read permission on" +
-                           " the database to fix this.";
-                   assertTrue(expectedMessage.equals(error.getMessage()));
+                    assertTrue(error instanceof AppsmithPluginException);
+                    String expectedMessage = "Appsmith has failed to get database structure. Please provide read permission on" +
+                            " the database to fix this.";
+                    assertTrue(expectedMessage.equals(error.getMessage()));
                 });
     }
+
+    @Test
+    public void testFindFormCommand() {
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "FIND");
+        configMap.put(FIND_QUERY, "{ age: { \"$gte\": 30 } }");
+        configMap.put(FIND_SORT, "{ id: 1 }");
+        configMap.put(COLLECTION, "users");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    assertEquals(2, ((ArrayNode) result.getBody()).size());
+                    assertEquals(
+                            List.of(new ParsedDataType(JSON), new ParsedDataType(RAW)).toString(),
+                            result.getDataTypes().toString()
+                    );
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testInsertFormCommandArrayDocuments() {
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "INSERT");
+        configMap.put(COLLECTION, "users");
+        configMap.put(INSERT_DOCUMENT, "[{\"name\" : \"ZZZ Insert Form Array Test\", \"gender\" : \"F\", \"age\" : 40, \"tag\" : \"test\"}]");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    assertEquals(
+                            List.of(new ParsedDataType(JSON), new ParsedDataType(RAW)).toString(),
+                            result.getDataTypes().toString()
+                    );
+                })
+                .verifyComplete();
+
+        // Clean up this newly inserted value
+        configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "DELETE");
+        configMap.put(COLLECTION, "users");
+        configMap.put(DELETE_QUERY, "{\"tag\" : \"test\"}");
+        configMap.put(DELETE_LIMIT, "ALL");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+        // Run the delete command
+        dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration)).block();
+    }
+
+    @Test
+    public void testInsertFormCommandSingleDocument() {
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "INSERT");
+        configMap.put(COLLECTION, "users");
+        configMap.put(INSERT_DOCUMENT, "{\"name\" : \"ZZZ Insert Form Single Test\", \"gender\" : \"F\", \"age\" : 40, \"tag\" : \"test\"}");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    assertEquals(
+                            List.of(new ParsedDataType(JSON), new ParsedDataType(RAW)).toString(),
+                            result.getDataTypes().toString()
+                    );
+                })
+                .verifyComplete();
+
+        // Clean up this newly inserted value
+        configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "DELETE");
+        configMap.put(COLLECTION, "users");
+        configMap.put(DELETE_QUERY, "{\"tag\" : \"test\"}");
+        configMap.put(DELETE_LIMIT, "ALL");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+        // Run the delete command
+        dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration)).block();
+    }
+
+    @Test
+    public void testUpdateOneFormCommand() {
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "UPDATE");
+        configMap.put(COLLECTION, "users");
+        configMap.put(UPDATE_QUERY, "{ name: \"Alden Cantrell\" }");
+        configMap.put(UPDATE_UPDATE, "{ $set: { age: 31 }}}");
+        configMap.put(UPDATE_LIMIT, "SINGLE");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    JsonNode value = ((ObjectNode) result.getBody()).get("nModified");
+                    assertEquals(value.asText(), "1");
+                    assertEquals(
+                            List.of(new ParsedDataType(JSON), new ParsedDataType(RAW)).toString(),
+                            result.getDataTypes().toString()
+                    );
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testUpdateManyFormCommand() {
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "UPDATE");
+        configMap.put(COLLECTION, "users");
+        // Query for all the documents in the collection
+        configMap.put(UPDATE_QUERY, "{}");
+        configMap.put(UPDATE_UPDATE, "{ $set: { updatedByCommand: true }}}");
+        configMap.put(UPDATE_LIMIT, "ALL");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    JsonNode value = ((ObjectNode) result.getBody()).get("nModified");
+                    assertEquals(value.asText(), "3");
+                    assertEquals(
+                            List.of(new ParsedDataType(JSON), new ParsedDataType(RAW)).toString(),
+                            result.getDataTypes().toString()
+                    );
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testDeleteFormCommandSingleDocument() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        // Insert multiple documents which would match the delete criterion
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "INSERT");
+        configMap.put(COLLECTION, "users");
+        configMap.put(INSERT_DOCUMENT, "[{\"name\" : \"To Delete1\", \"tag\" : \"delete\"}, {\"name\" : \"To Delete2\", \"tag\" : \"delete\"}]");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+        dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration)).block();
+
+        // Now that the documents have been inserted, lets delete one of them
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "DELETE");
+        configMap.put(COLLECTION, "users");
+        configMap.put(DELETE_QUERY, "{tag : \"delete\"}");
+        configMap.put(DELETE_LIMIT, "SINGLE");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    JsonNode value = ((ObjectNode) result.getBody()).get("n");
+                    //Assert that only one document out of the two gets deleted
+                    assertEquals(value.asInt(), 1);
+                })
+                .verifyComplete();
+
+        // Run this delete command again to ensure that both the documents added are deleted post this test.
+        dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration)).block();
+
+    }
+
+    @Test
+    public void testDeleteFormCommandMultipleDocument() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        // Insert multiple documents which would match the delete criterion
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "INSERT");
+        configMap.put(COLLECTION, "users");
+        configMap.put(INSERT_DOCUMENT, "[{\"name\" : \"To Delete1\", \"tag\" : \"delete\"}, {\"name\" : \"To Delete2\", \"tag\" : \"delete\"}]");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+        dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration)).block();
+
+        // Now that the documents have been inserted, lets delete both of them
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "DELETE");
+        configMap.put(COLLECTION, "users");
+        configMap.put(DELETE_QUERY, "{tag : \"delete\"}");
+        configMap.put(DELETE_LIMIT, "ALL");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    JsonNode value = ((ObjectNode) result.getBody()).get("n");
+                    assertEquals(value.asInt(), 2);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testCountCommand() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "COUNT");
+        configMap.put(COLLECTION, "users");
+        configMap.put(COUNT_QUERY, "{}");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    JsonNode value = ((ObjectNode) result.getBody()).get("n");
+                    assertEquals(value.asInt(), 3);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testDistinctCommand() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "DISTINCT");
+        configMap.put(COLLECTION, "users");
+        configMap.put(DISTINCT_QUERY, "{}");
+        configMap.put(DISTINCT_KEY, "name");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    int valuesSize = ((ArrayNode) result.getBody()).size();
+                    assertEquals(valuesSize, 3);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testAggregateCommand() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "AGGREGATE");
+        configMap.put(COLLECTION, "users");
+        configMap.put(AGGREGATE_PIPELINE, "[{\"$count\": \"userCount\"}]");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    JsonNode value = ((ArrayNode) result.getBody()).get(0).get("userCount");
+                    assertEquals(value.asInt(), 3);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testFindCommandProjection() {
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.FALSE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "FIND");
+        configMap.put(FIND_QUERY, "{ age: { \"$gte\": 30 } }");
+        configMap.put(FIND_SORT, "{ id: 1 }");
+        configMap.put(FIND_PROJECTION, "{ name: 1 }");
+        configMap.put(COLLECTION, "users");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<Object> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    System.out.println(obj);
+                    ActionExecutionResult result = (ActionExecutionResult) obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    assertEquals(2, ((ArrayNode) result.getBody()).size());
+                    JsonNode value = ((ArrayNode) result.getBody()).get(0).get("name");
+                    assertNotNull(value);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testBsonSmartSubstitutionMongoForm() {
+        DatasourceConfiguration datasourceConfiguration = createDatasourceConfiguration();
+
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+
+        Map<Integer, Object> configMap = new HashMap<>();
+        configMap.put(SMART_BSON_SUBSTITUTION, Boolean.TRUE);
+        configMap.put(INPUT_TYPE, "FORM");
+        configMap.put(COMMAND, "FIND");
+        configMap.put(FIND_QUERY, "\"{{Input1.text}}\"");
+        configMap.put(FIND_SORT, "{ id: {{Input2.text}} }");
+        configMap.put(FIND_LIMIT, "{{Input3.text}}");
+        configMap.put(COLLECTION, "{{Input4.text}}");
+
+        actionConfiguration.setPluginSpecifiedTemplates(generateMongoFormConfigTemplates(configMap));
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        List<Param> params = new ArrayList<>();
+        Param param1 = new Param();
+        param1.setKey("Input1.text");
+        param1.setValue("{ age: { \"$gte\": 30 } }");
+        params.add(param1);
+        Param param3 = new Param();
+        param3.setKey("Input2.text");
+        param3.setValue("1");
+        params.add(param3);
+        Param param4 = new Param();
+        param4.setKey("Input3.text");
+        param4.setValue("10");
+        params.add(param4);
+        Param param5 = new Param();
+        param5.setKey("Input4.text");
+        param5.setValue("users");
+        params.add(param5);
+        executeActionDTO.setParams(params);
+
+        Mono<MongoClient> dsConnectionMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
+        Mono<ActionExecutionResult> executeMono = dsConnectionMono.flatMap(conn -> pluginExecutor.executeParameterized(conn,
+                executeActionDTO,
+                datasourceConfiguration,
+                actionConfiguration));
+
+        StepVerifier.create(executeMono)
+                .assertNext(obj -> {
+                    ActionExecutionResult result = obj;
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    assertEquals(2, ((ArrayNode) result.getBody()).size());
+
+                    assertEquals(
+                            List.of(new ParsedDataType(JSON), new ParsedDataType(RAW)).toString(),
+                            result.getDataTypes().toString()
+                    );
+
+                    String expectedQuery = "{\"find\": \"users\", \"filter\": {\"age\": {\"$gte\": 30}}, \"sort\": {\"id\": 1}, \"limit\": 10, \"batchSize\": 10}";
+                    assertEquals(expectedQuery,
+                            ((RequestParamDTO)(((List)result.getRequest().getRequestParams())).get(0)).getValue());
+                })
+                .verifyComplete();
+    }
+
 }
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java b/app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java
index 3b1a50cfed..1b16ee9237 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java
@@ -14,6 +14,7 @@ import com.appsmith.external.models.DBAuth;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.DatasourceTestResult;
 import com.appsmith.external.models.Endpoint;
+import com.appsmith.external.models.PsParameterDTO;
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.PsParameterDTO;
 import com.appsmith.external.models.RequestParamDTO;
@@ -57,10 +58,13 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.IntStream;
 
 import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
+import static com.appsmith.external.helpers.MustacheHelper.replaceQuestionMarkWithDollarIndex;
 import static com.appsmith.external.helpers.PluginUtils.getColumnsListForJdbcPlugin;
 import static com.appsmith.external.helpers.PluginUtils.getIdenticalColumns;
+import static com.appsmith.external.helpers.PluginUtils.getPSParamLabel;
 import static com.appsmith.external.models.Connection.Mode.READ_ONLY;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
@@ -120,12 +124,8 @@ public class MssqlPlugin extends BasePlugin {
 
             final List<Property> properties = actionConfiguration.getPluginSpecifiedTemplates();
             if (properties == null || properties.get(PREPARED_STATEMENT_INDEX) == null) {
-                /**
-                 * TODO :
-                 * In case the prepared statement configuration is missing, default to true once PreparedStatement
-                 * is no longer in beta.
-                 */
-                isPreparedStatement = false;
+                // In case the prepared statement configuration is missing, default to true
+                isPreparedStatement = true;
             } else if (properties.get(PREPARED_STATEMENT_INDEX) != null){
                 Object psValue = properties.get(PREPARED_STATEMENT_INDEX).getValue();
                 if (psValue instanceof  Boolean) {
@@ -133,10 +133,10 @@ public class MssqlPlugin extends BasePlugin {
                 } else if (psValue instanceof String) {
                     isPreparedStatement = Boolean.parseBoolean((String) psValue);
                 } else {
-                    isPreparedStatement = false;
+                    isPreparedStatement = true;
                 }
             } else {
-                isPreparedStatement = false;
+                isPreparedStatement = true;
             }
 
             // In case of non prepared statement, simply do binding replacement and execute
@@ -164,8 +164,10 @@ public class MssqlPlugin extends BasePlugin {
             requestData.put("preparedStatement", TRUE.equals(preparedStatement) ? true : false);
 
             String query = actionConfiguration.getBody();
-            List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null
-                    , null));
+            Map<String, Object> psParams = preparedStatement ? new LinkedHashMap<>() : null;
+            String transformedQuery = preparedStatement ? replaceQuestionMarkWithDollarIndex(query) : query;
+            List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
+                    transformedQuery, null, null, psParams));
 
             return Mono.fromCallable(() -> {
                 try {
@@ -207,6 +209,13 @@ public class MssqlPlugin extends BasePlugin {
                                 parameters);
 
                         requestData.put("ps-parameters", parameters);
+
+                        IntStream.range(0, parameters.size())
+                                .forEachOrdered(i ->
+                                        psParams.put(
+                                                getPSParamLabel(i+1),
+                                                new PsParameterDTO(parameters.get(i).getKey(), parameters.get(i).getValue())));
+
                         isResultSet = preparedQuery.execute();
                         resultSet = preparedQuery.getResultSet();
                     }
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 4c433b6bc8..cf812a3642 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
@@ -17,11 +17,11 @@
           "info": "Ask confirmation from the user each time before refreshing data"
         },
         {
-          "label": "[Beta] Use Prepared Statement",
+          "label": "Use Prepared Statement",
           "info": "Turning on Prepared Statement makes the query parametrized. This in turn makes it resilient against SQL injections",
           "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
           "controlType": "SWITCH",
-          "initialValue": false
+          "initialValue": true
         },
         {
           "label": "Query timeout (in milliseconds)",
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 60948f8b63..7743b93417 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
@@ -2,7 +2,7 @@ INSERT INTO users
   (name, gender, email)
 VALUES
   (
-    '{{ nameInput.text }}',
-    '{{ genderDropdown.selectedOptionValue }}',
-    '{{ nameInput.text }}'
+    {{ nameInput.text }},
+    {{ genderDropdown.selectedOptionValue }},
+    {{ nameInput.text }}
   );
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/DELETE.sql
index aad8425f9b..ab599c16fd 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = '{{ usersTable.selectedRow.id }}';
+DELETE FROM users WHERE id = {{ usersTable.selectedRow.id }};
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 80ef4f2134..39a9cd35a5 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 +1 @@
-SELECT * FROM users where role = '{{ roleDropdown.selectedOptionValue }}' ORDER BY id LIMIT 10;
\ No newline at end of file
+SELECT * FROM users where role = {{ roleDropdown.selectedOptionValue }} ORDER BY id LIMIT 10;
\ No newline at end of file
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 4c1b31b32b..de4915e6fd 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 }}';
+  WHERE id = {{ usersTable.selectedRow.id }};
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlPluginTest.java b/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlPluginTest.java
old mode 100644
new mode 100755
index 79e0dec902..c320487724
--- a/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlPluginTest.java
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlPluginTest.java
@@ -8,6 +8,7 @@ import com.appsmith.external.models.ActionExecutionResult;
 import com.appsmith.external.models.DBAuth;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.Endpoint;
+import com.appsmith.external.models.PsParameterDTO;
 import com.appsmith.external.models.Param;
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.RequestParamDTO;
@@ -21,6 +22,7 @@ import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.testcontainers.containers.MSSQLServerContainer;
+import org.testcontainers.utility.DockerImageName;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -30,6 +32,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -56,7 +59,8 @@ public class MssqlPluginTest {
     @SuppressWarnings("rawtypes") // The type parameter for the container type is just itself and is pseudo-optional.
     @ClassRule
     public static final MSSQLServerContainer container =
-            new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2017-latest")
+            new MSSQLServerContainer<>(
+                    DockerImageName.parse("mcr.microsoft.com/azure-sql-edge:1.0.3").asCompatibleSubstituteFor("mcr.microsoft.com/mssql/server:2017-latest"))
                     .acceptLicense()
                     .withExposedPorts(1433)
                     .withPassword("Mssql123");
@@ -228,7 +232,7 @@ public class MssqlPluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            actionConfiguration.getBody(), null, null));
+                            actionConfiguration.getBody(), null, null, new HashMap<>()));
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -311,7 +315,6 @@ public class MssqlPluginTest {
                     Map.Entry<String, String> parameterEntry = parameters.get(0);
                     assertEquals(parameterEntry.getKey(), "1");
                     assertEquals(parameterEntry.getValue(), "INTEGER");
-
                 })
                 .verifyComplete();
     }
@@ -369,6 +372,23 @@ public class MssqlPluginTest {
                                     .toArray()
                     );
 
+                    /*
+                     * - Check if request params are sent back properly.
+                     * - Not replicating the same to other tests as the overall flow remains the same w.r.t. request
+                     *  params.
+                     */
+
+                    // check if '?' is replaced by $i.
+                    assertEquals("SELECT * FROM users where id = $1;",
+                            ((RequestParamDTO)(((List)result.getRequest().getRequestParams())).get(0)).getValue());
+
+                    PsParameterDTO expectedPsParam = new PsParameterDTO("1", "INTEGER");
+                    PsParameterDTO returnedPsParam =
+                            (PsParameterDTO) ((RequestParamDTO) (((List) result.getRequest().getRequestParams())).get(0)).getSubstitutedParams().get("$1");
+                    // Check if prepared stmt param value is correctly sent back.
+                    assertEquals(expectedPsParam.getValue(), returnedPsParam.getValue());
+                    // check if prepared stmt param type is correctly sent back.
+                    assertEquals(expectedPsParam.getType(), returnedPsParam.getType());
                 })
                 .verifyComplete();
     }
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
index ed0374547e..b0aad1bd4d 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
@@ -15,7 +15,7 @@ import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.DatasourceStructure;
 import com.appsmith.external.models.DatasourceTestResult;
 import com.appsmith.external.models.Endpoint;
-import com.appsmith.external.models.Param;
+import com.appsmith.external.models.PsParameterDTO;
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.RequestParamDTO;
 import com.appsmith.external.models.SSLDetails;
@@ -58,9 +58,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
+import static com.appsmith.external.helpers.MustacheHelper.replaceQuestionMarkWithDollarIndex;
 import static com.appsmith.external.helpers.PluginUtils.getIdenticalColumns;
+import static com.appsmith.external.helpers.PluginUtils.getPSParamLabel;
 import static io.r2dbc.spi.ConnectionFactoryOptions.SSL;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
@@ -161,12 +164,8 @@ public class MySqlPlugin extends BasePlugin {
 
             final List<Property> properties = actionConfiguration.getPluginSpecifiedTemplates();
             if (properties == null || properties.get(PREPARED_STATEMENT_INDEX) == null) {
-                /**
-                 * TODO :
-                 * In case the prepared statement configuration is missing, default to true once PreparedStatement
-                 * is no longer in beta.
-                 */
-                isPreparedStatement = false;
+                 // In case the prepared statement configuration is missing, default to true
+                isPreparedStatement = true;
             } else if (properties.get(PREPARED_STATEMENT_INDEX) != null){
                 Object psValue = properties.get(PREPARED_STATEMENT_INDEX).getValue();
                 if (psValue instanceof  Boolean) {
@@ -174,10 +173,10 @@ public class MySqlPlugin extends BasePlugin {
                 } else if (psValue instanceof String) {
                     isPreparedStatement = Boolean.parseBoolean((String) psValue);
                 } else {
-                    isPreparedStatement = false;
+                    isPreparedStatement = true;
                 }
             } else {
-                isPreparedStatement = false;
+                isPreparedStatement = true;
             }
 
             requestData.put("preparedStatement", TRUE.equals(isPreparedStatement) ? true : false);
@@ -228,8 +227,10 @@ public class MySqlPlugin extends BasePlugin {
 
             final List<Map<String, Object>> rowsList = new ArrayList<>(50);
             final List<String> columnsList = new ArrayList<>();
-            List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null
-                    , null));
+            Map<String, Object> psParams = preparedStatement ? new LinkedHashMap<>() : null;
+            String transformedQuery = preparedStatement ? replaceQuestionMarkWithDollarIndex(query) : query;
+            List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
+                    transformedQuery, null, null, psParams));
 
             Flux<Result> resultFlux = Mono.from(connection.validate(ValidationDepth.REMOTE))
                     .flatMapMany(isValid -> {
@@ -239,7 +240,8 @@ public class MySqlPlugin extends BasePlugin {
                                     preparedStatement,
                                     mustacheValuesInOrder,
                                     executeActionDTO,
-                                    requestData);
+                                    requestData,
+                                    psParams);
                         }
                         return Flux.error(new StaleConnectionException());
                     });
@@ -316,7 +318,8 @@ public class MySqlPlugin extends BasePlugin {
                                                                  Boolean preparedStatement,
                                                                  List<String> mustacheValuesInOrder,
                                                                  ExecuteActionDTO executeActionDTO,
-                                                                 Map<String, Object> requestData) {
+                                                                 Map<String, Object> requestData,
+                                                                 Map psParams) {
 
             Statement connectionStatement = connection.createStatement(query);
             if (FALSE.equals(preparedStatement) || mustacheValuesInOrder == null || mustacheValuesInOrder.isEmpty()) {
@@ -325,9 +328,7 @@ public class MySqlPlugin extends BasePlugin {
 
             System.out.println("Query : " + query);
 
-            List<Param> params = executeActionDTO.getParams();
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
-
             try {
                 connectionStatement = (Statement) this.smartSubstitutionOfBindings(connectionStatement,
                         mustacheValuesInOrder,
@@ -335,6 +336,13 @@ public class MySqlPlugin extends BasePlugin {
                         parameters);
 
                 requestData.put("ps-parameters", parameters);
+
+                IntStream.range(0, parameters.size())
+                        .forEachOrdered(i ->
+                                psParams.put(
+                                        getPSParamLabel(i+1),
+                                        new PsParameterDTO(parameters.get(i).getKey(), parameters.get(i).getValue())));
+
             } catch (AppsmithPluginException e) {
                 return Flux.error(e);
             }
@@ -634,6 +642,7 @@ public class MySqlPlugin extends BasePlugin {
             if (!tablesByName.containsKey(tableName)) {
                 tablesByName.put(tableName, new DatasourceStructure.Table(
                         DatasourceStructure.TableType.TABLE,
+                        null,
                         tableName,
                         new ArrayList<>(),
                         new ArrayList<>(),
@@ -749,15 +758,15 @@ public class MySqlPlugin extends BasePlugin {
 
                 final String tableName = table.getName();
                 table.getTemplates().addAll(List.of(
-                        new DatasourceStructure.Template("SELECT", "SELECT * FROM " + tableName + " LIMIT 10;"),
+                        new DatasourceStructure.Template("SELECT", "SELECT * FROM " + tableName + " LIMIT 10;", null),
                         new DatasourceStructure.Template("INSERT", "INSERT INTO " + tableName
                                 + " (" + String.join(", ", columnNames) + ")\n"
-                                + "  VALUES (" + String.join(", ", columnValues) + ");"),
+                                + "  VALUES (" + String.join(", ", columnValues) + ");", null),
                         new DatasourceStructure.Template("UPDATE", "UPDATE " + tableName + " SET"
                                 + setFragments.toString() + "\n"
-                                + "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"),
+                                + "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!", null),
                         new DatasourceStructure.Template("DELETE", "DELETE FROM " + tableName
-                                + "\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!")
+                                + "\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!", null)
                 ));
             }
 
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 4c433b6bc8..cf812a3642 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
@@ -17,11 +17,11 @@
           "info": "Ask confirmation from the user each time before refreshing data"
         },
         {
-          "label": "[Beta] Use Prepared Statement",
+          "label": "Use Prepared Statement",
           "info": "Turning on Prepared Statement makes the query parametrized. This in turn makes it resilient against SQL injections",
           "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
           "controlType": "SWITCH",
-          "initialValue": false
+          "initialValue": true
         },
         {
           "label": "Query timeout (in milliseconds)",
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 60dbe60fe3..4388bc1b9f 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
@@ -2,7 +2,7 @@ INSERT INTO users
   (name, gender, email)
 VALUES
   (
-    '{{ nameInput.text }}',
-    '{{ genderDropdown.selectedOptionValue }}',
-    '{{ nameInput.text }}'
-  ); -- nameInput and genderDropdown are example widgets, replace them with your widget names. Read more at http://bit.ly/capture-widget-data
\ No newline at end of file
+    {{ nameInput.text }},
+    {{ genderDropdown.selectedOptionValue }},
+    {{ nameInput.text }}
+  );
\ No newline at end of file
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 02cd7ee499..e7014662d5 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; -- Use widget data in a query by replacing static values with {{ widgetName.property }}. Read more at http://bit.ly/capture-widget-data
+DELETE FROM users WHERE id = -1;
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/SELECT.sql b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/SELECT.sql
index 802baad41b..8d4afd4c3b 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/SELECT.sql
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/SELECT.sql
@@ -1 +1 @@
-SELECT * FROM users where role = 'Admin' ORDER BY id LIMIT 10 -- Use widget data in a query using {{ widgetName.property }}. Read more at http://bit.ly/capture-widget-data
+SELECT * FROM users where role = 'Admin' ORDER BY id LIMIT 10
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 fed23cb144..facf9fc3f9 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 }}'; -- usersTable is an example table widget from where the id is being read. Replace it with your own Table widget or a static value. Read more at http://bit.ly/capture-widget-data
+  WHERE id = {{ usersTable.selectedRow.id }};
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java b/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
old mode 100644
new mode 100755
index af5bba6b4f..0567f1bfb9
--- a/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
@@ -9,6 +9,8 @@ import com.appsmith.external.models.DBAuth;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.DatasourceStructure;
 import com.appsmith.external.models.Endpoint;
+import com.appsmith.external.models.PsParameterDTO;
+import com.appsmith.external.models.Param;
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.RequestParamDTO;
 import com.appsmith.external.models.SSLDetails;
@@ -25,12 +27,14 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.containers.MySQLR2DBCDatabaseContainer;
+import org.testcontainers.utility.DockerImageName;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -52,14 +56,16 @@ public class MySqlPluginTest {
 
     @SuppressWarnings("rawtypes") // The type parameter for the container type is just itself and is pseudo-optional.
     @ClassRule
-    public static MySQLContainer mySQLContainer = new MySQLContainer("mysql:5.7")
+    public static MySQLContainer mySQLContainer = new MySQLContainer(
+            DockerImageName.parse("mysql/mysql-server:8.0.25").asCompatibleSubstituteFor("mysql"))
             .withUsername("mysql")
             .withPassword("password")
             .withDatabaseName("test_db");
 
     @SuppressWarnings("rawtypes") // The type parameter for the container type is just itself and is pseudo-optional.
     @ClassRule
-    public static MySQLContainer mySQLContainerWithInvalidTimezone = (MySQLContainer) new MySQLContainer()
+    public static MySQLContainer mySQLContainerWithInvalidTimezone = (MySQLContainer) new MySQLContainer(
+            DockerImageName.parse("mysql/mysql-server:8.0.25").asCompatibleSubstituteFor("mysql"))
             .withUsername("mysql")
             .withPassword("password")
             .withDatabaseName("test_db")
@@ -294,7 +300,7 @@ public class MySqlPluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            actionConfiguration.getBody(), null, null));
+                            actionConfiguration.getBody(), null, null, new HashMap<>()));
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -398,6 +404,65 @@ public class MySqlPluginTest {
         return;
     }
 
+    @Test
+    public void testExecuteWithPreparedStatement() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<Connection> dsConnectionMono = pluginExecutor.datasourceCreate(dsConfig);
+
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setBody("SELECT id FROM users WHERE id = {{binding1}};");
+
+        List<Property> pluginSpecifiedTemplates = new ArrayList<>();
+        pluginSpecifiedTemplates.add(new Property("preparedStatement", "true"));
+        actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        List<Param> params = new ArrayList<>();
+        Param param = new Param();
+        param.setKey("binding1");
+        param.setValue("1");
+        params.add(param);
+        executeActionDTO.setParams(params);
+
+        Mono<ActionExecutionResult> executeMono = dsConnectionMono
+                .flatMap(conn -> pluginExecutor.executeParameterized(conn, executeActionDTO, dsConfig, actionConfiguration));
+
+        StepVerifier.create(executeMono)
+                .assertNext(result -> {
+                    final JsonNode node = ((ArrayNode) result.getBody()).get(0);
+                    assertArrayEquals(
+                            new String[]{
+                                    "id"
+                            },
+                            new ObjectMapper()
+                                    .convertValue(node, LinkedHashMap.class)
+                                    .keySet()
+                                    .toArray()
+                    );
+
+                    /*
+                     * - Check if request params are sent back properly.
+                     * - Not replicating the same to other tests as the overall flow remains the same w.r.t. request
+                     *  params.
+                     */
+
+                    // check if '?' is replaced by $i.
+                    assertEquals("SELECT id FROM users WHERE id = $1;",
+                            ((RequestParamDTO)(((List)result.getRequest().getRequestParams())).get(0)).getValue());
+
+                    PsParameterDTO expectedPsParam = new PsParameterDTO("1", "INTEGER");
+                    PsParameterDTO returnedPsParam =
+                            (PsParameterDTO) ((RequestParamDTO) (((List) result.getRequest().getRequestParams())).get(0)).getSubstitutedParams().get("$1");
+                    // Check if prepared stmt param value is correctly sent back.
+                    assertEquals(expectedPsParam.getValue(), returnedPsParam.getValue());
+                    // check if prepared stmt param type is correctly sent back.
+                    assertEquals(expectedPsParam.getType(), returnedPsParam.getType());
+                })
+                .verifyComplete();
+
+        return;
+    }
+
     @Test
     public void testExecuteDataTypes() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
@@ -574,18 +639,18 @@ public class MySqlPluginTest {
 
                     assertArrayEquals(
                             new DatasourceStructure.Template[]{
-                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM possessions LIMIT 10;"),
+                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM possessions LIMIT 10;", null),
                                     new DatasourceStructure.Template("INSERT", "INSERT INTO possessions (id, title, user_id, username, email)\n" +
-                                            "  VALUES (1, '', 1, '', '');"),
+                                            "  VALUES (1, '', 1, '', '');", null),
                                     new DatasourceStructure.Template("UPDATE", "UPDATE possessions SET\n" +
                                             "    id = 1\n" +
                                             "    title = ''\n" +
                                             "    user_id = 1\n" +
                                             "    username = ''\n" +
                                             "    email = ''\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!", null),
                                     new DatasourceStructure.Template("DELETE", "DELETE FROM possessions\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!", null),
                             },
                             possessionsTable.getTemplates().toArray()
                     );
@@ -617,9 +682,9 @@ public class MySqlPluginTest {
 
                     assertArrayEquals(
                             new DatasourceStructure.Template[]{
-                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM users LIMIT 10;"),
+                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM users LIMIT 10;", null),
                                     new DatasourceStructure.Template("INSERT", "INSERT INTO users (id, username, password, email, spouse_dob, dob, yob, time1, created_on, updated_on)\n" +
-                                            "  VALUES (1, '', '', '', '2019-07-01', '2019-07-01', '', '', '2019-07-01 10:00:00', '2019-07-01 10:00:00');"),
+                                            "  VALUES (1, '', '', '', '2019-07-01', '2019-07-01', '', '', '2019-07-01 10:00:00', '2019-07-01 10:00:00');", null),
                                     new DatasourceStructure.Template("UPDATE", "UPDATE users SET\n" +
                                             "    id = 1\n" +
                                             "    username = ''\n" +
@@ -631,9 +696,9 @@ public class MySqlPluginTest {
                                             "    time1 = ''\n" +
                                             "    created_on = '2019-07-01 10:00:00'\n" +
                                             "    updated_on = '2019-07-01 10:00:00'\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!", null),
                                     new DatasourceStructure.Template("DELETE", "DELETE FROM users\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!", null),
                             },
                             usersTable.getTemplates().toArray()
                     );
@@ -703,7 +768,7 @@ public class MySqlPluginTest {
                     assertTrue(result.getIsExecutionSuccess());
                     Object body = result.getBody();
                     assertNotNull(body);
-                    assertEquals("[{\"Variable_name\":\"Ssl_cipher\",\"Value\":\"ECDHE-RSA-AES128-SHA\"}]",
+                    assertEquals("[{\"Variable_name\":\"Ssl_cipher\",\"Value\":\"ECDHE-RSA-AES128-GCM-SHA256\"}]",
                             body.toString());
                 })
                 .verifyComplete();
@@ -727,7 +792,7 @@ public class MySqlPluginTest {
                     assertTrue(result.getIsExecutionSuccess());
                     Object body = result.getBody();
                     assertNotNull(body);
-                    assertEquals("[{\"Variable_name\":\"Ssl_cipher\",\"Value\":\"ECDHE-RSA-AES128-SHA\"}]",
+                    assertEquals("[{\"Variable_name\":\"Ssl_cipher\",\"Value\":\"ECDHE-RSA-AES128-GCM-SHA256\"}]",
                             body.toString());
                 })
                 .verifyComplete();
@@ -751,7 +816,7 @@ public class MySqlPluginTest {
                     assertTrue(result.getIsExecutionSuccess());
                     Object body = result.getBody();
                     assertNotNull(body);
-                    assertEquals("[{\"Variable_name\":\"Ssl_cipher\",\"Value\":\"ECDHE-RSA-AES128-SHA\"}]",
+                    assertEquals("[{\"Variable_name\":\"Ssl_cipher\",\"Value\":\"ECDHE-RSA-AES128-GCM-SHA256\"}]",
                             body.toString());
                 })
                 .verifyComplete();
diff --git a/app/server/appsmith-plugins/pom.xml b/app/server/appsmith-plugins/pom.xml
index 1c066b8540..fcc5720ece 100644
--- a/app/server/appsmith-plugins/pom.xml
+++ b/app/server/appsmith-plugins/pom.xml
@@ -27,5 +27,7 @@
         <module>redshiftPlugin</module>
         <module>amazons3Plugin</module>
         <module>googleSheetsPlugin</module>
+        <module>snowflakePlugin</module>
+        <module>arangoDBPlugin</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java b/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java
index 0f44c525c0..0684222ebc 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java
@@ -15,6 +15,7 @@ import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.DatasourceStructure;
 import com.appsmith.external.models.DatasourceTestResult;
 import com.appsmith.external.models.Endpoint;
+import com.appsmith.external.models.PsParameterDTO;
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.RequestParamDTO;
 import com.appsmith.external.models.SSLDetails;
@@ -62,11 +63,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
+import static com.appsmith.external.helpers.MustacheHelper.replaceQuestionMarkWithDollarIndex;
 import static com.appsmith.external.helpers.PluginUtils.getColumnsListForJdbcPlugin;
 import static com.appsmith.external.helpers.PluginUtils.getIdenticalColumns;
+import static com.appsmith.external.helpers.PluginUtils.getPSParamLabel;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 
@@ -74,10 +78,22 @@ public class PostgresPlugin extends BasePlugin {
 
     static final String JDBC_DRIVER = "org.postgresql.Driver";
 
-    private static final String SSL = "useSSL";
-
     private static final String DATE_COLUMN_TYPE_NAME = "date";
 
+    private static final String TIMESTAMP_TYPE_NAME = "timestamp";
+
+    private static final String TIMESTAMPTZ_TYPE_NAME = "timestamptz";
+
+    private static final String TIME_TYPE_NAME = "time";
+
+    private static final String TIMETZ_TYPE_NAME = "timetz";
+
+    private static final String INTERVAL_TYPE_NAME = "interval";
+
+    private static final String JSON_TYPE_NAME = "json";
+
+    private static final String JSONB_TYPE_NAME = "jsonb";
+
     private static final int MINIMUM_POOL_SIZE = 1;
 
     private static final int MAXIMUM_POOL_SIZE = 5;
@@ -168,12 +184,8 @@ public class PostgresPlugin extends BasePlugin {
 
             final List<Property> properties = actionConfiguration.getPluginSpecifiedTemplates();
             if (properties == null || properties.get(PREPARED_STATEMENT_INDEX) == null) {
-                /**
-                 * TODO :
-                 * In case the prepared statement configuration is missing, default to true once PreparedStatement
-                 * is no longer in beta.
-                 */
-                isPreparedStatement = false;
+                //In case the prepared statement configuration is missing, default to true.
+                isPreparedStatement = true;
             } else if (properties.get(PREPARED_STATEMENT_INDEX) != null){
                 Object psValue = properties.get(PREPARED_STATEMENT_INDEX).getValue();
                 if (psValue instanceof  Boolean) {
@@ -181,10 +193,10 @@ public class PostgresPlugin extends BasePlugin {
                 } else if (psValue instanceof String) {
                     isPreparedStatement = Boolean.parseBoolean((String) psValue);
                 } else {
-                    isPreparedStatement = false;
+                    isPreparedStatement = true;
                 }
             } else {
-                isPreparedStatement = false;
+                isPreparedStatement = true;
             }
 
             // In case of non prepared statement, simply do binding replacement and execute
@@ -193,7 +205,8 @@ public class PostgresPlugin extends BasePlugin {
                 return executeCommon(connection, datasourceConfiguration, actionConfiguration, FALSE, null, null);
             }
 
-            //Prepared Statement
+            // Prepared Statement
+
             // First extract all the bindings in order
             List<String> mustacheKeysInOrder = MustacheHelper.extractMustacheKeysInOrder(query);
             // Replace all the bindings with a ? as expected in a prepared statement.
@@ -213,8 +226,10 @@ public class PostgresPlugin extends BasePlugin {
             requestData.put("preparedStatement", TRUE.equals(preparedStatement) ? true : false);
 
             String query = actionConfiguration.getBody();
-            List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null
-                    , null));
+            Map<String, Object> psParams = preparedStatement ? new LinkedHashMap<>() : null;
+            String transformedQuery = preparedStatement ? replaceQuestionMarkWithDollarIndex(query) : query;
+            List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
+                    transformedQuery, null, null, psParams));
 
             return Mono.fromCallable(() -> {
 
@@ -265,6 +280,12 @@ public class PostgresPlugin extends BasePlugin {
                                 parameters,
                                 connectionFromPool);
 
+                        IntStream.range(0, parameters.size())
+                                .forEachOrdered(i ->
+                                        psParams.put(
+                                                getPSParamLabel(i+1),
+                                                new PsParameterDTO(parameters.get(i).getKey(),parameters.get(i).getValue())));
+
                         requestData.put("ps-parameters", parameters);
                         isResultSet = preparedQuery.execute();
                         resultSet = preparedQuery.getResultSet();
@@ -299,7 +320,7 @@ public class PostgresPlugin extends BasePlugin {
                                 } else if (DATE_COLUMN_TYPE_NAME.equalsIgnoreCase(typeName)) {
                                     value = DateTimeFormatter.ISO_DATE.format(resultSet.getDate(i).toLocalDate());
 
-                                } else if ("timestamp".equalsIgnoreCase(typeName)) {
+                                } else if (TIMESTAMP_TYPE_NAME.equalsIgnoreCase(typeName)) {
                                     value = DateTimeFormatter.ISO_DATE_TIME.format(
                                             LocalDateTime.of(
                                                     resultSet.getDate(i).toLocalDate(),
@@ -307,23 +328,25 @@ public class PostgresPlugin extends BasePlugin {
                                             )
                                     ) + "Z";
 
-                                } else if ("timestamptz".equalsIgnoreCase(typeName)) {
+                                } else if (TIMESTAMPTZ_TYPE_NAME.equalsIgnoreCase(typeName)) {
                                     value = DateTimeFormatter.ISO_DATE_TIME.format(
                                             resultSet.getObject(i, OffsetDateTime.class)
                                     );
 
-                                } else if ("time".equalsIgnoreCase(typeName) || "timetz".equalsIgnoreCase(typeName)) {
+                                } else if (TIME_TYPE_NAME.equalsIgnoreCase(typeName) || TIMETZ_TYPE_NAME.equalsIgnoreCase(typeName)) {
                                     value = resultSet.getString(i);
 
-                                } else if ("interval".equalsIgnoreCase(typeName)) {
+                                } else if (INTERVAL_TYPE_NAME.equalsIgnoreCase(typeName)) {
                                     value = resultSet.getObject(i).toString();
 
                                 } else if (typeName.startsWith("_")) {
                                     value = resultSet.getArray(i).getArray();
 
+                                } else if (JSON_TYPE_NAME.equalsIgnoreCase(typeName)
+                                        || JSONB_TYPE_NAME.equalsIgnoreCase(typeName)) {
+                                    value = objectMapper.readTree(resultSet.getString(i));
                                 } else {
                                     value = resultSet.getObject(i);
-
                                 }
 
                                 row.put(metaData.getColumnName(i), value);
@@ -336,6 +359,11 @@ public class PostgresPlugin extends BasePlugin {
                 } catch (SQLException e) {
                     System.out.println(Thread.currentThread().getName() + ": In the PostgresPlugin, got action execution error");
                     return Mono.error(new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, e.getMessage()));
+                } catch (IOException e) {
+                    // Since postgres json type field can only hold valid json data, this exception is not expected
+                    // to occur.
+                    System.out.println(Thread.currentThread().getName() + ": In the PostgresPlugin, got action execution error");
+                    return Mono.error(new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, e.getMessage()));
                 } finally {
                     idleConnections = poolProxy.getIdleConnections();
                     activeConnections = poolProxy.getActiveConnections();
@@ -570,6 +598,7 @@ public class PostgresPlugin extends BasePlugin {
                             if (!tablesByName.containsKey(fullTableName)) {
                                 tablesByName.put(fullTableName, new DatasourceStructure.Table(
                                         kind == 'r' ? DatasourceStructure.TableType.TABLE : DatasourceStructure.TableType.VIEW,
+                                        schemaName,
                                         fullTableName,
                                         new ArrayList<>(),
                                         new ArrayList<>(),
@@ -673,15 +702,15 @@ public class PostgresPlugin extends BasePlugin {
 
                         final String quotedTableName = table.getName().replaceFirst("\\.(\\w+)", ".\"$1\"");
                         table.getTemplates().addAll(List.of(
-                                new DatasourceStructure.Template("SELECT", "SELECT * FROM " + quotedTableName + " LIMIT 10;"),
+                                new DatasourceStructure.Template("SELECT", "SELECT * FROM " + quotedTableName + " LIMIT 10;", null),
                                 new DatasourceStructure.Template("INSERT", "INSERT INTO " + quotedTableName
                                         + " (" + String.join(", ", columnNames) + ")\n"
-                                        + "  VALUES (" + String.join(", ", columnValues) + ");"),
+                                        + "  VALUES (" + String.join(", ", columnValues) + ");", null),
                                 new DatasourceStructure.Template("UPDATE", "UPDATE " + quotedTableName + " SET"
                                         + setFragments.toString() + "\n"
-                                        + "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"),
+                                        + "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!", null),
                                 new DatasourceStructure.Template("DELETE", "DELETE FROM " + quotedTableName
-                                        + "\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!")
+                                        + "\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!", null)
                         ));
                     }
 
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 4c433b6bc8..cf812a3642 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
@@ -17,11 +17,11 @@
           "info": "Ask confirmation from the user each time before refreshing data"
         },
         {
-          "label": "[Beta] Use Prepared Statement",
+          "label": "Use Prepared Statement",
           "info": "Turning on Prepared Statement makes the query parametrized. This in turn makes it resilient against SQL injections",
           "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
           "controlType": "SWITCH",
-          "initialValue": false
+          "initialValue": true
         },
         {
           "label": "Query timeout (in milliseconds)",
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 7f3ffd65c5..4388bc1b9f 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
@@ -2,7 +2,7 @@ INSERT INTO users
   (name, gender, email)
 VALUES
   (
-    '{{ nameInput.text }}',
-    '{{ genderDropdown.selectedOptionValue }}',
-    '{{ nameInput.text }}'
-  ); -- nameInput and genderDropdown are example widgets, replace them with your widget names. Read more at http://bit.ly/capture-widget-data
+    {{ nameInput.text }},
+    {{ genderDropdown.selectedOptionValue }},
+    {{ nameInput.text }}
+  );
\ No newline at end of file
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 02cd7ee499..e7014662d5 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; -- Use widget data in a query by replacing static values with {{ widgetName.property }}. Read more at http://bit.ly/capture-widget-data
+DELETE FROM users WHERE id = -1;
\ No newline at end of file
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 7223f08ec1..dd55e9cb3e 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 +1 @@
-SELECT * FROM users where role = 'Admin' ORDER BY id LIMIT 10; -- Use widget data in a query using {{ widgetName.property }}. Read more at http://bit.ly/capture-widget-data
\ No newline at end of file
+SELECT * FROM users where role = 'Admin' ORDER BY id LIMIT 10;
\ No newline at end of file
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 5d57e4a652..de4915e6fd 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,4 +1,3 @@
 UPDATE users
   SET status = 'APPROVED'
-  WHERE id = '{{ usersTable.selectedRow.id }}'; -- usersTable is an example table widget from where the id is being read. Replace it with your own Table widget or a static value. Read more at http://bit.ly/capture-widget-data
-
+  WHERE id = {{ usersTable.selectedRow.id }};
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java b/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java
index 7c95080250..e89f834d91 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java
+++ b/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java
@@ -9,6 +9,7 @@ import com.appsmith.external.models.DBAuth;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.DatasourceStructure;
 import com.appsmith.external.models.Endpoint;
+import com.appsmith.external.models.PsParameterDTO;
 import com.appsmith.external.models.Param;
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.RequestParamDTO;
@@ -124,6 +125,12 @@ public class PostgresPluginTest {
                         "    id timestamptz default now(),\n" +
                         "    name timestamptz default now()\n" +
                         ")");
+
+                statement.execute("CREATE TABLE jsontest (\n" +
+                        "    id serial PRIMARY KEY,\n" +
+                        "    item json,\n" +
+                        "    origin jsonb" +
+                        ")");
             }
 
             try (Statement statement = connection.createStatement()) {
@@ -159,6 +166,14 @@ public class PostgresPluginTest {
                                 ")");
             }
 
+            try (Statement statement = connection.createStatement()) {
+                statement.execute(
+                        "INSERT INTO jsontest VALUES (" +
+                                "1, '{\"type\":\"racket\", \"manufacturer\":\"butterfly\"}'," +
+                                "'{\"country\":\"japan\", \"city\":\"kyoto\"}'"+
+                                ")");
+            }
+
         } catch (SQLException throwable) {
             throwable.printStackTrace();
         }
@@ -320,7 +335,7 @@ public class PostgresPluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            actionConfiguration.getBody(), null, null));
+                            actionConfiguration.getBody(), null, null, null));
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -335,7 +350,7 @@ public class PostgresPluginTest {
         StepVerifier.create(structureMono)
                 .assertNext(structure -> {
                     assertNotNull(structure);
-                    assertEquals(3, structure.getTables().size());
+                    assertEquals(4, structure.getTables().size());
 
                     final DatasourceStructure.Table campusTable = structure.getTables().get(0);
                     assertEquals("public.campus", campusTable.getName());
@@ -349,7 +364,21 @@ public class PostgresPluginTest {
                     );
                     assertEquals(campusTable.getKeys().size(), 0);
 
-                    final DatasourceStructure.Table possessionsTable = structure.getTables().get(1);
+                    final DatasourceStructure.Table jsonTestTable = structure.getTables().get(1);
+                    assertEquals("public.jsontest", jsonTestTable.getName());
+                    assertEquals(DatasourceStructure.TableType.TABLE, campusTable.getType());
+                    assertArrayEquals(
+                            new DatasourceStructure.Column[]{
+                                    new DatasourceStructure.Column("id", "int4", "nextval('jsontest_id_seq" +
+                                            "'::regclass)"),
+                                    new DatasourceStructure.Column("item", "json", null),
+                                    new DatasourceStructure.Column("origin", "jsonb", null)
+                            },
+                            jsonTestTable.getColumns().toArray()
+                    );
+                    assertEquals(jsonTestTable.getKeys().size(), 1);
+
+                    final DatasourceStructure.Table possessionsTable = structure.getTables().get(2);
                     assertEquals("public.possessions", possessionsTable.getName());
                     assertEquals(DatasourceStructure.TableType.TABLE, possessionsTable.getType());
                     assertArrayEquals(
@@ -375,20 +404,20 @@ public class PostgresPluginTest {
 
                     assertArrayEquals(
                             new DatasourceStructure.Template[]{
-                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM public.\"possessions\" LIMIT 10;"),
+                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM public.\"possessions\" LIMIT 10;", null),
                                     new DatasourceStructure.Template("INSERT", "INSERT INTO public.\"possessions\" (\"title\", \"user_id\")\n" +
-                                            "  VALUES ('', 1);"),
+                                            "  VALUES ('', 1);", null),
                                     new DatasourceStructure.Template("UPDATE", "UPDATE public.\"possessions\" SET\n" +
                                             "    \"title\" = ''\n" +
                                             "    \"user_id\" = 1\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!", null),
                                     new DatasourceStructure.Template("DELETE", "DELETE FROM public.\"possessions\"\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!", null),
                             },
                             possessionsTable.getTemplates().toArray()
                     );
 
-                    final DatasourceStructure.Table usersTable = structure.getTables().get(2);
+                    final DatasourceStructure.Table usersTable = structure.getTables().get(3);
                     assertEquals("public.users", usersTable.getName());
                     assertEquals(DatasourceStructure.TableType.TABLE, usersTable.getType());
                     assertArrayEquals(
@@ -419,9 +448,9 @@ public class PostgresPluginTest {
 
                     assertArrayEquals(
                             new DatasourceStructure.Template[]{
-                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM public.\"users\" LIMIT 10;"),
+                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM public.\"users\" LIMIT 10;", null),
                                     new DatasourceStructure.Template("INSERT", "INSERT INTO public.\"users\" (\"username\", \"password\", \"email\", \"spouse_dob\", \"dob\", \"time1\", \"time_tz\", \"created_on\", \"created_on_tz\", \"interval1\", \"numbers\", \"texts\")\n" +
-                                            "  VALUES ('', '', '', '2019-07-01', '2019-07-01', '18:32:45', '04:05:06 PST', TIMESTAMP '2019-07-01 10:00:00', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', 1, '{1, 2, 3}', '{\"first\", \"second\"}');"),
+                                            "  VALUES ('', '', '', '2019-07-01', '2019-07-01', '18:32:45', '04:05:06 PST', TIMESTAMP '2019-07-01 10:00:00', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', 1, '{1, 2, 3}', '{\"first\", \"second\"}');", null),
                                     new DatasourceStructure.Template("UPDATE", "UPDATE public.\"users\" SET\n" +
                                             "    \"username\" = ''\n" +
                                             "    \"password\" = ''\n" +
@@ -435,9 +464,9 @@ public class PostgresPluginTest {
                                             "    \"interval1\" = 1\n" +
                                             "    \"numbers\" = '{1, 2, 3}'\n" +
                                             "    \"texts\" = '{\"first\", \"second\"}'\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!", null),
                                     new DatasourceStructure.Template("DELETE", "DELETE FROM public.\"users\"\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!", null),
                             },
                             usersTable.getTemplates().toArray()
                     );
@@ -538,7 +567,6 @@ public class PostgresPluginTest {
                     Map.Entry<String, String> parameterEntry = parameters.get(0);
                     assertEquals(parameterEntry.getKey(), "1");
                     assertEquals(parameterEntry.getValue(), "INTEGER");
-
                 })
                 .verifyComplete();
     }
@@ -604,6 +632,23 @@ public class PostgresPluginTest {
                                     .toArray()
                     );
 
+                    /*
+                     * - Check if request params are sent back properly.
+                     * - Not replicating the same to other tests as the overall flow remainst the same w.r.t. request
+                     *  params.
+                     */
+
+                    // check if '?' is replaced by $i.
+                    assertEquals("SELECT * FROM public.\"users\" where id = $1;",
+                            ((RequestParamDTO)(((List)result.getRequest().getRequestParams())).get(0)).getValue());
+
+                    PsParameterDTO expectedPsParam = new PsParameterDTO("1", "INTEGER");
+                    PsParameterDTO returnedPsParam =
+                            (PsParameterDTO) ((RequestParamDTO) (((List) result.getRequest().getRequestParams())).get(0)).getSubstitutedParams().get("$1");
+                    // Check if prepared stmt param value is correctly sent back.
+                    assertEquals(expectedPsParam.getValue(), returnedPsParam.getValue());
+                    // check if prepared stmt param type is correctly sent back.
+                    assertEquals(expectedPsParam.getType(), returnedPsParam.getType());
                 })
                 .verifyComplete();
     }
@@ -1046,4 +1091,28 @@ public class PostgresPluginTest {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    public void testJsonTypes() {
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setBody("SELECT * FROM jsontest");
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+        Mono<HikariDataSource> connectionPoolMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ActionExecutionResult> resultMono = connectionPoolMono
+                .flatMap(conn -> pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
+
+        StepVerifier.create(resultMono)
+                .assertNext(result -> {
+                    assertNotNull(result);
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+
+                    final JsonNode node = ((ArrayNode) result.getBody()).get(0);
+                    assertEquals("racket", node.get("item").get("type").asText());
+                    assertEquals("butterfly", node.get("item").get("manufacturer").asText());
+                    assertEquals("japan", node.get("origin").get("country").asText());
+                    assertEquals("kyoto", node.get("origin").get("city").asText());
+                })
+                .verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-plugins/rapidApiPlugin/pom.xml b/app/server/appsmith-plugins/rapidApiPlugin/pom.xml
index 1ee8b7b3fd..7a98a62c40 100644
--- a/app/server/appsmith-plugins/rapidApiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/rapidApiPlugin/pom.xml
@@ -19,6 +19,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>11</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <plugin.id>rapidapi-plugin</plugin.id>
diff --git a/app/server/appsmith-plugins/redisPlugin/src/main/java/com/external/plugins/RedisPlugin.java b/app/server/appsmith-plugins/redisPlugin/src/main/java/com/external/plugins/RedisPlugin.java
index acfc7736ea..39fa6e97af 100644
--- a/app/server/appsmith-plugins/redisPlugin/src/main/java/com/external/plugins/RedisPlugin.java
+++ b/app/server/appsmith-plugins/redisPlugin/src/main/java/com/external/plugins/RedisPlugin.java
@@ -22,10 +22,13 @@ import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
 import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
 import redis.clients.jedis.Protocol;
-import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.jedis.util.SafeEncoder;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -36,7 +39,8 @@ import java.util.stream.Collectors;
 import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
 
 public class RedisPlugin extends BasePlugin {
-    private static final Integer DEFAULT_PORT = 6379;
+    private static final Long DEFAULT_PORT = 6379L;
+    private static final int CONNECTION_TIMEOUT = 60;
 
     public RedisPlugin(PluginWrapper wrapper) {
         super(wrapper);
@@ -44,19 +48,20 @@ public class RedisPlugin extends BasePlugin {
 
     @Slf4j
     @Extension
-    public static class RedisPluginExecutor implements PluginExecutor<Jedis> {
+    public static class RedisPluginExecutor implements PluginExecutor<JedisPool> {
 
         private final Scheduler scheduler = Schedulers.elastic();
 
         @Override
-        public Mono<ActionExecutionResult> execute(Jedis jedis,
+        public Mono<ActionExecutionResult> execute(JedisPool jedisPool,
                                                    DatasourceConfiguration datasourceConfiguration,
                                                    ActionConfiguration actionConfiguration) {
 
             String query = actionConfiguration.getBody();
             List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null
-                    , null));
+                    , null, null));
 
+            Jedis jedis = jedisPool.getResource();
             return Mono.fromCallable(() -> {
                 if (StringUtils.isNullOrEmpty(query)) {
                     return Mono.error(new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
@@ -92,6 +97,7 @@ public class RedisPlugin extends BasePlugin {
                     .flatMap(obj -> obj)
                     .map(obj -> (ActionExecutionResult) obj)
                     .onErrorResume(error  -> {
+                        error.printStackTrace();
                         ActionExecutionResult result = new ActionExecutionResult();
                         result.setIsExecutionSuccess(false);
                         result.setErrorInfo(error);
@@ -106,6 +112,16 @@ public class RedisPlugin extends BasePlugin {
                         result.setRequest(request);
                         return result;
                     })
+                    .doFinally(signalType -> {
+                        /**
+                         * - Return resource back to the pool.
+                         * - https://stackoverflow.com/questions/54902337/is-it-necessary-to-use-jedis-close
+                         * - https://www.baeldung.com/jedis-java-redis-client-library:
+                         */
+                        if (jedis != null) {
+                            jedis.close();
+                        }
+                    })
                     .subscribeOn(scheduler);
         }
 
@@ -125,10 +141,31 @@ public class RedisPlugin extends BasePlugin {
             }
         }
 
-        @Override
-        public Mono<Jedis> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
 
-            return (Mono<Jedis>) Mono.fromCallable(() -> {
+        /**
+         * - Config taken from https://www.baeldung.com/jedis-java-redis-client-library
+         * - To understand what these config mean:
+         * https://www.infoworld.com/article/2071834/pool-resources-using-apache-s-commons-pool-framework.html
+         */
+        private JedisPoolConfig buildPoolConfig() {
+            final JedisPoolConfig poolConfig = new JedisPoolConfig();
+            poolConfig.setMaxTotal(5);
+            poolConfig.setMaxIdle(5);
+            poolConfig.setMinIdle(0);
+            poolConfig.setTestOnBorrow(true);
+            poolConfig.setTestOnReturn(true);
+            poolConfig.setTestWhileIdle(true);
+            poolConfig.setMinEvictableIdleTimeMillis(Duration.ofSeconds(60).toMillis());
+            poolConfig.setTimeBetweenEvictionRunsMillis(Duration.ofSeconds(30).toMillis());
+            poolConfig.setNumTestsPerEvictionRun(3);
+            poolConfig.setBlockWhenExhausted(true);
+            return poolConfig;
+        }
+
+        @Override
+        public Mono<JedisPool> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+
+            return (Mono<JedisPool>) Mono.fromCallable(() -> {
                 if (datasourceConfiguration.getEndpoints().isEmpty()) {
                     return Mono.error(new AppsmithPluginException(AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR, "No endpoint(s) " +
                             "configured"));
@@ -136,29 +173,40 @@ public class RedisPlugin extends BasePlugin {
 
                 Endpoint endpoint = datasourceConfiguration.getEndpoints().get(0);
                 Integer port = (int) (long) ObjectUtils.defaultIfNull(endpoint.getPort(), DEFAULT_PORT);
-                Jedis jedis = new Jedis(endpoint.getHost(), port);
-
+                final JedisPoolConfig poolConfig = buildPoolConfig();
                 DBAuth auth = (DBAuth) datasourceConfiguration.getAuthentication();
-                if (auth != null && DBAuth.Type.USERNAME_PASSWORD.equals(auth.getAuthType())) {
-                    jedis.auth(auth.getUsername(), auth.getPassword());
+                int timeout = (int)Duration.ofSeconds(CONNECTION_TIMEOUT).toMillis();
+                JedisPool jedisPool;
+                if (auth != null && StringUtils.isNotNullOrEmpty(auth.getPassword())) {
+                    if (StringUtils.isNullOrEmpty(auth.getUsername())) {
+                        // If username is empty, then authenticate with password only.
+                         jedisPool = new JedisPool(poolConfig, endpoint.getHost(), port, timeout, auth.getPassword());
+                    }
+                    else {
+                        jedisPool = new JedisPool(poolConfig, endpoint.getHost(), port, timeout,
+                                auth.getUsername(), auth.getPassword());
+                    }
+                }
+                else {
+                    jedisPool = new JedisPool(poolConfig, endpoint.getHost(), port);
                 }
 
-                return Mono.just(jedis);
+                return Mono.just(jedisPool);
             })
                     .flatMap(obj -> obj)
                     .subscribeOn(scheduler);
         }
 
         @Override
-        public void datasourceDestroy(Jedis jedis) {
+        public void datasourceDestroy(JedisPool jedisPool) {
             // Schedule on elastic thread pool and subscribe immediately.
             Mono.fromSupplier(() -> {
                 try {
-                    if (jedis != null) {
-                        jedis.close();
+                    if (jedisPool != null) {
+                        jedisPool.destroy();
                     }
-                } catch (JedisConnectionException exc) {
-                    System.out.println("Error closing Redis connection");
+                } catch (JedisException e) {
+                    System.out.println("Error destroying Jedis pool.");
                 }
 
                 return Mono.empty();
@@ -178,9 +226,6 @@ public class RedisPlugin extends BasePlugin {
                 if (StringUtils.isNullOrEmpty(endpoint.getHost())) {
                     invalids.add("Missing host for endpoint");
                 }
-                if (endpoint.getPort() == null) {
-                    invalids.add("Missing port for endpoint");
-                }
             }
 
             DBAuth auth = (DBAuth) datasourceConfiguration.getAuthentication();
@@ -218,9 +263,10 @@ public class RedisPlugin extends BasePlugin {
 
             return Mono.fromCallable(() ->
                     datasourceCreate(datasourceConfiguration)
-                    .map(jedis -> {
+                    .map(jedisPool -> {
+                        Jedis jedis = jedisPool.getResource();
                         verifyPing(jedis).block();
-                        datasourceDestroy(jedis);
+                        datasourceDestroy(jedisPool);
                         return new DatasourceTestResult();
                     })
                     .onErrorResume(error -> Mono.just(new DatasourceTestResult(error.getMessage()))))
diff --git a/app/server/appsmith-plugins/redisPlugin/src/test/java/com/external/plugins/RedisPluginTest.java b/app/server/appsmith-plugins/redisPlugin/src/test/java/com/external/plugins/RedisPluginTest.java
index fc36e69df4..8b271a20c3 100644
--- a/app/server/appsmith-plugins/redisPlugin/src/test/java/com/external/plugins/RedisPluginTest.java
+++ b/app/server/appsmith-plugins/redisPlugin/src/test/java/com/external/plugins/RedisPluginTest.java
@@ -19,7 +19,7 @@ import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -59,13 +59,13 @@ public class RedisPluginTest {
     @Test
     public void itShouldCreateDatasource() {
         DatasourceConfiguration datasourceConfiguration = createDatasourceConfiguration();
-        Mono<Jedis> jedisMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
+        Mono<JedisPool> jedisPoolMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
 
-        StepVerifier.create(jedisMono)
+        StepVerifier.create(jedisPoolMono)
                 .assertNext(Assert::assertNotNull)
                 .verifyComplete();
 
-        pluginExecutor.datasourceDestroy(jedisMono.block());
+        pluginExecutor.datasourceDestroy(jedisPoolMono.block());
     }
 
     @Test
@@ -83,7 +83,7 @@ public class RedisPluginTest {
         Endpoint endpoint = new Endpoint();
         invalidDatasourceConfiguration.setEndpoints(Collections.singletonList(endpoint));
 
-        Assert.assertEquals(Set.of("Missing port for endpoint", "Missing host for endpoint"),
+        Assert.assertEquals(Set.of("Missing host for endpoint"),
                 pluginExecutor.validateDatasource(invalidDatasourceConfiguration));
     }
 
@@ -95,7 +95,8 @@ public class RedisPluginTest {
         endpoint.setHost("test-host");
         invalidDatasourceConfiguration.setEndpoints(Collections.singletonList(endpoint));
 
-        Assert.assertEquals(pluginExecutor.validateDatasource(invalidDatasourceConfiguration), Set.of("Missing port for endpoint"));
+        // Since default port is picked, set of invalids should be empty.
+        Assert.assertEquals(pluginExecutor.validateDatasource(invalidDatasourceConfiguration), Set.of());
     }
 
     @Test
@@ -112,7 +113,7 @@ public class RedisPluginTest {
         invalidDatasourceConfiguration.setEndpoints(Collections.singletonList(endpoint));
 
         Assert.assertEquals(
-                Set.of("Missing port for endpoint", "Missing username for authentication.", "Missing password for authentication."),
+                Set.of("Missing username for authentication.", "Missing password for authentication."),
                 pluginExecutor.validateDatasource(invalidDatasourceConfiguration)
         );
     }
@@ -151,12 +152,12 @@ public class RedisPluginTest {
     @Test
     public void itShouldThrowErrorIfEmptyBody() {
         DatasourceConfiguration datasourceConfiguration = createDatasourceConfiguration();
-        Mono<Jedis> jedisMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
+        Mono<JedisPool> jedisPoolMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
 
-        Mono<ActionExecutionResult> actionExecutionResultMono = jedisMono
-                .flatMap(jedis -> pluginExecutor.execute(jedis, datasourceConfiguration, actionConfiguration));
+        Mono<ActionExecutionResult> actionExecutionResultMono = jedisPoolMono
+                .flatMap(jedisPool -> pluginExecutor.execute(jedisPool, datasourceConfiguration, actionConfiguration));
 
         StepVerifier.create(actionExecutionResultMono)
                 .assertNext(result -> {
@@ -170,13 +171,13 @@ public class RedisPluginTest {
     @Test
     public void itShouldThrowErrorIfInvalidRedisCommand() {
         DatasourceConfiguration datasourceConfiguration = createDatasourceConfiguration();
-        Mono<Jedis> jedisMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
+        Mono<JedisPool> jedisPoolMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("LOL");
 
-        Mono<ActionExecutionResult> actionExecutionResultMono = jedisMono
-                .flatMap(jedis -> pluginExecutor.execute(jedis, datasourceConfiguration, actionConfiguration));
+        Mono<ActionExecutionResult> actionExecutionResultMono = jedisPoolMono
+                .flatMap(jedisPool -> pluginExecutor.execute(jedisPool, datasourceConfiguration, actionConfiguration));
 
         StepVerifier.create(actionExecutionResultMono)
                 .assertNext(result -> {
@@ -190,13 +191,13 @@ public class RedisPluginTest {
     @Test
     public void itShouldExecuteCommandWithoutArgs() {
         DatasourceConfiguration datasourceConfiguration = createDatasourceConfiguration();
-        Mono<Jedis> jedisMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
+        Mono<JedisPool> jedisPoolMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("PING");
 
-        Mono<ActionExecutionResult> actionExecutionResultMono = jedisMono
-                .flatMap(jedis -> pluginExecutor.execute(jedis, datasourceConfiguration, actionConfiguration));
+        Mono<ActionExecutionResult> actionExecutionResultMono = jedisPoolMono
+                .flatMap(jedisPool -> pluginExecutor.execute(jedisPool, datasourceConfiguration, actionConfiguration));
 
         StepVerifier.create(actionExecutionResultMono)
                 .assertNext(actionExecutionResult -> {
@@ -210,13 +211,14 @@ public class RedisPluginTest {
     @Test
     public void itShouldExecuteCommandWithArgs() {
         DatasourceConfiguration datasourceConfiguration = createDatasourceConfiguration();
-        Mono<Jedis> jedisMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
+        Mono<JedisPool> jedisPoolMono = pluginExecutor.datasourceCreate(datasourceConfiguration);
 
         // Getting a non-existent key
         ActionConfiguration getActionConfiguration = new ActionConfiguration();
         getActionConfiguration.setBody("GET key");
-        Mono<ActionExecutionResult> actionExecutionResultMono = jedisMono
-                .flatMap(jedis -> pluginExecutor.execute(jedis, datasourceConfiguration, getActionConfiguration));
+        Mono<ActionExecutionResult> actionExecutionResultMono = jedisPoolMono
+                .flatMap(jedisPool -> pluginExecutor.execute(jedisPool, datasourceConfiguration,
+                        getActionConfiguration));
         StepVerifier.create(actionExecutionResultMono)
                 .assertNext(actionExecutionResult -> {
                     Assert.assertNotNull(actionExecutionResult);
@@ -224,15 +226,15 @@ public class RedisPluginTest {
                     final JsonNode node = ((ArrayNode) actionExecutionResult.getBody()).get(0);
                     Assert.assertEquals("null", node.get("result").asText());
 
-                    /*
-                     * - Adding only in this test as the query editor form for Redis plugin is exactly same for each
+
+                    /* - Adding only in this test as the query editor form for Redis plugin is exactly same for each
                      *  query type. Hence, checking with only one query should suffice.
                      * - RequestParamDTO object only have attributes configProperty and value at this point.
                      * - The other two RequestParamDTO attributes - label and type are null at this point.
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            getActionConfiguration.getBody(), null, null));
+                            getActionConfiguration.getBody(), null, null, null));
                     assertEquals(actionExecutionResult.getRequest().getRequestParams().toString(),
                             expectedRequestParams.toString());
                 }).verifyComplete();
@@ -240,8 +242,9 @@ public class RedisPluginTest {
         // Setting a key
         ActionConfiguration setActionConfiguration = new ActionConfiguration();
         setActionConfiguration.setBody("SET key value");
-        actionExecutionResultMono = jedisMono
-                .flatMap(jedis -> pluginExecutor.execute(jedis, datasourceConfiguration, setActionConfiguration));
+        actionExecutionResultMono = jedisPoolMono
+                .flatMap(jedisPool -> pluginExecutor.execute(jedisPool, datasourceConfiguration,
+                        setActionConfiguration));
         StepVerifier.create(actionExecutionResultMono)
                 .assertNext(actionExecutionResult -> {
                     Assert.assertNotNull(actionExecutionResult);
@@ -251,8 +254,9 @@ public class RedisPluginTest {
                 }).verifyComplete();
 
         // Getting the key
-        actionExecutionResultMono = jedisMono
-                .flatMap(jedis -> pluginExecutor.execute(jedis, datasourceConfiguration, getActionConfiguration));
+        actionExecutionResultMono = jedisPoolMono
+                .flatMap(jedisPool -> pluginExecutor.execute(jedisPool, datasourceConfiguration,
+                        getActionConfiguration));
         StepVerifier.create(actionExecutionResultMono)
                 .assertNext(actionExecutionResult -> {
                     Assert.assertNotNull(actionExecutionResult);
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/java/com/external/plugins/RedshiftPlugin.java b/app/server/appsmith-plugins/redshiftPlugin/src/main/java/com/external/plugins/RedshiftPlugin.java
index 928ca4fc65..696a56aa8d 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/java/com/external/plugins/RedshiftPlugin.java
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/java/com/external/plugins/RedshiftPlugin.java
@@ -222,7 +222,7 @@ public class RedshiftPlugin extends BasePlugin {
 
             String query = actionConfiguration.getBody();
             List<RequestParamDTO> requestParams = List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY,  query, null
-                    , null));
+                    , null, null));
 
             if (query == null) {
                 return Mono.error(
@@ -491,6 +491,7 @@ public class RedshiftPlugin extends BasePlugin {
                 if (!tablesByName.containsKey(fullTableName)) {
                     tablesByName.put(fullTableName, new DatasourceStructure.Table(
                             kind == 'r' ? DatasourceStructure.TableType.TABLE : DatasourceStructure.TableType.VIEW,
+                            schemaName,
                             fullTableName,
                             new ArrayList<>(),
                             new ArrayList<>(),
@@ -602,15 +603,15 @@ public class RedshiftPlugin extends BasePlugin {
 
                 final String quotedTableName = table.getName().replaceFirst("\\.(\\w+)", ".\"$1\"");
                 table.getTemplates().addAll(List.of(
-                        new DatasourceStructure.Template("SELECT", "SELECT * FROM " + quotedTableName + " LIMIT 10;"),
+                        new DatasourceStructure.Template("SELECT", "SELECT * FROM " + quotedTableName + " LIMIT 10;", null),
                         new DatasourceStructure.Template("INSERT", "INSERT INTO " + quotedTableName
                                 + " (" + String.join(", ", columnNames) + ")\n"
-                                + "  VALUES (" + String.join(", ", columnValues) + ");"),
+                                + "  VALUES (" + String.join(", ", columnValues) + ");", null),
                         new DatasourceStructure.Template("UPDATE", "UPDATE " + quotedTableName + " SET"
                                 + setFragments.toString() + "\n"
-                                + "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"),
+                                + "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!", null),
                         new DatasourceStructure.Template("DELETE", "DELETE FROM " + quotedTableName
-                                + "\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!")
+                                + "\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!", null)
                 ));
             }
         }
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 7f3ffd65c5..4388bc1b9f 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
@@ -2,7 +2,7 @@ INSERT INTO users
   (name, gender, email)
 VALUES
   (
-    '{{ nameInput.text }}',
-    '{{ genderDropdown.selectedOptionValue }}',
-    '{{ nameInput.text }}'
-  ); -- nameInput and genderDropdown are example widgets, replace them with your widget names. Read more at http://bit.ly/capture-widget-data
+    {{ nameInput.text }},
+    {{ genderDropdown.selectedOptionValue }},
+    {{ nameInput.text }}
+  );
\ No newline at end of file
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 02cd7ee499..e7014662d5 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; -- Use widget data in a query by replacing static values with {{ widgetName.property }}. Read more at http://bit.ly/capture-widget-data
+DELETE FROM users WHERE id = -1;
\ No newline at end of file
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 7223f08ec1..dd55e9cb3e 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 +1 @@
-SELECT * FROM users where role = 'Admin' ORDER BY id LIMIT 10; -- Use widget data in a query using {{ widgetName.property }}. Read more at http://bit.ly/capture-widget-data
\ No newline at end of file
+SELECT * FROM users where role = 'Admin' ORDER BY id LIMIT 10;
\ No newline at end of file
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 5d57e4a652..facf9fc3f9 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,4 +1,3 @@
 UPDATE users
   SET status = 'APPROVED'
-  WHERE id = '{{ usersTable.selectedRow.id }}'; -- usersTable is an example table widget from where the id is being read. Replace it with your own Table widget or a static value. Read more at http://bit.ly/capture-widget-data
-
+  WHERE id = {{ usersTable.selectedRow.id }};
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/test/java/com/external/plugins/RedshiftPluginTest.java b/app/server/appsmith-plugins/redshiftPlugin/src/test/java/com/external/plugins/RedshiftPluginTest.java
index e3098ad032..0f5a66fe48 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/test/java/com/external/plugins/RedshiftPluginTest.java
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/test/java/com/external/plugins/RedshiftPluginTest.java
@@ -281,7 +281,7 @@ public class RedshiftPluginTest {
                      */
                     List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
                     expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
-                            actionConfiguration.getBody(), null, null));
+                            actionConfiguration.getBody(), null, null, null));
                     assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
                 })
                 .verifyComplete();
@@ -415,16 +415,16 @@ public class RedshiftPluginTest {
 
                     assertArrayEquals(
                             new DatasourceStructure.Template[]{
-                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM public.\"possessions\" LIMIT 10;"),
+                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM public.\"possessions\" LIMIT 10;", null),
                                     new DatasourceStructure.Template("INSERT", "INSERT INTO public.\"possessions\" " +
-                                            "(\"id\", \"title\", \"user_id\")\n  VALUES (1, '', 1);"),
+                                            "(\"id\", \"title\", \"user_id\")\n  VALUES (1, '', 1);", null),
                                     new DatasourceStructure.Template("UPDATE", "UPDATE public.\"possessions\" SET\n" +
                                             "    \"id\" = 1\n" +
                                             "    \"title\" = ''\n" +
                                             "    \"user_id\" = 1\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!", null),
                                     new DatasourceStructure.Template("DELETE", "DELETE FROM public.\"possessions\"\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!", null),
                             },
                             possessionsTable.getTemplates().toArray()
                     );
@@ -451,15 +451,15 @@ public class RedshiftPluginTest {
 
                     assertArrayEquals(
                             new DatasourceStructure.Template[]{
-                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM public.\"users\" LIMIT 10;"),
+                                    new DatasourceStructure.Template("SELECT", "SELECT * FROM public.\"users\" LIMIT 10;", null),
                                     new DatasourceStructure.Template("INSERT", "INSERT INTO public.\"users\" (\"username\", \"password\")\n" +
-                                            "  VALUES ('', '');"),
+                                            "  VALUES ('', '');", null),
                                     new DatasourceStructure.Template("UPDATE", "UPDATE public.\"users\" SET\n" +
                                             "    \"username\" = ''\n" +
                                             "    \"password\" = ''\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!", null),
                                     new DatasourceStructure.Template("DELETE", "DELETE FROM public.\"users\"\n" +
-                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"),
+                                            "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!", null),
                             },
                             usersTable.getTemplates().toArray()
                     );
diff --git a/app/server/appsmith-plugins/restApiPlugin/pom.xml b/app/server/appsmith-plugins/restApiPlugin/pom.xml
index c6497e4d2f..a281c410be 100644
--- a/app/server/appsmith-plugins/restApiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/restApiPlugin/pom.xml
@@ -164,6 +164,12 @@
             <version>2.2.4.RELEASE</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.2.3.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/APIConnectionFactory.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/APIConnectionFactory.java
index ccc0a8bf30..eaca2e5bc1 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/APIConnectionFactory.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/APIConnectionFactory.java
@@ -3,7 +3,10 @@ package com.external.connections;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import com.appsmith.external.models.AuthenticationDTO;
+import com.appsmith.external.models.BasicAuth;
 import com.appsmith.external.models.OAuth2;
+import com.appsmith.external.models.ApiKeyAuth;
+import com.appsmith.external.models.BearerTokenAuth;
 import reactor.core.publisher.Mono;
 
 
@@ -22,6 +25,12 @@ public class APIConnectionFactory {
             } else {
                 return Mono.empty();
             }
+        } else if (authenticationType instanceof BasicAuth) {
+            return Mono.from(BasicAuthentication.create((BasicAuth) authenticationType));
+        } else if (authenticationType instanceof ApiKeyAuth) {
+            return Mono.from(ApiKeyAuthentication.create((ApiKeyAuth) authenticationType));
+        } else if (authenticationType instanceof BearerTokenAuth) {
+            return Mono.from(BearerTokenAuthentication.create((BearerTokenAuth) authenticationType));
         } else {
             return Mono.empty();
         }
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/ApiKeyAuthentication.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/ApiKeyAuthentication.java
new file mode 100644
index 0000000000..86c9755515
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/ApiKeyAuthentication.java
@@ -0,0 +1,82 @@
+package com.external.connections;
+
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.appsmith.external.models.ApiKeyAuth;
+import com.appsmith.external.models.ApiKeyAuth.Type;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.springframework.web.reactive.function.client.ClientRequest;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.ExchangeFunction;
+import org.springframework.web.util.UriComponentsBuilder;
+import reactor.core.publisher.Mono;
+
+import java.net.URI;
+
+@Setter
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class ApiKeyAuthentication extends APIConnection {
+    private String label;
+    private String value;
+    Type addTo;
+
+    public static Mono<ApiKeyAuthentication> create(ApiKeyAuth apiKeyAuth) {
+        return Mono.just(
+                ApiKeyAuthentication.builder()
+                        .label(apiKeyAuth.getLabel())
+                        .value(apiKeyAuth.getValue())
+                        .addTo(apiKeyAuth.getAddTo())
+                        .build()
+        );
+    }
+
+    @Override
+    public Mono<ClientResponse> filter(ClientRequest request, ExchangeFunction next) {
+        ClientRequest.Builder requestBuilder = ClientRequest.from(request);
+        switch (addTo) {
+            case QUERY_PARAMS:
+                requestBuilder.url(appendApiKeyParamToUrl(request.url()));
+                break;
+            case HEADER:
+                requestBuilder.headers(header -> header.set(label, value));
+                break;
+            default:
+                return Mono.error(
+                        new AppsmithPluginException(
+                                AppsmithPluginError.PLUGIN_ERROR,
+                                "Appsmith server has found an unsupported api key authentication type. Please reach " +
+                                        "out to Appsmith customer support to resolve this."
+                        )
+                );
+        }
+
+        return Mono.justOrEmpty(requestBuilder.build())
+                // Carry on to next exchange function
+                .flatMap(next::exchange)
+                // Default to next exchange function if something went wrong
+                .switchIfEmpty(next.exchange(request));
+    }
+
+    private URI appendApiKeyParamToUrl(URI oldUrl) {
+
+        return UriComponentsBuilder
+                .newInstance()
+                .scheme(oldUrl.getScheme())
+                .host(oldUrl.getHost())
+                .port(oldUrl.getPort())
+                .path(oldUrl.getPath())
+                .query(oldUrl.getQuery())
+                .queryParam(label, value)
+                .fragment(oldUrl.getFragment())
+                .build()
+                .toUri();
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/BasicAuthentication.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/BasicAuthentication.java
new file mode 100644
index 0000000000..64cf71210f
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/BasicAuthentication.java
@@ -0,0 +1,52 @@
+package com.external.connections;
+
+import com.appsmith.external.models.BasicAuth;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.springframework.web.reactive.function.client.ClientRequest;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.ExchangeFunction;
+import reactor.core.publisher.Mono;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+import static com.appsmith.external.constants.Authentication.AUTHORIZATION_HEADER;
+import static com.appsmith.external.constants.Authentication.BASIC_HEADER_PREFIX;
+
+@Setter
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class BasicAuthentication extends APIConnection {
+
+    private String encodedAuthorizationHeader;
+    final private static String HEADER_PREFIX = "Basic ";
+
+    public static Mono<BasicAuthentication> create(BasicAuth basicAuth) {
+        final BasicAuthentication basicAuthentication = new BasicAuthentication();
+        final String decodedAuthorizationHeader = basicAuth.getUsername() + ":" + basicAuth.getPassword();
+
+        basicAuthentication.setEncodedAuthorizationHeader(
+                Base64.getEncoder().encodeToString(decodedAuthorizationHeader.getBytes(StandardCharsets.UTF_8)));
+
+        return Mono.just(basicAuthentication);
+    }
+
+
+    @Override
+    public Mono<ClientResponse> filter(ClientRequest request, ExchangeFunction next) {
+        return Mono.justOrEmpty(ClientRequest.from(request)
+                .headers(headers -> headers.set(AUTHORIZATION_HEADER, getHeaderValue()))
+                .build())
+                // Carry on to next exchange function
+                .flatMap(next::exchange)
+                // Default to next exchange function if something went wrong
+                .switchIfEmpty(next.exchange(request));
+    }
+
+    private String getHeaderValue() {
+        return BASIC_HEADER_PREFIX + this.encodedAuthorizationHeader;
+    }
+}
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/BearerTokenAuthentication.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/BearerTokenAuthentication.java
new file mode 100644
index 0000000000..6494d5fc2a
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/BearerTokenAuthentication.java
@@ -0,0 +1,48 @@
+package com.external.connections;
+
+import com.appsmith.external.models.BearerTokenAuth;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.springframework.web.reactive.function.client.ClientRequest;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.ExchangeFunction;
+import reactor.core.publisher.Mono;
+
+import static com.appsmith.external.constants.Authentication.AUTHORIZATION_HEADER;
+import static com.appsmith.external.constants.Authentication.BEARER_HEADER_PREFIX;
+
+@Setter
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class BearerTokenAuthentication extends APIConnection {
+    private String bearerToken;
+
+    public static Mono<BearerTokenAuthentication> create(BearerTokenAuth bearerTokenAuth) {
+        return Mono.just(
+                BearerTokenAuthentication.builder()
+                        .bearerToken(bearerTokenAuth.getBearerToken())
+                        .build()
+        );
+    }
+
+    @Override
+    public Mono<ClientResponse> filter(ClientRequest request, ExchangeFunction next) {
+        return Mono.justOrEmpty(ClientRequest.from(request)
+                .headers(header -> header.set(AUTHORIZATION_HEADER, getHeaderValue()))
+                .build())
+                // Carry on to next exchange function
+                .flatMap(next::exchange)
+                // Default to next exchange function if something went wrong
+                .switchIfEmpty(next.exchange(request));
+    }
+
+    private String getHeaderValue() {
+        return BEARER_HEADER_PREFIX + " " + this.bearerToken;
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/OAuth2AuthorizationCode.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/OAuth2AuthorizationCode.java
index aa28d35856..aeb4111175 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/OAuth2AuthorizationCode.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/OAuth2AuthorizationCode.java
@@ -6,7 +6,9 @@ import com.appsmith.external.models.AuthenticationDTO;
 import com.appsmith.external.models.AuthenticationResponse;
 import com.appsmith.external.models.OAuth2;
 import com.appsmith.external.models.UpdatableConnection;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -31,6 +33,7 @@ import java.util.Map;
 
 @Setter
 @Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class OAuth2AuthorizationCode extends APIConnection implements UpdatableConnection {
 
     private final Clock clock = Clock.systemUTC();
@@ -42,9 +45,6 @@ public class OAuth2AuthorizationCode extends APIConnection implements UpdatableC
     private Object tokenResponse;
     private static final int MAX_IN_MEMORY_SIZE = 10 * 1024 * 1024; // 10 MB
 
-    private OAuth2AuthorizationCode() {
-    }
-
     public static Mono<OAuth2AuthorizationCode> create(OAuth2 oAuth2) {
         if (oAuth2 == null) {
             return Mono.empty();
@@ -171,7 +171,14 @@ public class OAuth2AuthorizationCode extends APIConnection implements UpdatableC
                 .with(Authentication.CLIENT_ID, oAuth2.getClientId())
                 .with(Authentication.CLIENT_SECRET, oAuth2.getClientSecret())
                 .with(Authentication.REFRESH_TOKEN, oAuth2.getAuthenticationResponse().getRefreshToken());
-
+        // Adding optional audience parameter
+        if (!StringUtils.isEmpty(oAuth2.getAudience())) {
+            body.with(Authentication.AUDIENCE, oAuth2.getAudience());
+        }
+        // Adding optional resource parameter
+        if (!StringUtils.isEmpty(oAuth2.getResource())) {
+            body.with(Authentication.RESOURCE, oAuth2.getResource());
+        }
         // Optionally add scope, if applicable
         if (!CollectionUtils.isEmpty(oAuth2.getScope())) {
             body.with(Authentication.SCOPE, StringUtils.collectionToDelimitedString(oAuth2.getScope(), " "));
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/OAuth2ClientCredentials.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/OAuth2ClientCredentials.java
index 33e54ebad3..9043b17353 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/OAuth2ClientCredentials.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/OAuth2ClientCredentials.java
@@ -6,7 +6,9 @@ import com.appsmith.external.models.AuthenticationDTO;
 import com.appsmith.external.models.AuthenticationResponse;
 import com.appsmith.external.models.OAuth2;
 import com.appsmith.external.models.UpdatableConnection;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -31,6 +33,7 @@ import java.util.Map;
 
 @Setter
 @Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class OAuth2ClientCredentials extends APIConnection implements UpdatableConnection {
 
     private final Clock clock = Clock.systemUTC();
@@ -41,9 +44,6 @@ public class OAuth2ClientCredentials extends APIConnection implements UpdatableC
     private Object tokenResponse;
     private static final int MAX_IN_MEMORY_SIZE = 10 * 1024 * 1024; // 10 MB
 
-    private OAuth2ClientCredentials() {
-    }
-
     public static Mono<OAuth2ClientCredentials> create(OAuth2 oAuth2) {
         if (oAuth2 == null) {
             return Mono.empty();
@@ -165,6 +165,14 @@ public class OAuth2ClientCredentials extends APIConnection implements UpdatableC
                 .fromFormData(Authentication.GRANT_TYPE, Authentication.CLIENT_CREDENTIALS)
                 .with(Authentication.CLIENT_ID, oAuth2.getClientId())
                 .with(Authentication.CLIENT_SECRET, oAuth2.getClientSecret());
+        // Adding optional audience parameter
+        if (!StringUtils.isEmpty(oAuth2.getAudience())) {
+            body.with(Authentication.AUDIENCE, oAuth2.getAudience());
+        }
+        // Adding optional resource parameter
+        if (!StringUtils.isEmpty(oAuth2.getResource())) {
+            body.with(Authentication.RESOURCE, oAuth2.getResource());
+        }
         // Optionally add scope, if applicable
         if (!CollectionUtils.isEmpty(oAuth2.getScope())) {
             body.with(Authentication.SCOPE, StringUtils.collectionToDelimitedString(oAuth2.getScope(), " "));
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/dtos/MultipartFormDataDTO.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/dtos/MultipartFormDataDTO.java
new file mode 100644
index 0000000000..f25baa3f62
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/dtos/MultipartFormDataDTO.java
@@ -0,0 +1,16 @@
+package com.external.dtos;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class MultipartFormDataDTO {
+    String filename;
+    String contentType;
+    Object part;
+}
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/BufferingFilter.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/BufferingFilter.java
new file mode 100644
index 0000000000..6a50fe6a7e
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/BufferingFilter.java
@@ -0,0 +1,50 @@
+package com.external.helpers;
+
+import org.reactivestreams.Publisher;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.http.client.reactive.ClientHttpRequest;
+import org.springframework.http.client.reactive.ClientHttpRequestDecorator;
+import org.springframework.lang.NonNull;
+import org.springframework.web.reactive.function.client.ClientRequest;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
+import org.springframework.web.reactive.function.client.ExchangeFunction;
+import reactor.core.publisher.Mono;
+
+/**
+ * This filter loads the request body in memory and calculates the content length of the body
+ * It then adds this content length as a header to the original request
+ */
+public class BufferingFilter implements ExchangeFilterFunction {
+    @Override
+    @NonNull
+    public Mono<ClientResponse> filter(@NonNull ClientRequest request, ExchangeFunction next) {
+        return next.exchange(
+                ClientRequest
+                        .from(request)
+                        .body((message, context) -> request
+                                .body()
+                                .insert(new BufferingRequestDecorator(message), context))
+                        .build());
+    }
+
+    private static class BufferingRequestDecorator extends ClientHttpRequestDecorator {
+
+        public BufferingRequestDecorator(ClientHttpRequest delegate) {
+            super(delegate);
+        }
+
+        @Override
+        @NonNull
+        public Mono<Void> writeWith(@NonNull Publisher<? extends DataBuffer> body) {
+            return DataBufferUtils
+                    .join(body)
+                    .flatMap(dataBuffer -> {
+                        int length = dataBuffer.readableByteCount();
+                        this.getDelegate().getHeaders().setContentLength(length);
+                        return super.writeWith(Mono.just(dataBuffer));
+                    });
+        }
+    }
+}
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/DataUtils.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/DataUtils.java
new file mode 100644
index 0000000000..2ef55a9895
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/DataUtils.java
@@ -0,0 +1,213 @@
+package com.external.helpers;
+
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.appsmith.external.models.Property;
+import com.external.dtos.MultipartFormDataDTO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonSyntaxException;
+import net.minidev.json.JSONArray;
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.MultipartBodyBuilder;
+import org.springframework.http.client.reactive.ClientHttpRequest;
+import org.springframework.web.reactive.function.BodyInserter;
+import org.springframework.web.reactive.function.BodyInserters;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.io.ByteArrayInputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class DataUtils {
+
+    private static DataUtils dataUtils;
+
+    public enum MultipartFormDataType {
+        TEXT,
+        FILE
+    }
+
+    private DataUtils() {
+    }
+
+    public static DataUtils getInstance() {
+        if (dataUtils == null) {
+            dataUtils = new DataUtils();
+        }
+        return dataUtils;
+    }
+
+    public BodyInserter<?, ?> buildBodyInserter(Object body, String contentType, Boolean encodeParamsToggle) {
+        if (body == null) {
+            return BodyInserters.fromValue(new byte[0]);
+        }
+        switch (contentType) {
+            case MediaType.APPLICATION_JSON_VALUE:
+                final Object bodyObject = parseJsonBody(body);
+                return BodyInserters.fromValue(bodyObject);
+            case MediaType.APPLICATION_FORM_URLENCODED_VALUE:
+                final String formData = parseFormData((List<Property>) body, encodeParamsToggle);
+                if ("".equals(formData)) {
+                    return BodyInserters.fromValue(new byte[0]);
+                }
+                return BodyInserters.fromValue(formData);
+            case MediaType.MULTIPART_FORM_DATA_VALUE:
+                return parseMultipartFileData((List<Property>) body);
+            default:
+                return BodyInserters.fromValue(body);
+        }
+    }
+
+    public Object parseJsonBody(Object body) {
+        try {
+            if (body instanceof String) {
+                // Setting the requestBody to an empty byte array here
+                // since the an empty string causes issues with a signed request.
+                // If the content of the SignableRequest is null, the query string parameters
+                // will be encoded and used as the contentSha256 segment of the canonical request string.
+                // This causes a SignatureMatch Error for signed urls like those generated by AWS S3.
+                // More detail here - https://github.com/aws/aws-sdk-java/issues/2205
+                if ("" == body) {
+                    return new byte[0];
+                }
+                Object objectFromJson = objectFromJson((String) body);
+                if (objectFromJson != null) {
+                    body = objectFromJson;
+                }
+            }
+        } catch (JsonSyntaxException | ParseException e) {
+            throw new AppsmithPluginException(
+                    AppsmithPluginError.PLUGIN_JSON_PARSE_ERROR,
+                    body,
+                    "Malformed JSON: " + e.getMessage()
+            );
+        }
+        return body;
+    }
+
+    public String parseFormData(List<Property> bodyFormData, Boolean encodeParamsToggle) {
+        if (bodyFormData == null || bodyFormData.isEmpty()) {
+            return "";
+        }
+
+        return bodyFormData
+                .stream()
+                .map(property -> {
+                    String key = property.getKey();
+                    String value = (String) property.getValue();
+
+                    if (encodeParamsToggle == true) {
+                        try {
+                            value = URLEncoder.encode(value, StandardCharsets.UTF_8.toString());
+                        } catch (UnsupportedEncodingException e) {
+                            throw new UnsupportedOperationException(e);
+                        }
+                    }
+
+                    return key + "=" + value;
+                })
+                .collect(Collectors.joining("&"));
+
+    }
+
+    public BodyInserter<?, ?> parseMultipartFileData(List<Property> bodyFormData) {
+        if (bodyFormData == null || bodyFormData.isEmpty()) {
+            return BodyInserters.fromValue(new byte[0]);
+        }
+
+        return (BodyInserter<?, ClientHttpRequest>) (outputMessage, context) ->
+                Mono.defer(() -> {
+                    MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder();
+
+                    for (Property property : bodyFormData) {
+                        final String key = property.getKey();
+
+                        // This condition is for the current scenario, while we wait for client changes to come in
+                        // before the migration can be introduced
+                        if (property.getType() == null) {
+                            bodyBuilder.part(key, property.getValue());
+                            continue;
+                        }
+
+                        final MultipartFormDataType multipartFormDataType =
+                                MultipartFormDataType.valueOf(property.getType().toUpperCase(Locale.ROOT));
+                        if (MultipartFormDataType.TEXT.equals(multipartFormDataType)) {
+                            bodyBuilder.part(key, property.getValue());
+                        } else if (MultipartFormDataType.FILE.equals(multipartFormDataType)) {
+                            ObjectMapper objectMapper = new ObjectMapper();
+                            MultipartFormDataDTO multipartFormDataDTO = null;
+                            try {
+                                multipartFormDataDTO = objectMapper.readValue(
+                                        String.valueOf(property.getValue()),
+                                        MultipartFormDataDTO.class);
+                            } catch (JsonProcessingException e) {
+                                e.printStackTrace();
+                            }
+                            final MultipartFormDataDTO finalMultipartFormDataDTO = multipartFormDataDTO;
+                            Flux<DataBuffer> data = DataBufferUtils.readInputStream(
+                                    () -> new ByteArrayInputStream(String
+                                            .valueOf(finalMultipartFormDataDTO.getPart())
+                                            .getBytes(StandardCharsets.UTF_8)),
+                                    outputMessage.bufferFactory(),
+                                    4096);
+
+                            bodyBuilder.asyncPart(key, data, DataBuffer.class)
+                                    .filename(multipartFormDataDTO.getFilename())
+                                    .contentType(MediaType.valueOf(multipartFormDataDTO.getContentType()));
+                        }
+                    }
+
+                    final BodyInserters.MultipartInserter multipartInserter =
+                            BodyInserters
+                                    .fromMultipartData(bodyBuilder.build());
+                    return multipartInserter
+                            .insert(outputMessage, context);
+                });
+    }
+
+    /**
+     * Given a JSON string, we infer the top-level type of the object it represents and then parse it into that
+     * type. However, only `Map` and `List` top-levels are supported. Note that the map or list may contain
+     * anything, like booleans or number or even more maps or lists. It's only that the top-level type should be a
+     * map / list.
+     *
+     * @param jsonString A string that confirms to JSON syntax. Shouldn't be null.
+     * @return An object of type `Map`, `List`, if applicable, or `null`.
+     */
+    private static Object objectFromJson(String jsonString) throws ParseException {
+        Class<?> type;
+        String trimmed = jsonString.trim();
+
+        if (trimmed.startsWith("{")) {
+            type = Map.class;
+        } else if (trimmed.startsWith("[")) {
+            type = List.class;
+        } else {
+            return null;
+        }
+
+        JSONParser jsonParser = new JSONParser(JSONParser.MODE_PERMISSIVE);
+        Object parsedJson = null;
+
+        if (type.equals(List.class)) {
+            parsedJson = (JSONArray) jsonParser.parse(jsonString);
+        } else {
+            parsedJson = (JSONObject) jsonParser.parse(jsonString);
+        }
+
+        return parsedJson;
+
+    }
+}
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/DatasourceValidator.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/DatasourceValidator.java
index 8ea8e5c4a4..66358804bc 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/DatasourceValidator.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/DatasourceValidator.java
@@ -6,9 +6,17 @@ import org.springframework.util.StringUtils;
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class DatasourceValidator {
 
+    private static final String URL_REGEX =
+            "^https?://" +
+                    "(%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@&=+$,A-Za-z0-9])+$";
+
+    private static final Pattern URL_PATTERN = Pattern.compile(URL_REGEX);
+
     public static Set<String> validateAuthentication(AuthenticationDTO authenticationDTO) {
 
         if (authenticationDTO instanceof OAuth2) {
@@ -44,8 +52,15 @@ public class DatasourceValidator {
 
         if (StringUtils.isEmpty(authenticationDTO.getAuthorizationUrl())) {
             invalids.add("Missing Authorization URL");
+        } else if (!isValidUrl(authenticationDTO.getAuthorizationUrl())) {
+            invalids.add("Invalid Authorization URL");
         }
 
         return invalids;
     }
+
+    private static boolean isValidUrl(String url) {
+        Matcher matcher = URL_PATTERN.matcher(url);
+        return matcher.matches();
+    }
 }
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
index 1239cbe1cb..e7784844bf 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
@@ -19,16 +19,13 @@ import com.appsmith.external.plugins.SmartSubstitutionInterface;
 import com.appsmith.external.services.SharedConfig;
 import com.external.connections.APIConnection;
 import com.external.connections.APIConnectionFactory;
+import com.external.helpers.BufferingFilter;
+import com.external.helpers.DataUtils;
 import com.external.helpers.DatasourceValidator;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.google.gson.JsonSyntaxException;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
 import lombok.extern.slf4j.Slf4j;
-import net.minidev.json.JSONArray;
-import net.minidev.json.JSONObject;
-import net.minidev.json.parser.JSONParser;
-import net.minidev.json.parser.ParseException;
 import org.apache.commons.lang.StringUtils;
 import org.bson.internal.Base64;
 import org.pf4j.Extension;
@@ -38,10 +35,11 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.InvalidMediaTypeException;
 import org.springframework.http.MediaType;
+import org.springframework.http.client.reactive.ClientHttpRequest;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedCaseInsensitiveMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.BodyInserter;
 import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -51,7 +49,6 @@ import reactor.core.publisher.Mono;
 
 import javax.crypto.SecretKey;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLDecoder;
@@ -89,6 +86,7 @@ public class RestApiPlugin extends BasePlugin {
         private final String SIGNATURE_HEADER_NAME = "X-APPSMITH-SIGNATURE";
 
         private final SharedConfig sharedConfig;
+        private final DataUtils dataUtils;
 
         // Setting max content length. This would've been coming from `spring.codec.max-in-memory-size` property if the
         // `WebClient` instance was loaded as an auto-wired bean.
@@ -96,6 +94,7 @@ public class RestApiPlugin extends BasePlugin {
 
         public RestApiPluginExecutor(SharedConfig sharedConfig) {
             this.sharedConfig = sharedConfig;
+            this.dataUtils = DataUtils.getInstance();
             this.EXCHANGE_STRATEGIES = ExchangeStrategies
                     .builder()
                     .codecs(configurer -> configurer.defaultCodecs().maxInMemorySize(sharedConfig.getCodecSize()))
@@ -125,25 +124,21 @@ public class RestApiPlugin extends BasePlugin {
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
 
             if (CollectionUtils.isEmpty(properties)) {
-                /**
-                 * TODO :
-                 * In case the smart json substitution configuration is missing, default to true once smart json
-                 * substitution is no longer in beta.
-                 */
-                smartJsonSubstitution = false;
+                // In case the smart json substitution configuration is missing, default to true
+                smartJsonSubstitution = true;
 
                 // Since properties is not empty, we are guaranteed to find the first property.
-            } else if (properties.get(SMART_JSON_SUBSTITUTION_INDEX) != null){
+            } else if (properties.get(SMART_JSON_SUBSTITUTION_INDEX) != null) {
                 Object ssubValue = properties.get(SMART_JSON_SUBSTITUTION_INDEX).getValue();
-                if (ssubValue instanceof  Boolean) {
+                if (ssubValue instanceof Boolean) {
                     smartJsonSubstitution = (Boolean) ssubValue;
                 } else if (ssubValue instanceof String) {
                     smartJsonSubstitution = Boolean.parseBoolean((String) ssubValue);
                 } else {
-                    smartJsonSubstitution = false;
+                    smartJsonSubstitution = true;
                 }
             } else {
-                smartJsonSubstitution = false;
+                smartJsonSubstitution = true;
             }
 
             // Smartly substitute in actionConfiguration.body and replace all the bindings with values.
@@ -176,12 +171,11 @@ public class RestApiPlugin extends BasePlugin {
             prepareConfigurationsForExecution(executeActionDTO, actionConfiguration, datasourceConfiguration);
 
             // If the action is paginated, update the configurations to update the correct URL.
-            if (actionConfiguration != null &&
-                    actionConfiguration.getPaginationType() != null &&
+            if (actionConfiguration.getPaginationType() != null &&
                     PaginationType.URL.equals(actionConfiguration.getPaginationType()) &&
                     executeActionDTO.getPaginationField() != null) {
-                datasourceConfiguration = updateDatasourceConfigurationForPagination(actionConfiguration, datasourceConfiguration, executeActionDTO.getPaginationField());
-                actionConfiguration = updateActionConfigurationForPagination(actionConfiguration, executeActionDTO.getPaginationField());
+                updateDatasourceConfigurationForPagination(actionConfiguration, datasourceConfiguration, executeActionDTO.getPaginationField());
+                updateActionConfigurationForPagination(actionConfiguration, executeActionDTO.getPaginationField());
             }
             // Filter out any empty headers
             if (actionConfiguration.getHeaders() != null && !actionConfiguration.getHeaders().isEmpty()) {
@@ -265,18 +259,18 @@ public class RestApiPlugin extends BasePlugin {
                 return Mono.just(errorResult);
             }
 
-            String requestBodyAsString = "";
+            // We initialize this object to an empty string because body can never be empty
+            // Based on the content-type, this Object may be of type MultiValueMap or String
+            Object requestBodyObj = "";
 
             // Add request body only for non GET calls.
             if (!HttpMethod.GET.equals(httpMethod)) {
                 // Adding request body
-                requestBodyAsString = (actionConfiguration.getBody() == null) ? "" : actionConfiguration.getBody();
+                requestBodyObj = (actionConfiguration.getBody() == null) ? "" : actionConfiguration.getBody();
 
                 if (MediaType.APPLICATION_FORM_URLENCODED_VALUE.equals(reqContentType)
                         || MediaType.MULTIPART_FORM_DATA_VALUE.equals(reqContentType)) {
-                    requestBodyAsString = convertPropertyListToReqBody(actionConfiguration.getBodyFormData(),
-                            reqContentType,
-                            encodeParamsToggle);
+                    requestBodyObj = actionConfiguration.getBodyFormData();
                 }
             }
 
@@ -306,10 +300,16 @@ public class RestApiPlugin extends BasePlugin {
                 webClientBuilder.filter(apiConnection);
             }
 
+            requestBodyObj = dataUtils.buildBodyInserter(requestBodyObj, reqContentType, encodeParamsToggle);
+
+            if (MediaType.MULTIPART_FORM_DATA_VALUE.equals(reqContentType)) {
+                webClientBuilder.filter(new BufferingFilter());
+            }
+
             WebClient client = webClientBuilder.exchangeStrategies(EXCHANGE_STRATEGIES).build();
 
             // Triggering the actual REST API call
-            return httpCall(client, httpMethod, uri, requestBodyAsString, 0, reqContentType)
+            return httpCall(client, httpMethod, uri, requestBodyObj, 0, reqContentType)
                     .flatMap(clientResponse -> clientResponse.toEntity(byte[].class))
                     .map(stringResponseEntity -> {
                         HttpHeaders headers = stringResponseEntity.getHeaders();
@@ -358,13 +358,9 @@ public class RestApiPlugin extends BasePlugin {
                                     String jsonBody = new String(body);
                                     result.setBody(objectMapper.readTree(jsonBody));
                                 } catch (IOException e) {
-                                    throw Exceptions.propagate(
-                                            new AppsmithPluginException(
-                                                    AppsmithPluginError.PLUGIN_JSON_PARSE_ERROR,
-                                                    new String(body),
-                                                    e.getMessage()
-                                            )
-                                    );
+                                    System.out.println("Unable to parse response JSON. Setting response body as string.");
+                                    String bodyString = new String(body);
+                                    result.setBody(bodyString.trim());
                                 }
                             } else if (MediaType.IMAGE_GIF.equals(contentType) ||
                                     MediaType.IMAGE_JPEG.equals(contentType) ||
@@ -380,7 +376,7 @@ public class RestApiPlugin extends BasePlugin {
 
                         return result;
                     })
-                    .onErrorResume(error  -> {
+                    .onErrorResume(error -> {
                         errorResult.setIsExecutionSuccess(false);
                         errorResult.setErrorInfo(error);
                         return Mono.just(errorResult);
@@ -415,34 +411,6 @@ public class RestApiPlugin extends BasePlugin {
             return null;
         }
 
-        public String convertPropertyListToReqBody(List<Property> bodyFormData,
-                                                   String reqContentType,
-                                                   Boolean encodeParamsToggle) {
-            if (bodyFormData == null || bodyFormData.isEmpty()) {
-                return "";
-            }
-
-            String reqBody = bodyFormData.stream()
-                    .map(property -> {
-                        String key = property.getKey();
-                        String value = (String) property.getValue();
-
-                        if (MediaType.APPLICATION_FORM_URLENCODED_VALUE.equals(reqContentType)
-                                && encodeParamsToggle == true) {
-                            try {
-                                value = URLEncoder.encode(value, StandardCharsets.UTF_8.toString());
-                            } catch (UnsupportedEncodingException e) {
-                                throw new UnsupportedOperationException(e);
-                            }
-                        }
-
-                        return key + "=" + value;
-                    })
-                    .collect(Collectors.joining("&"));
-
-            return reqBody;
-        }
-
         /**
          * If the headers list of properties contains a `Content-Type` header, verify if the value of that header is a
          * valid media type.
@@ -478,39 +446,13 @@ public class RestApiPlugin extends BasePlugin {
                 ));
             }
 
-            if (MediaType.APPLICATION_JSON_VALUE.equals(contentType)) {
-                try {
-                    if (requestBody instanceof String) {
-                        Object objectFromJson = objectFromJson((String) requestBody);
-                        if (objectFromJson != null) {
-                            requestBody = objectFromJson;
-                        }
-                    }
-                } catch (JsonSyntaxException | ParseException e) {
-                    return Mono.error(new AppsmithPluginException(
-                            AppsmithPluginError.PLUGIN_JSON_PARSE_ERROR,
-                            requestBody,
-                            "Malformed JSON: " + e.getMessage()
-                    ));
-                }
-            }
-
-            if (requestBody == "") {
-                // Setting the requestBody to an empty byte array here
-                // since the an empty string causes issues with a signed request.
-                // If the content of the SignableRequest is null, the query string parameters 
-                // will be encoded and used as the contentSha256 segment of the canonical request string.
-                // This causes a SignatureMatch Error for signed urls like those generated by AWS S3.
-                // More detail here - https://github.com/aws/aws-sdk-java/issues/2205
-                requestBody = new byte[0];
-            }
-
-            Object finalRequestBody = requestBody;
+            assert requestBody instanceof BodyInserter<?, ?>;
+            BodyInserter<?, ?> finalRequestBody = (BodyInserter<?, ?>) requestBody;
 
             return webClient
                     .method(httpMethod)
                     .uri(uri)
-                    .body(BodyInserters.fromObject(requestBody))
+                    .body((BodyInserter<?, ? super ClientHttpRequest>) finalRequestBody)
                     .exchange()
                     .doOnError(e -> Mono.error(new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, e)))
                     .flatMap(response -> {
@@ -536,40 +478,6 @@ public class RestApiPlugin extends BasePlugin {
                     });
         }
 
-        /**
-         * Given a JSON string, we infer the top-level type of the object it represents and then parse it into that
-         * type. However, only `Map` and `List` top-levels are supported. Note that the map or list may contain
-         * anything, like booleans or number or even more maps or lists. It's only that the top-level type should be a
-         * map / list.
-         *
-         * @param jsonString A string that confirms to JSON syntax. Shouldn't be null.
-         * @return An object of type `Map`, `List`, if applicable, or `null`.
-         */
-        private static Object objectFromJson(String jsonString) throws ParseException {
-            Class<?> type;
-            String trimmed = jsonString.trim();
-
-            if (trimmed.startsWith("{")) {
-                type = Map.class;
-            } else if (trimmed.startsWith("[")) {
-                type = List.class;
-            } else {
-                return null;
-            }
-
-            JSONParser jsonParser = new JSONParser(JSONParser.MODE_PERMISSIVE);
-            Object parsedJson = null;
-
-            if (type.equals(List.class)) {
-                parsedJson = (JSONArray) jsonParser.parse(jsonString);
-            } else {
-                parsedJson = (JSONObject) jsonParser.parse(jsonString);
-            }
-
-            return parsedJson;
-
-        }
-
         @Override
         public Mono<APIConnection> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
             return APIConnectionFactory.createConnection(datasourceConfiguration.getAuthentication());
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/restApiPlugin/src/main/resources/form.json
index 9945c475ca..e86d7cf716 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/main/resources/form.json
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/resources/form.json
@@ -65,9 +65,21 @@
               "label": "None",
               "value": "dbAuth"
             },
+            {
+              "label": "Basic",
+              "value": "basic"
+            },
             {
               "label": "OAuth2 (Client credentials)",
               "value": "oAuth2"
+            },
+            {
+              "label": "API Key",
+              "value": "apiKey"
+            },
+            {
+              "label": "Bearer Token",
+              "value": "bearerToken"
             }
           ]
         },
@@ -155,6 +167,28 @@
               "value": false
             }
           ]
+        },
+        {
+          "label": "Audience(s)",
+          "configProperty": "datasourceConfiguration.authentication.audience",
+          "controlType": "INPUT_TEXT",
+          "isRequired": false,
+          "hidden": {
+            "path": "datasourceConfiguration.authentication.authenticationType",
+            "comparison": "NOT_EQUALS",
+            "value": "oAuth2"
+          }
+        },
+        {
+          "label": "Resource(s)",
+          "configProperty": "datasourceConfiguration.authentication.resource",
+          "controlType": "INPUT_TEXT",
+          "isRequired": false,
+          "hidden": {
+            "path": "datasourceConfiguration.authentication.authenticationType",
+            "comparison": "NOT_EQUALS",
+            "value": "oAuth2"
+          }
         }
       ]
     }
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/ApiKeyAuthenticationTest.java b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/ApiKeyAuthenticationTest.java
new file mode 100644
index 0000000000..19cbf34628
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/ApiKeyAuthenticationTest.java
@@ -0,0 +1,27 @@
+package com.external.connections;
+
+import com.appsmith.external.models.ApiKeyAuth;
+import org.junit.Test;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
+public class ApiKeyAuthenticationTest {
+
+    @Test
+    public void testCreateMethodWithQueryParamsLabel() {
+        String label = "label";
+        String value = "value";
+        ApiKeyAuth.Type type = ApiKeyAuth.Type.QUERY_PARAMS;
+        ApiKeyAuth apiKeyAuthDTO = new ApiKeyAuth(type, label, value);
+        Mono<ApiKeyAuthentication> connectionMono = ApiKeyAuthentication.create(apiKeyAuthDTO);
+        StepVerifier.create(connectionMono)
+                .assertNext(connection -> {
+                    assertThat(connection).isNotNull();
+                    assertEquals(value, connection.getValue());
+                })
+                .verifyComplete();
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/BasicAuthenticationTest.java b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/BasicAuthenticationTest.java
new file mode 100644
index 0000000000..2ed3f751c2
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/BasicAuthenticationTest.java
@@ -0,0 +1,26 @@
+package com.external.connections;
+
+import com.appsmith.external.models.BasicAuth;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Base64;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class BasicAuthenticationTest {
+
+    @Test
+    public void testCreate_validCredentials_ReturnsWithEncodedValue() {
+        BasicAuth basicAuth = new BasicAuth();
+        basicAuth.setUsername("test");
+        basicAuth.setPassword("password");
+        BasicAuthentication connection = BasicAuthentication.create(basicAuth).block(Duration.ofMillis(100));
+        assertThat(connection).isNotNull();
+        Assert.assertEquals(
+                Base64.getEncoder().encodeToString("test:password".getBytes(StandardCharsets.UTF_8)),
+                connection.getEncodedAuthorizationHeader());
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/BearerTokenAuthenticationTest.java b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/BearerTokenAuthenticationTest.java
new file mode 100644
index 0000000000..3c8ff7a651
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/BearerTokenAuthenticationTest.java
@@ -0,0 +1,25 @@
+package com.external.connections;
+
+import com.appsmith.external.models.BearerTokenAuth;
+import org.junit.Test;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
+public class BearerTokenAuthenticationTest {
+
+    @Test
+    public void testCreateMethod() {
+        String bearerToken = "key";
+        BearerTokenAuth bearerTokenAuthDTO = new BearerTokenAuth(bearerToken);
+        Mono<BearerTokenAuthentication> connectionMono = BearerTokenAuthentication.create(bearerTokenAuthDTO);
+        StepVerifier.create(connectionMono)
+                .assertNext(connection -> {
+                    assertThat(connection).isNotNull();
+                    assertEquals(bearerToken, connection.getBearerToken());
+                })
+                .verifyComplete();
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/OAuth2ClientCredentialsTest.java b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/OAuth2ClientCredentialsTest.java
index 3e087f0c9d..e21a423311 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/OAuth2ClientCredentialsTest.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/connections/OAuth2ClientCredentialsTest.java
@@ -36,7 +36,6 @@ public class OAuth2ClientCredentialsTest {
         AuthenticationResponse authenticationResponse = new AuthenticationResponse();
         oAuth2.setIsTokenHeader(true);
         authenticationResponse.setToken("SomeToken");
-        oAuth2.setIsEncrypted(false);
         authenticationResponse.setExpiresAt(Instant.now().plusSeconds(1200));
         oAuth2.setAuthenticationResponse(authenticationResponse);
         OAuth2ClientCredentials connection = OAuth2ClientCredentials.create(oAuth2).block(Duration.ofMillis(100));
@@ -51,7 +50,6 @@ public class OAuth2ClientCredentialsTest {
         AuthenticationResponse authenticationResponse = new AuthenticationResponse();
         oAuth2.setIsTokenHeader(true);
         authenticationResponse.setToken("SomeToken");
-        oAuth2.setIsEncrypted(false);
         authenticationResponse.setExpiresAt(Instant.now().plusSeconds(1200));
         oAuth2.setAuthenticationResponse(authenticationResponse);
         OAuth2ClientCredentials connection = OAuth2ClientCredentials.create(oAuth2).block(Duration.ofMillis(100));
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/helpers/DataUtilsTest.java b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/helpers/DataUtilsTest.java
new file mode 100644
index 0000000000..3142c7cac2
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/helpers/DataUtilsTest.java
@@ -0,0 +1,191 @@
+package com.external.helpers;
+
+import com.appsmith.external.models.Property;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.core.codec.ByteBufferEncoder;
+import org.springframework.core.codec.CharSequenceEncoder;
+import org.springframework.core.codec.DataBufferEncoder;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.codec.EncoderHttpMessageWriter;
+import org.springframework.http.codec.FormHttpMessageWriter;
+import org.springframework.http.codec.HttpMessageWriter;
+import org.springframework.http.codec.ResourceHttpMessageWriter;
+import org.springframework.http.codec.ServerSentEventHttpMessageWriter;
+import org.springframework.http.codec.json.Jackson2JsonEncoder;
+import org.springframework.http.codec.multipart.MultipartHttpMessageWriter;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.mock.http.client.reactive.MockClientHttpRequest;
+import org.springframework.web.reactive.function.BodyInserter;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+public class DataUtilsTest {
+
+    private DataUtils dataUtils;
+
+    private BodyInserter.Context context;
+
+    private Map<String, Object> hints;
+
+
+    @Before
+    public void createContext() {
+        final List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
+        messageWriters.add(new EncoderHttpMessageWriter<>(new ByteBufferEncoder()));
+        messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.textPlainOnly()));
+        messageWriters.add(new ResourceHttpMessageWriter());
+        Jackson2JsonEncoder jsonEncoder = new Jackson2JsonEncoder();
+        messageWriters.add(new EncoderHttpMessageWriter<>(jsonEncoder));
+        messageWriters.add(new EncoderHttpMessageWriter<>(new DataBufferEncoder()));
+        messageWriters.add(new ServerSentEventHttpMessageWriter(jsonEncoder));
+        messageWriters.add(new FormHttpMessageWriter());
+        messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes()));
+        messageWriters.add(new MultipartHttpMessageWriter(messageWriters));
+
+        this.context = new BodyInserter.Context() {
+            @Override
+            public List<HttpMessageWriter<?>> messageWriters() {
+                return messageWriters;
+            }
+
+            @Override
+            public Optional<ServerHttpRequest> serverRequest() {
+                return Optional.empty();
+            }
+
+            @Override
+            public Map<String, Object> hints() {
+                return hints;
+            }
+        };
+        this.hints = new HashMap<>();
+    }
+
+    @Before
+    public void setUp() {
+        dataUtils = DataUtils.getInstance();
+    }
+
+    @Test
+    public void testParseMultipartFileData_withEmptyList_returnsEmptyByteArray() {
+        final BodyInserter<Object, MockClientHttpRequest> bodyInserter =
+                (BodyInserter<Object, MockClientHttpRequest>) dataUtils.parseMultipartFileData(List.of());
+
+        MockClientHttpRequest request = new MockClientHttpRequest(HttpMethod.GET, URI.create("https://example.com"));
+        Mono<Void> result = bodyInserter.insert(request, this.context);
+        StepVerifier.create(result).expectComplete().verify();
+        StepVerifier.create(request.getBodyAsString())
+                .expectNext("\"\"")
+                .expectComplete()
+                .verify();
+    }
+
+    @Test
+    public void testParseMultipartFileData_withValidTextList_returnsExpectedBody() {
+        List<Property> properties = new ArrayList<>();
+        final Property p1 = new Property("nullType", "textData");
+        properties.add(p1);
+        final Property p2 = new Property("textType", "textData");
+        p2.setType("text");
+        properties.add(p2);
+
+        final BodyInserter<Object, MockClientHttpRequest> bodyInserter =
+                (BodyInserter<Object, MockClientHttpRequest>) dataUtils.parseMultipartFileData(properties);
+        MockClientHttpRequest request = new MockClientHttpRequest(HttpMethod.GET, URI.create("https://example.com"));
+
+        Mono<Void> result = bodyInserter.insert(request, this.context);
+        StepVerifier.create(result).expectComplete().verify();
+        StepVerifier.create(DataBufferUtils.join(request.getBody()))
+                .consumeNextWith(dataBuffer -> {
+                    byte[] resultBytes = new byte[dataBuffer.readableByteCount()];
+                    dataBuffer.read(resultBytes);
+                    DataBufferUtils.release(dataBuffer);
+                    String content = new String(resultBytes, StandardCharsets.UTF_8);
+                    Assert.assertTrue(content.contains(
+                            "Content-Disposition: form-data; name=\"nullType\"\r\n" +
+                                    "Content-Type: text/plain;charset=UTF-8\r\n" +
+                                    "Content-Length: 8\r\n" +
+                                    "\r\n" +
+                                    "textData"));
+                    Assert.assertTrue(content.contains(
+                            "Content-Disposition: form-data; name=\"textType\"\r\n" +
+                                    "Content-Type: text/plain;charset=UTF-8\r\n" +
+                                    "Content-Length: 8\r\n" +
+                                    "\r\n" +
+                                    "textData"));
+                })
+                .expectComplete()
+                .verify();
+    }
+
+    @Test
+    public void testParseMultipartFileData_withValidFileList_returnsExpectedBody() {
+        List<Property> properties = new ArrayList<>();
+        final Property p1 = new Property("fileType", "{\"filename\": \"test.json\", \"contentType\": \"application/json\", \"part\" : {}}");
+        p1.setType("file");
+        properties.add(p1);
+
+        final BodyInserter<Object, MockClientHttpRequest> bodyInserter =
+                (BodyInserter<Object, MockClientHttpRequest>) dataUtils.parseMultipartFileData(properties);
+        MockClientHttpRequest request = new MockClientHttpRequest(HttpMethod.POST, URI.create("https://example.com"));
+
+        Mono<Void> result = bodyInserter.insert(request, this.context);
+        StepVerifier.create(result).expectComplete().verify();
+        StepVerifier.create(DataBufferUtils.join(request.getBody()))
+                .consumeNextWith(dataBuffer -> {
+                    byte[] resultBytes = new byte[dataBuffer.readableByteCount()];
+                    dataBuffer.read(resultBytes);
+                    DataBufferUtils.release(dataBuffer);
+                    String content = new String(resultBytes, StandardCharsets.UTF_8);
+                    Assert.assertTrue(content.contains(
+                            "Content-Disposition: form-data; name=\"fileType\"; filename=\"test.json\"\r\n" +
+                                    "Content-Type: application/json\r\n" +
+                                    "\r\n" +
+                                    "{}"));
+                })
+                .expectComplete()
+                .verify();
+    }
+
+    @Test
+    public void testParseFormData_withEncodingParamsToggleTrue_returnsEncodedString() throws UnsupportedEncodingException {
+        final String encoded_value = dataUtils.parseFormData(List.of(new Property("key", "valüe")),
+                true);
+        String expected_value = null;
+        try {
+            expected_value = "key=" + URLEncoder.encode("valüe", StandardCharsets.UTF_8.toString());
+        } catch (UnsupportedEncodingException e) {
+            throw e;
+        }
+        assertEquals(expected_value, encoded_value);
+    }
+
+    @Test
+    public void testParseFormData_withOutEncodingParamsToggleTrue_returnsEncodedString() throws UnsupportedEncodingException {
+        final String encoded_value = dataUtils.parseFormData(List.of(new Property("key", "valüe")),
+                false);
+        String expected_value = null;
+        try {
+            expected_value = "key=" + URLEncoder.encode("valüe", StandardCharsets.UTF_8.toString());
+        } catch (UnsupportedEncodingException e) {
+            throw e;
+        }
+        assertNotEquals(expected_value, encoded_value);
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java
index 4aee6bda20..502a32ef03 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java
@@ -11,6 +11,7 @@ import com.appsmith.external.models.Property;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.jsonwebtoken.JwtParser;
 import io.jsonwebtoken.Jwts;
@@ -26,8 +27,6 @@ import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import javax.crypto.SecretKey;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +34,6 @@ import java.util.Map;
 import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
@@ -69,34 +67,6 @@ public class RestApiPluginTest {
                 .verifyComplete();
     }
 
-    @Test
-    public void testEncodingFunctionWithEncodeParamsToggleTrue() throws UnsupportedEncodingException {
-        String encoded_value = pluginExecutor.convertPropertyListToReqBody(List.of(new Property("key", "valüe")),
-                "application/x-www-form-urlencoded",
-                true);
-        String expected_value = null;
-        try {
-            expected_value = "key=" + URLEncoder.encode("valüe", StandardCharsets.UTF_8.toString());
-        } catch (UnsupportedEncodingException e) {
-            throw e;
-        }
-        assertEquals(expected_value, encoded_value);
-    }
-
-    @Test
-    public void testEncodingFunctionWithEncodeParamsToggleFalse() throws UnsupportedEncodingException {
-        String encoded_value = pluginExecutor.convertPropertyListToReqBody(List.of(new Property("key", "valüe")),
-                "application/x-www-form-urlencoded",
-                false);
-        String expected_value = null;
-        try {
-            expected_value = "key=" + URLEncoder.encode("valüe", StandardCharsets.UTF_8.toString());
-        } catch (UnsupportedEncodingException e) {
-            throw e;
-        }
-        assertNotEquals(expected_value, encoded_value);
-    }
-
     @Test
     public void testValidFormApiExecution() {
         DatasourceConfiguration dsConfig = new DatasourceConfiguration();
@@ -363,7 +333,6 @@ public class RestApiPluginTest {
                 .assertNext(result -> {
                     assertTrue(result.getIsExecutionSuccess());
                     assertNotNull(result.getBody());
-                    System.out.println(result.getBody());
                     String resultBody = "{\"password\":\"12/01/2018\",\"name\":\"this is a string! Yay :D\",\"newField\":null,\"tableRow\":{\"orderAmount\":4.99,\"id\":2381224,\"userName\":\"Michael Lawson\",\"email\":\"michael.lawson@reqres.in\",\"productName\":\"Chicken Sandwich\"},\"email\":true,\"table\":[{\"orderAmount\":4.99,\"id\":2381224,\"userName\":\"Michael Lawson\",\"email\":\"michael.lawson@reqres.in\",\"productName\":\"Chicken Sandwich\"},{\"orderAmount\":9.99,\"id\":2736212,\"userName\":\"Lindsay Ferguson\",\"email\":\"lindsay.ferguson@reqres.in\",\"productName\":\"Tuna Salad\"},{\"orderAmount\":19.99,\"id\":6788734,\"userName\":\"Tobias Funke\",\"email\":\"tobias.funke@reqres.in\",\"productName\":\"Beef steak\"}],\"username\":0}";
                     JSONParser jsonParser = new JSONParser(JSONParser.MODE_PERMISSIVE);
                     ObjectMapper objectMapper = new ObjectMapper();
@@ -378,7 +347,8 @@ public class RestApiPluginTest {
 
                     // Assert the debug request parameters are getting set.
                     ActionExecutionRequest request = result.getRequest();
-                    List<Map.Entry<String, String>> parameters = (List<Map.Entry<String, String>>) request.getProperties().get("smart-substitution-parameters");
+                    List<Map.Entry<String, String>> parameters =
+                            (List<Map.Entry<String, String>>) request.getProperties().get("smart-substitution-parameters");
                     assertEquals(parameters.size(), 7);
 
                     Map.Entry<String, String> parameterEntry = parameters.get(0);
@@ -403,4 +373,59 @@ public class RestApiPluginTest {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    public void testMultipartFormData() {
+        DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+        dsConfig.setUrl("http://httpbin.org/post");
+
+        ActionConfiguration actionConfig = new ActionConfiguration();
+        actionConfig.setHeaders(List.of(new Property("content-type", "multipart/form-data")));
+
+        actionConfig.setHttpMethod(HttpMethod.POST);
+        String requestBody = "{\"key\":\"skdjfh&kjsd\"}";
+        List<Property> formData = List.of(new Property("key", "skdjfh&kjsd"));
+        actionConfig.setBodyFormData(formData);
+
+        Mono<ActionExecutionResult> resultMono = pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);
+        StepVerifier.create(resultMono)
+                .assertNext(result -> {
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    JsonNode data = ((ObjectNode) result.getBody()).get("form");
+                    assertEquals(requestBody, data.toString());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testParsingBodyWithInvalidJSONHeader() {
+        DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+        dsConfig.setUrl("https://mock-api.appsmith.com/echo/raw");
+
+        ActionConfiguration actionConfig = new ActionConfiguration();
+        actionConfig.setHeaders(List.of(new Property("content-type", "application/json")));
+        actionConfig.setHttpMethod(HttpMethod.POST);
+
+        String requestBody = "{\n" +
+                "    \"headers\": {\n" +
+                "        \"Content-Type\": \"application/json\",\n" +
+                "        \"X-RANDOM-HEADER\": \"random-value\"\n" +
+                "    },\n" +
+                "    \"body\": \"invalid json text\"\n" +
+                "}";
+        actionConfig.setBody(requestBody);
+
+        Mono<ActionExecutionResult> resultMono = pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);
+        StepVerifier.create(resultMono)
+                .assertNext(result -> {
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    assertEquals("invalid json text", result.getBody());
+                    ArrayNode data = (ArrayNode) result.getHeaders().get("Content-Type");
+                    assertEquals("application/json; charset=utf-8", data.get(0).asText());
+                })
+                .verifyComplete();
+    }
+
 }
diff --git a/app/server/appsmith-plugins/snowflakePlugin/plugin.properties b/app/server/appsmith-plugins/snowflakePlugin/plugin.properties
new file mode 100644
index 0000000000..8de5730bcc
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/plugin.properties
@@ -0,0 +1,5 @@
+plugin.id=snowflake-plugin
+plugin.class=com.external.plugins.SnowflakePlugin
+plugin.version=1.0-SNAPSHOT
+plugin.provider=tech@appsmith.com
+plugin.dependencies=
diff --git a/app/server/appsmith-plugins/snowflakePlugin/pom.xml b/app/server/appsmith-plugins/snowflakePlugin/pom.xml
new file mode 100644
index 0000000000..c8f8046c31
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/pom.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.external.plugins</groupId>
+    <artifactId>snowflakePlugin</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <name>snowflakePlugin</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>11</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <plugin.id>snowflake-plugin</plugin.id>
+        <plugin.class>com.external.plugins.SnowflakePlugin</plugin.class>
+        <plugin.version>1.0-SNAPSHOT</plugin.version>
+        <plugin.provider>tech@appsmith.com</plugin.provider>
+        <plugin.dependencies/>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.pf4j</groupId>
+            <artifactId>pf4j-spring</artifactId>
+            <version>0.7.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.appsmith</groupId>
+            <artifactId>interfaces</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>5.2.3.RELEASE</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.2.3.RELEASE</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+            <version>5.2.3.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.projectreactor</groupId>
+                    <artifactId>reactor-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>net.snowflake</groupId>
+            <artifactId>snowflake-jdbc</artifactId>
+            <version>3.13.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.8</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.10.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <version>2.10.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.10.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>0.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>0.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId> <!-- or jjwt-gson if Gson is preferred -->
+            <version>0.11.2</version>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <version>3.3.5.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.1.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.13.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.powermock/powermock-module-junit4 -->
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>2.0.9</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito2 -->
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>2.0.9</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+            <version>2.2.4.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <configuration>
+                    <minimizeJar>false</minimizeJar>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <manifestEntries>
+                                <Plugin-Id>${plugin.id}</Plugin-Id>
+                                <Plugin-Class>${plugin.class}</Plugin-Class>
+                                <Plugin-Version>${plugin.version}</Plugin-Version>
+                                <Plugin-Provider>${plugin.provider}</Plugin-Provider>
+                            </manifestEntries>
+                        </transformer>
+                    </transformers>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>io.jsonwebtoken</groupId>
+                                    <artifactId>jjwt-api</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>io.jsonwebtoken</groupId>
+                                    <artifactId>jjwt-impl</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>io.jsonwebtoken</groupId>
+                                    <artifactId>jjwt-jackson</artifactId>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/java/com/external/plugins/SnowflakePlugin.java b/app/server/appsmith-plugins/snowflakePlugin/src/main/java/com/external/plugins/SnowflakePlugin.java
new file mode 100644
index 0000000000..40dce8873f
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/java/com/external/plugins/SnowflakePlugin.java
@@ -0,0 +1,264 @@
+package com.external.plugins;
+
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.appsmith.external.exceptions.pluginExceptions.StaleConnectionException;
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.ActionExecutionRequest;
+import com.appsmith.external.models.ActionExecutionResult;
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.DatasourceTestResult;
+import com.appsmith.external.plugins.BasePlugin;
+import com.appsmith.external.plugins.PluginExecutor;
+import com.external.utils.SqlUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.pf4j.Extension;
+import org.pf4j.PluginWrapper;
+import org.springframework.util.StringUtils;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
+import reactor.core.scheduler.Schedulers;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+public class SnowflakePlugin extends BasePlugin {
+
+    public SnowflakePlugin(PluginWrapper wrapper) {
+        super(wrapper);
+    }
+
+    @Slf4j
+    @Extension
+    public static class SnowflakePluginExecutor implements PluginExecutor<Connection> {
+
+        private final Scheduler scheduler = Schedulers.elastic();
+
+        @Override
+        public Mono<ActionExecutionResult> execute(Connection connection, DatasourceConfiguration datasourceConfiguration, ActionConfiguration actionConfiguration) {
+
+            String query = actionConfiguration.getBody();
+
+            if (query == null) {
+                return Mono.error(new AppsmithPluginException(
+                        AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
+                        "Missing required parameter: Query."));
+            }
+
+            return Mono
+                    .fromCallable(() -> {
+                        ResultSet resultSet = null;
+                        List<Map<String, Object>> rowsList = new ArrayList<>(50);
+                        try {
+                            // We do not use keep alive threads for our connections since these might become expensive
+                            // Instead for every execution, we check for connection validity,
+                            // and reset the connection if required
+                            if (!connection.isValid(30)) {
+                                throw new StaleConnectionException();
+                            }
+
+                            Statement statement = connection.createStatement();
+                            resultSet = statement.executeQuery(query);
+                            ResultSetMetaData metaData = resultSet.getMetaData();
+                            int colCount = metaData.getColumnCount();
+
+                            while (resultSet.next()) {
+                                // Use `LinkedHashMap` here so that the column ordering is preserved in the response.
+                                Map<String, Object> row = new LinkedHashMap<>(colCount);
+
+                                for (int i = 1; i <= colCount; i++) {
+                                    Object value = resultSet.getObject(i);
+                                    row.put(metaData.getColumnName(i), value);
+                                }
+                                rowsList.add(row);
+                            }
+                        } catch (SQLException e) {
+                            e.printStackTrace();
+                            throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, e.getMessage());
+                        } finally {
+                            if (resultSet != null) {
+                                try {
+                                    resultSet.close();
+                                } catch (SQLException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                        return rowsList;
+                    })
+                    .map(rowsList -> {
+                        ActionExecutionResult result = new ActionExecutionResult();
+                        result.setBody(objectMapper.valueToTree(rowsList));
+                        result.setIsExecutionSuccess(true);
+                        ActionExecutionRequest request = new ActionExecutionRequest();
+                        request.setQuery(query);
+                        result.setRequest(request);
+                        return result;
+                    })
+                    .subscribeOn(scheduler);
+        }
+
+        @Override
+        public Mono<Connection> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+            try {
+                Class.forName("net.snowflake.client.jdbc.SnowflakeDriver");
+            } catch (ClassNotFoundException ex) {
+                System.err.println("Driver not found");
+                return Mono.error(new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, ex.getMessage()));
+            }
+            DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
+            Properties properties = new Properties();
+            properties.setProperty("user", authentication.getUsername());
+            properties.setProperty("password", authentication.getPassword());
+            properties.setProperty("warehouse", String.valueOf(datasourceConfiguration.getProperties().get(0).getValue()));
+            properties.setProperty("db", String.valueOf(datasourceConfiguration.getProperties().get(1).getValue()));
+
+            return Mono
+                    .fromCallable(() -> {
+                        Connection conn;
+                        try {
+                            conn = DriverManager.getConnection("jdbc:snowflake://" + datasourceConfiguration.getUrl() + ".snowflakecomputing.com", properties);
+                        } catch (SQLException e) {
+                            e.printStackTrace();
+                            throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR, e.getMessage());
+                        }
+                        if (conn == null) {
+                            throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, "Unable to create connection to Snowflake URL");
+                        }
+                        return conn;
+                    })
+                    .subscribeOn(scheduler);
+        }
+
+        @Override
+        public void datasourceDestroy(Connection connection) {
+            if (connection != null) {
+                try {
+                    connection.close();
+                } catch (SQLException throwable) {
+                    throwable.printStackTrace();
+                }
+            }
+        }
+
+        @Override
+        public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            Set<String> invalids = new HashSet<>();
+
+            if (StringUtils.isEmpty(datasourceConfiguration.getUrl())) {
+                invalids.add("Missing Snowflake URL.");
+            }
+
+            if (datasourceConfiguration.getProperties() != null
+                    && (datasourceConfiguration.getProperties().size() < 1
+                    || datasourceConfiguration.getProperties().get(0) == null
+                    || datasourceConfiguration.getProperties().get(0).getValue() == null
+                    || StringUtils.isEmpty(String.valueOf(datasourceConfiguration.getProperties().get(0).getValue())))) {
+                invalids.add("Missing warehouse name.");
+            }
+
+            if (datasourceConfiguration.getProperties() != null
+                    && (datasourceConfiguration.getProperties().size() < 2
+                    || datasourceConfiguration.getProperties().get(1) == null
+                    || datasourceConfiguration.getProperties().get(1).getValue() == null
+                    || StringUtils.isEmpty(String.valueOf(datasourceConfiguration.getProperties().get(1).getValue())))) {
+                invalids.add("Missing database name.");
+            }
+
+            if (datasourceConfiguration.getAuthentication() == null) {
+                invalids.add("Missing authentication details.");
+            } else {
+                DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
+                if (StringUtils.isEmpty(authentication.getUsername())) {
+                    invalids.add("Missing username for authentication.");
+                }
+
+                if (StringUtils.isEmpty(authentication.getPassword())) {
+                    invalids.add("Missing password for authentication.");
+                }
+            }
+
+            return invalids;
+        }
+
+        @Override
+        public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
+            return datasourceCreate(datasourceConfiguration)
+                    .flatMap(connection -> {
+                        if (connection != null) {
+                            try {
+                                connection.close();
+                            } catch (SQLException throwable) {
+                                throwable.printStackTrace();
+                                return Mono.error(throwable);
+                            }
+                        }
+
+                        return Mono.just(new DatasourceTestResult());
+                    })
+                    .onErrorResume(error -> Mono.just(new DatasourceTestResult(error.getMessage())));
+        }
+
+        @Override
+        public Mono<DatasourceStructure> getStructure(Connection connection, DatasourceConfiguration datasourceConfiguration) {
+            final DatasourceStructure structure = new DatasourceStructure();
+            final Map<String, DatasourceStructure.Table> tablesByName = new LinkedHashMap<>();
+            final Map<String, DatasourceStructure.Key> keyRegistry = new HashMap<>();
+
+            return Mono
+                    .fromSupplier(() -> {
+                        try {
+                            if (connection.isValid(30)) {
+                                Statement statement = connection.createStatement();
+                                final String columnsQuery = SqlUtils.COLUMNS_QUERY + "'"
+                                        + datasourceConfiguration.getProperties().get(2).getValue() + "'";
+                                ResultSet resultSet = statement.executeQuery(columnsQuery);
+
+                                while (resultSet.next()) {
+                                    SqlUtils.getTableInfo(resultSet, tablesByName);
+                                }
+
+                                resultSet = statement.executeQuery(SqlUtils.PRIMARY_KEYS_QUERY);
+                                while (resultSet.next()) {
+                                    SqlUtils.getPrimaryKeyInfo(resultSet, tablesByName, keyRegistry);
+                                }
+
+                                resultSet = statement.executeQuery(SqlUtils.FOREIGN_KEYS_QUERY);
+                                while (resultSet.next()) {
+                                    SqlUtils.getForeignKeyInfo(resultSet, tablesByName, keyRegistry);
+                                }
+
+                                /* Get templates for each table and put those in. */
+                                SqlUtils.getTemplates(tablesByName);
+                                structure.setTables(new ArrayList<>(tablesByName.values()));
+                                for (DatasourceStructure.Table table : structure.getTables()) {
+                                    table.getKeys().sort(Comparator.naturalOrder());
+                                }
+                            } else {
+                                throw new StaleConnectionException();
+                            }
+                        } catch (SQLException throwable) {
+                            throwable.printStackTrace();
+                            throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, throwable.getMessage());
+                        }
+                        return structure;
+                    })
+                    .subscribeOn(scheduler);
+        }
+    }
+}
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/java/com/external/utils/SqlUtils.java b/app/server/appsmith-plugins/snowflakePlugin/src/main/java/com/external/utils/SqlUtils.java
new file mode 100644
index 0000000000..10d6ed10b7
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/java/com/external/utils/SqlUtils.java
@@ -0,0 +1,238 @@
+package com.external.utils;
+
+import com.appsmith.external.models.DatasourceStructure;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class SqlUtils {
+
+    /**
+     * Example output for COLUMNS_QUERY:
+     * +--------------+------------+-----------+-------------+-------------+-------------+----------------+
+     * | TABLE_SCHEMA | TABLE_NAME | COLUMN_ID | COLUMN_NAME | COLUMN_TYPE | IS_NULLABLE | COLUMN_DEFAULT |
+     * +--------------+------------+-----------+-------------+-------------+-------------+----------------+
+     * | test_schema  | test       |         1 | id          | int         |           0 |                |
+     * | test_schema  | test       |         2 | firstname   | varchar     |           1 | Foo            |
+     * | test_schema  | test       |         3 | middlename  | varchar     |           1 |                |
+     * | test_schema  | test       |         4 | lastname    | varchar     |           1 |                |
+     * +--------------+------------+-----------+-------------+-------------+-------------+----------------+
+     */
+    public static final String COLUMNS_QUERY =
+            "SELECT " +
+                    "cols.table_schema as table_schema, " +
+                    "cols.table_name as table_name, " +
+                    "cols.ordinal_position as column_id, " +
+                    "cols.column_name as column_name, " +
+                    "cols.data_type as column_type, " +
+                    "cols.is_nullable = 'YES' as is_nullable, " +
+                    "cols.column_default as column_default " +
+                    "FROM " +
+                    "information_schema.columns cols " +
+                    "WHERE " +
+                    "cols.table_schema = ";
+
+    /**
+     * Example output for PRIMARY_KEYS_QUERY:
+     * +------------+---------------+-------------+------------+-------------+--------------+--------------------+---------+
+     * | created_on | database_name | schema_name | table_name | column_name | key_sequence | constraint_name    | comment |
+     * +------------+---------------+-------------+------------+-------------+--------------+--------------------+---------+
+     * | test       | test_db       | test_schema | test       | id          |            1 | SYS_CONSTRAINT_hex |         |
+     * +------------+---------------+-------------+------------+-------------+--------------+--------------------+---------+
+     */
+    public static final String PRIMARY_KEYS_QUERY = "SHOW PRIMARY KEYS";
+
+    /**
+     * Example output for FOREIGN_KEYS_QUERY:
+     * +------------+------------------+----------------+---------------+----------------+------------------+----------------+---------------+----------------+--------------+----------------+-------------+--------------------+--------------------+-----------------+------------+
+     * | created_on | pk_database_name | pk_schema_name | pk_table_name | pk_column_name | fk_database_name | fk_schema_name | fk_table_name | pk_column_name | key_sequence | update_rule    | delete_rule | fk_name            | pk_name            | deferrability   | comment    |
+     * +------------+------------------+----------------+---------------+----------------+------------------+----------------+---------------+----------------+--------------+----------------+-------------+--------------------+--------------------+-----------------+------------+
+     * | test       | test_db          | test_schema    | test          | id             | test_db          | test_schema    | test2         | f_id           |            1 | NO ACTION      | NO ACTION   | SYS_CONSTRAINT_hex | SYS_CONSTRAINT_hex |                 |            |
+     * +------------+------------------+----------------+---------------+----------------+------------------+----------------+---------------+----------------+--------------+----------------+-------------+--------------------+--------------------+-----------------+------------+
+     */
+    public static final String FOREIGN_KEYS_QUERY = "SHOW IMPORTED KEYS";
+
+    public static String getDefaultValueByDataType(String datatype) {
+        if (datatype == null) {
+            return "null";
+        }
+        datatype = datatype.toUpperCase();
+        switch (datatype) {
+            case "NUMBER":
+            case "DECIMAL":
+            case "NUMERIC":
+            case "INTEGER":
+            case "INT":
+            case "BIGINT":
+            case "SMALLINT":
+                return "1";
+            case "FLOAT":
+            case "FLOAT4":
+            case "FLOAT8":
+            case "DOUBLE":
+            case "DOUBLE PRECISION":
+            case "REAL":
+                return "1.0";
+            case "BINARY":
+            case "VARBINARY":
+                return "to_binary('AB')";
+            case "BOOLEAN":
+                return "true";
+            case "DATE":
+                return "2021-01-01";
+            case "TIME":
+                return "00:00:01";
+            case "DATETIME":
+            case "TIMESTAMP":
+            case "TIMESTAMP_LTZ":
+            case "TIMESTAMP_NTZ":
+            case "TIMESTAMP_TZ":
+                return "2021-01-01 00:00:01";
+            case "ARRAY":
+                return "array_construct(1, 2, 3)";
+            case "VARIANT":
+                return
+                        "parse_json(' { \"key1\": \"value1\", \"key2\": \"value2\" } ')";
+            case "OBJECT":
+                return
+                        "parse_json(' { \"outer_key1\": { \"inner_key1A\": \"1a\", \"inner_key1B\": NULL }, '\n" +
+                                "              ||\n" +
+                                "               '   \"outer_key2\": { \"inner_key2\": 2 } '\n" +
+                                "              ||\n" +
+                                "               ' } ')";
+            case "GEOGRAPHY":
+                return "'POINT(-122.35 37.55)'";
+            case "VARCHAR":
+            case "CHAR":
+            case "CHARACTER":
+            case "STRING":
+            case "TEXT":
+            default:
+                return "''";
+        }
+    }
+
+    /**
+     * 1. Generate template for all tables in the database.
+     */
+    public static void getTemplates(Map<String, DatasourceStructure.Table> tablesByName) {
+        for (DatasourceStructure.Table table : tablesByName.values()) {
+            final List<DatasourceStructure.Column> columnsWithoutDefault = table.getColumns()
+                    .stream()
+                    .filter(column -> column.getDefaultValue() == null)
+                    .collect(Collectors.toList());
+
+            final List<String> columnNames = new ArrayList<>();
+            final List<String> columnValues = new ArrayList<>();
+            final StringBuilder setFragments = new StringBuilder();
+
+            for (DatasourceStructure.Column column : columnsWithoutDefault) {
+                final String name = column.getName();
+                final String type = column.getType();
+                String value = getDefaultValueByDataType(type);
+
+                columnNames.add(name);
+                columnValues.add(value);
+                setFragments.append("\n    ").append(name).append(" = ").append(value);
+            }
+
+            final String tableName = table.getSchema() + "." + table.getName();
+            table.getTemplates().addAll(List.of(
+                    new DatasourceStructure.Template("SELECT", "SELECT * FROM " + tableName + " LIMIT 10;", null),
+                    new DatasourceStructure.Template("INSERT", "INSERT INTO " + tableName
+                            + " (" + String.join(", ", columnNames) + ")\n"
+                            + "  VALUES (" + String.join(", ", columnValues) + ");", null),
+                    new DatasourceStructure.Template("UPDATE", "UPDATE " + tableName + " SET"
+                            + setFragments.toString() + "\n"
+                            + "  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!", null),
+                    new DatasourceStructure.Template("DELETE", "DELETE FROM " + tableName
+                            + "\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!", null)
+            ));
+        }
+    }
+
+    public static void getForeignKeyInfo(ResultSet row, Map<String, DatasourceStructure.Table> tablesByName, Map<String, DatasourceStructure.Key> keyRegistry) throws SQLException {
+        final String constraintName = row.getString("fk_name");
+        final String selfSchema = row.getString("pk_schema_name");
+        final String fkTableName = row.getString("fk_table_name");
+        final String tableName = row.getString("pk_table_name");
+
+        if (!tablesByName.containsKey(tableName)) {
+            /* do nothing */
+            return;
+        }
+
+        final DatasourceStructure.Table table = tablesByName.get(tableName);
+        final String keyFullName = tableName + "." + constraintName;
+
+        final String foreignSchema = row.getString("fk_schema_name");
+        final String prefix = (foreignSchema.equalsIgnoreCase(selfSchema) ? "" : foreignSchema + ".")
+                + fkTableName + ".";
+
+        if (!keyRegistry.containsKey(keyFullName)) {
+            final DatasourceStructure.ForeignKey key = new DatasourceStructure.ForeignKey(
+                    constraintName,
+                    new ArrayList<>(),
+                    new ArrayList<>()
+            );
+            keyRegistry.put(keyFullName, key);
+            table.getKeys().add(key);
+        }
+
+        ((DatasourceStructure.ForeignKey) keyRegistry.get(keyFullName)).getFromColumns()
+                .add(row.getString("pk_column_name"));
+        ((DatasourceStructure.ForeignKey) keyRegistry.get(keyFullName)).getToColumns()
+                .add(prefix + row.getString("fk_column_name"));
+    }
+
+    public static void getPrimaryKeyInfo(ResultSet row, Map<String, DatasourceStructure.Table> tablesByName, Map<String, DatasourceStructure.Key> keyRegistry) throws SQLException {
+        final String constraintName = row.getString("constraint_name");
+        final String tableName = row.getString("table_name");
+
+        if (!tablesByName.containsKey(tableName)) {
+            /* do nothing */
+            return;
+        }
+
+        final DatasourceStructure.Table table = tablesByName.get(tableName);
+        final String keyFullName = tableName + "." + constraintName;
+
+        if (!keyRegistry.containsKey(keyFullName)) {
+            final DatasourceStructure.PrimaryKey key = new DatasourceStructure.PrimaryKey(
+                    constraintName,
+                    new ArrayList<>()
+            );
+            keyRegistry.put(keyFullName, key);
+            table.getKeys().add(key);
+        }
+        ((DatasourceStructure.PrimaryKey) keyRegistry.get(keyFullName)).getColumnNames()
+                .add(row.getString("column_name"));
+    }
+
+    public static void getTableInfo(ResultSet row, Map<String, DatasourceStructure.Table> tablesByName) throws SQLException {
+        final String tableSchema = row.getString("TABLE_SCHEMA");
+        final String tableName = row.getString("TABLE_NAME");
+
+        if (!tablesByName.containsKey(tableName)) {
+            tablesByName.put(tableName, new DatasourceStructure.Table(
+                    DatasourceStructure.TableType.TABLE,
+                    tableSchema,
+                    tableName,
+                    new ArrayList<>(),
+                    new ArrayList<>(),
+                    new ArrayList<>()
+            ));
+        }
+
+        final DatasourceStructure.Table table = tablesByName.get(tableName);
+        table.getColumns().add(new DatasourceStructure.Column(
+                row.getString("COLUMN_NAME"),
+                row.getString("COLUMN_TYPE"),
+                row.getString("COLUMN_DEFAULT")
+        ));
+    }
+}
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/editor.json
new file mode 100644
index 0000000000..28fc44800b
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/editor.json
@@ -0,0 +1,16 @@
+{
+  "editor": [
+    {
+      "sectionName": "",
+      "id": 1,
+      "children": [
+        {
+          "label": "",
+          "internalLabel": "Query",
+          "configProperty": "actionConfiguration.body",
+          "controlType": "QUERY_DYNAMIC_TEXT"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/form.json b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/form.json
new file mode 100644
index 0000000000..a4f196750e
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/form.json
@@ -0,0 +1,69 @@
+{
+  "form": [
+    {
+      "sectionName": "Connection",
+      "id": 1,
+      "children": [
+        {
+          "sectionName": null,
+          "children": [
+            {
+              "label": "Account name",
+              "configProperty": "datasourceConfiguration.url",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "isRequired": true,
+              "placeholderText": "xy12345.ap-south-1.aws"
+            },
+            {
+              "label": "Warehouse",
+              "configProperty": "datasourceConfiguration.properties[0].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "isRequired": true,
+              "placeholderText": "COMPUTE_WH"
+            },
+            {
+              "label": "Database",
+              "configProperty": "datasourceConfiguration.properties[1].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "isRequired": true,
+              "placeholderText": "SNOWFLAKE_SAMPLE_DATA"
+            },
+            {
+              "label": "Default Schema",
+              "configProperty": "datasourceConfiguration.properties[2].value",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "initialValue": "PUBLIC"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "sectionName": "Authentication",
+      "id": 2,
+      "children": [
+        {
+          "sectionName": null,
+          "children": [
+            {
+              "label": "Username",
+              "configProperty": "datasourceConfiguration.authentication.username",
+              "controlType": "INPUT_TEXT",
+              "placeholderText": "Username",
+              "isRequired": true
+            },
+            {
+              "label": "Password",
+              "configProperty": "datasourceConfiguration.authentication.password",
+              "dataType": "PASSWORD",
+              "controlType": "INPUT_TEXT",
+              "placeholderText": "Password",
+              "isRequired": true,
+              "encrypted": true
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
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
new file mode 100644
index 0000000000..4388bc1b9f
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql
@@ -0,0 +1,8 @@
+INSERT INTO users
+  (name, gender, email)
+VALUES
+  (
+    {{ nameInput.text }},
+    {{ genderDropdown.selectedOptionValue }},
+    {{ nameInput.text }}
+  );
\ No newline at end of file
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
new file mode 100644
index 0000000000..e7014662d5
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/DELETE.sql
@@ -0,0 +1 @@
+DELETE FROM users WHERE id = -1;
\ No newline at end of file
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
new file mode 100644
index 0000000000..dd55e9cb3e
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/SELECT.sql
@@ -0,0 +1 @@
+SELECT * FROM users where role = 'Admin' ORDER BY id LIMIT 10;
\ No newline at end of file
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
new file mode 100644
index 0000000000..facf9fc3f9
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql
@@ -0,0 +1,3 @@
+UPDATE users
+  SET status = 'APPROVED'
+  WHERE id = {{ usersTable.selectedRow.id }};
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/meta.json b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/meta.json
new file mode 100644
index 0000000000..b05a592845
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/meta.json
@@ -0,0 +1,16 @@
+{
+  "templates": [
+    {
+      "file": "CREATE.sql"
+    },
+    {
+      "file": "SELECT.sql"
+    },
+    {
+      "file": "UPDATE.sql"
+    },
+    {
+      "file": "DELETE.sql"
+    }
+  ]
+}
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/test/java/com/external/plugins/SnowflakePluginTest.java b/app/server/appsmith-plugins/snowflakePlugin/src/test/java/com/external/plugins/SnowflakePluginTest.java
new file mode 100644
index 0000000000..ba164a4749
--- /dev/null
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/test/java/com/external/plugins/SnowflakePluginTest.java
@@ -0,0 +1,35 @@
+package com.external.plugins;
+
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.Property;
+import lombok.extern.log4j.Log4j;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertTrue;
+
+@Log4j
+public class SnowflakePluginTest {
+
+    SnowflakePlugin.SnowflakePluginExecutor pluginExecutor = new SnowflakePlugin.SnowflakePluginExecutor();
+
+    @Test
+    public void testValidateDatasource_InvalidCredentials_returnsInvalids() {
+        DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+        DBAuth auth = new DBAuth();
+        auth.setUsername(null);
+        auth.setPassword(null);
+        datasourceConfiguration.setAuthentication(auth);
+        datasourceConfiguration.setProperties(List.of(new Property(), new Property()));
+        Set<String> output = pluginExecutor.validateDatasource(datasourceConfiguration);
+        assertTrue(output.contains("Missing username for authentication."));
+        assertTrue(output.contains("Missing password for authentication."));
+        assertTrue(output.contains("Missing Snowflake URL."));
+        assertTrue(output.contains("Missing warehouse name."));
+        assertTrue(output.contains("Missing database name."));
+    }
+
+}
diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml
index 601e2f8057..3fc57d3e1e 100644
--- a/app/server/appsmith-server/pom.xml
+++ b/app/server/appsmith-server/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
-            <version>2.2.1.RELEASE</version>
+            <version>2.4.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.0.18.Final</version>
+            <version>6.2.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
@@ -121,17 +121,17 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
         </dependency>
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
-            <version>1.6</version>
+            <version>1.7</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-            <version>2.3.4.RELEASE</version>
+            <version>2.4.4</version>
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
@@ -207,14 +207,14 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.10</version>
+            <version>4.5.13</version>
         </dependency>
 
         <!-- MongoDB Migrations: https://github.com/cloudyrock/mongock -->
         <dependency>
             <groupId>com.github.cloudyrock.mongock</groupId>
             <artifactId>mongock-spring</artifactId>
-            <version>3.2.5</version>
+            <version>3.3.2</version>
         </dependency>
 
         <dependency>
@@ -223,12 +223,6 @@
             <version>1.8</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.corundumstudio.socketio</groupId>
-            <artifactId>netty-socketio</artifactId>
-            <version>1.7.12</version>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java
index 2425036fa6..aa0b7ef0f7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java
@@ -44,6 +44,7 @@ public enum AclPermission {
     ORGANIZATION_MANAGE_APPLICATIONS("manage:orgApplications", Organization.class),
     ORGANIZATION_READ_APPLICATIONS("read:orgApplications", Organization.class),
     ORGANIZATION_PUBLISH_APPLICATIONS("publish:orgApplications", Organization.class),
+    ORGANIZATION_EXPORT_APPLICATIONS("export:orgApplications", Organization.class),
 
     // Invitation related permissions
     ORGANIZATION_INVITE_USERS("inviteUsers:organization", Organization.class),
@@ -51,6 +52,7 @@ public enum AclPermission {
     MANAGE_APPLICATIONS("manage:applications", Application.class),
     READ_APPLICATIONS("read:applications", Application.class),
     PUBLISH_APPLICATIONS("publish:applications", Application.class),
+    EXPORT_APPLICATIONS("export:applications", Application.class),
 
     // Making an application public permission at Organization level
     MAKE_PUBLIC_APPLICATIONS("makePublic:applications", Application.class),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java
index d1a80ec2fc..7138666b93 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java
@@ -8,6 +8,7 @@ import java.util.Set;
 
 import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.ORGANIZATION_EXPORT_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.ORGANIZATION_INVITE_USERS;
 import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.ORGANIZATION_PUBLISH_APPLICATIONS;
@@ -19,10 +20,12 @@ import static com.appsmith.server.acl.AclPermission.READ_ORGANIZATIONS;
 public enum AppsmithRole {
     APPLICATION_ADMIN("Application Administrator", "", Set.of(MANAGE_APPLICATIONS)),
     APPLICATION_VIEWER("Application Viewer", "",  Set.of(READ_APPLICATIONS)),
-    ORGANIZATION_ADMIN("Administrator", "Can modify all organization settings including editing applications and inviting other users to the organization",
-            Set.of(MANAGE_ORGANIZATIONS, ORGANIZATION_INVITE_USERS)),
-    ORGANIZATION_DEVELOPER("Developer", "Can edit and view applications along with inviting other users to the organization",  Set.of(READ_ORGANIZATIONS,
-            ORGANIZATION_MANAGE_APPLICATIONS, ORGANIZATION_READ_APPLICATIONS, ORGANIZATION_PUBLISH_APPLICATIONS, ORGANIZATION_INVITE_USERS)),
+    ORGANIZATION_ADMIN("Administrator", "Can modify all organization settings including editing applications, " +
+        "inviting other users to the organization and exporting applications from the organization",
+        Set.of(MANAGE_ORGANIZATIONS, ORGANIZATION_INVITE_USERS, ORGANIZATION_EXPORT_APPLICATIONS)),
+    ORGANIZATION_DEVELOPER("Developer", "Can edit and view applications along with inviting other users to the organization",
+        Set.of(READ_ORGANIZATIONS, ORGANIZATION_MANAGE_APPLICATIONS, ORGANIZATION_READ_APPLICATIONS,
+            ORGANIZATION_PUBLISH_APPLICATIONS, ORGANIZATION_INVITE_USERS)),
     ORGANIZATION_VIEWER(
             "App Viewer",
             "Can view applications and invite other users to view applications",
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/PolicyGenerator.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/PolicyGenerator.java
index 21ed8a34a8..cd5652f61e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/PolicyGenerator.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/PolicyGenerator.java
@@ -23,15 +23,15 @@ import static com.appsmith.server.acl.AclPermission.COMMENT_ON_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.COMMENT_ON_THREAD;
 import static com.appsmith.server.acl.AclPermission.EXECUTE_ACTIONS;
 import static com.appsmith.server.acl.AclPermission.EXECUTE_DATASOURCES;
+import static com.appsmith.server.acl.AclPermission.EXPORT_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.MAKE_PUBLIC_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS;
 import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.MANAGE_COMMENT;
 import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
 import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS;
 import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
-import static com.appsmith.server.acl.AclPermission.MANAGE_THREAD;
 import static com.appsmith.server.acl.AclPermission.MANAGE_USERS;
+import static com.appsmith.server.acl.AclPermission.ORGANIZATION_EXPORT_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.ORGANIZATION_PUBLISH_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.ORGANIZATION_READ_APPLICATIONS;
@@ -117,6 +117,7 @@ public class PolicyGenerator {
         hierarchyGraph.addEdge(ORGANIZATION_READ_APPLICATIONS, READ_APPLICATIONS);
         hierarchyGraph.addEdge(ORGANIZATION_PUBLISH_APPLICATIONS, PUBLISH_APPLICATIONS);
         hierarchyGraph.addEdge(MANAGE_ORGANIZATIONS, MAKE_PUBLIC_APPLICATIONS);
+        hierarchyGraph.addEdge(ORGANIZATION_EXPORT_APPLICATIONS, EXPORT_APPLICATIONS);
 
         // If the user is being given MANAGE_APPLICATION permission, they must also be given READ_APPLICATION perm
         lateralGraph.addEdge(MANAGE_APPLICATIONS, READ_APPLICATIONS);
@@ -143,11 +144,9 @@ public class PolicyGenerator {
 
     private void createCommentPolicyGraph() {
         hierarchyGraph.addEdge(COMMENT_ON_APPLICATIONS, COMMENT_ON_THREAD);
-        hierarchyGraph.addEdge(COMMENT_ON_APPLICATIONS, MANAGE_THREAD);
 
         lateralGraph.addEdge(COMMENT_ON_THREAD, READ_THREAD);
 
-        hierarchyGraph.addEdge(COMMENT_ON_THREAD, MANAGE_COMMENT);
         hierarchyGraph.addEdge(COMMENT_ON_THREAD, READ_COMMENT);
     }
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/AuthenticationSuccessHandler.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/AuthenticationSuccessHandler.java
index 6d1226b32f..d3885cef4f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/AuthenticationSuccessHandler.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/AuthenticationSuccessHandler.java
@@ -2,6 +2,7 @@ package com.appsmith.server.authentication.handlers;
 
 import com.appsmith.server.constants.AnalyticsEvents;
 import com.appsmith.server.constants.Security;
+import com.appsmith.server.domains.User;
 import com.appsmith.server.helpers.RedirectHelper;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.SessionUserService;
@@ -21,8 +22,15 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
+import static com.appsmith.server.helpers.RedirectHelper.SIGNUP_SUCCESS_URL;
+
 @Slf4j
 @Component
 @RequiredArgsConstructor
@@ -45,24 +53,45 @@ public class AuthenticationSuccessHandler implements ServerAuthenticationSuccess
      * @return Publishes empty, that completes after handler tasks are finished.
      */
     @Override
-    public Mono<Void> onAuthenticationSuccess(WebFilterExchange webFilterExchange,
-                                              Authentication authentication) {
+    public Mono<Void> onAuthenticationSuccess(
+            WebFilterExchange webFilterExchange,
+            Authentication authentication
+    ) {
+        return onAuthenticationSuccess(webFilterExchange, authentication, false);
+    }
+
+    public Mono<Void> onAuthenticationSuccess(
+            WebFilterExchange webFilterExchange,
+            Authentication authentication,
+            boolean isFromSignup
+    ) {
         log.debug("Login succeeded for user: {}", authentication.getPrincipal());
 
-        Mono<Void> redirectionMono = authentication instanceof OAuth2AuthenticationToken
-                ? handleOAuth2Redirect(webFilterExchange)
-                : handleRedirect(webFilterExchange);
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            // In case of OAuth2 based authentication, there is no way to identify if this was a user signup (new user
+            // creation) or if this was a login (existing user). What we do here to identify this, is an approximation.
+            // If and when we find a better way to do identify this, let's please move away from this approximation.
+            // If the user object was created within the last 5 seconds, we treat it as a new user.
+            isFromSignup = ((User) authentication.getPrincipal()).getCreatedAt().isAfter(Instant.now().minusSeconds(5));
+        }
 
+        Mono<Void> redirectionMono = authentication instanceof OAuth2AuthenticationToken
+                ? handleOAuth2Redirect(webFilterExchange, isFromSignup)
+                : handleRedirect(webFilterExchange, isFromSignup);
+
+        final boolean isFromSignupFinal = isFromSignup;
         return sessionUserService.getCurrentUser()
-                .flatMap(user -> userDataService.ensureViewedCurrentVersionReleaseNotes(user).thenReturn(user))
-                // TODO: Need a better way to identify if this is the user's first-login.
-                .filter(user -> user.getExamplesOrganizationId() == null)
                 .flatMap(user -> {
-                    final boolean isFromInvite = user.getInviteToken() != null;
-                    return Mono.whenDelayError(
-                            analyticsService.sendObjectEvent(AnalyticsEvents.FIRST_LOGIN, user, Map.of("isFromInvite", isFromInvite)),
-                            examplesOrganizationCloner.cloneExamplesOrganization()
-                    );
+                    List<Mono<?>> monos = new ArrayList<>();
+                    monos.add(userDataService.ensureViewedCurrentVersionReleaseNotes(user));
+
+                    if (isFromSignupFinal) {
+                        final boolean isFromInvite = user.getInviteToken() != null;
+                        monos.add(analyticsService.sendObjectEvent(AnalyticsEvents.FIRST_LOGIN, user, Map.of("isFromInvite", isFromInvite)));
+                        monos.add(examplesOrganizationCloner.cloneExamplesOrganization());
+                    }
+
+                    return Mono.whenDelayError(monos);
                 })
                 .then(redirectionMono);
     }
@@ -82,33 +111,48 @@ public class AuthenticationSuccessHandler implements ServerAuthenticationSuccess
             // Disabling this because although the reference in the Javadoc is to a private method, it is still useful.
            "JavadocReference"
     )
-    private Mono<Void> handleOAuth2Redirect(WebFilterExchange webFilterExchange) {
+    private Mono<Void> handleOAuth2Redirect(WebFilterExchange webFilterExchange, boolean isFromSignup) {
         ServerWebExchange exchange = webFilterExchange.getExchange();
         String state = exchange.getRequest().getQueryParams().getFirst(Security.QUERY_PARAMETER_STATE);
-        String originHeader = RedirectHelper.DEFAULT_REDIRECT_URL;
+        String redirectUrl = RedirectHelper.DEFAULT_REDIRECT_URL;
+        String prefix = Security.STATE_PARAMETER_ORIGIN + "=";
         if (state != null && !state.isEmpty()) {
             String[] stateArray = state.split(",");
-            for (int i = 0; i < stateArray.length; i++) {
-                String stateVar = stateArray[i];
-                if (stateVar != null && stateVar.startsWith(Security.STATE_PARAMETER_ORIGIN) && stateVar.contains("=")) {
+            for (String stateVar : stateArray) {
+                if (stateVar != null && stateVar.startsWith(prefix)) {
                     // This is the origin of the request that we want to redirect to
-                    originHeader = stateVar.split("=")[1];
+                    redirectUrl = stateVar.split("=", 2)[1];
                 }
             }
         }
 
-        URI defaultRedirectLocation = URI.create(originHeader);
-        return this.redirectStrategy.sendRedirect(exchange, defaultRedirectLocation);
+        if (isFromSignup) {
+            redirectUrl = buildSignupSuccessUrl(redirectUrl);
+        }
+
+        return redirectStrategy.sendRedirect(exchange, URI.create(redirectUrl));
     }
 
-    private Mono<Void> handleRedirect(WebFilterExchange webFilterExchange) {
+    private Mono<Void> handleRedirect(WebFilterExchange webFilterExchange, boolean isFromSignup) {
         ServerWebExchange exchange = webFilterExchange.getExchange();
 
         // On authentication success, we send a redirect to the client's home page. This ensures that the session
         // is set in the cookie on the browser.
         return Mono.just(exchange.getRequest())
                 .flatMap(redirectHelper::getRedirectUrl)
+                .map(url -> {
+                    if (isFromSignup) {
+                        // This redirectUrl will be used by the client to redirect after showing a welcome page.
+                        url = buildSignupSuccessUrl(url);
+                    }
+                    return url;
+                })
                 .map(URI::create)
                 .flatMap(redirectUri -> redirectStrategy.sendRedirect(exchange, redirectUri));
     }
+
+    private String buildSignupSuccessUrl(String redirectUrl) {
+        return SIGNUP_SUCCESS_URL + "?redirectUrl=" + URLEncoder.encode(redirectUrl, StandardCharsets.UTF_8);
+    }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MongoConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MongoConfig.java
index 16d9af3e2d..be6ff0b7a2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MongoConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MongoConfig.java
@@ -79,9 +79,9 @@ public class MongoConfig {
         return converter;
     }
 
-//    @Bean
-//    public EncryptionMongoEventListener encryptionMongoEventListener(EncryptionService encryptionService) {
-//        return new EncryptionMongoEventListener(encryptionService);
-//    }
+    @Bean
+    public EncryptionMongoEventListener encryptionMongoEventListener(EncryptionService encryptionService) {
+        return new EncryptionMongoEventListener(encryptionService);
+    }
 
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/AnalyticsEvents.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/AnalyticsEvents.java
index fdc8c2bc43..618149d21c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/AnalyticsEvents.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/AnalyticsEvents.java
@@ -10,6 +10,7 @@ public enum AnalyticsEvents {
     EXECUTE_ACTION("execute_ACTION_TRIGGERED"),
     UPDATE_LAYOUT,
     PUBLISH_APPLICATION("publish_APPLICATION"),
+    FORK
     ;
 
     private final String eventName;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
index ec7d918c25..33e5f5e4d2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
@@ -6,6 +6,7 @@ public class FieldName {
     public static final String DELETED = "deleted";
     public static final String CREATED_AT = "createdAt";
     public static final String DELETED_AT = "deletedAt";
+    public static final String UPDATED_AT = "updatedAt";
     public static final String CURL_CODE = "curlCode";
     public static String ORGANIZATION = "organization";
     public static String ID = "id";
@@ -57,6 +58,7 @@ public class FieldName {
     public static String ANONYMOUS_USER = "anonymousUser";
     public static String USERNAMES = "usernames";
     public static String ACTION = "action";
+    public static String ACTIONS = "actions";
     public static String ASSET = "asset";
     public static String APPLICATION = "application";
     public static String COMMENT = "comment";
@@ -64,9 +66,13 @@ public class FieldName {
     public static final String TOKEN = "token";
     public static String WIDGET_TYPE = "type";
     public static String TABLE_WIDGET = "TABLE_WIDGET";
+    public static String CONTAINER_WIDGET = "CONTAINER_WIDGET";
+    public static String CANVAS_WIDGET = "CANVAS_WIDGET";
+    public static String FORM_WIDGET = "FORM_WIDGET";
     public static String PRIMARY_COLUMNS = "primaryColumns";
     public static String MONGO_ESCAPE_ID = "appsmith_mongo_escape_id";
     public static String MONGO_ESCAPE_CLASS = "appsmith_mongo_escape_class";
     public static String MONGO_UNESCAPED_ID = "_id";
     public static String MONGO_UNESCAPED_CLASS = "_class";
+    public static String DATASOURCE_STRUCTURE = "datasource structure";
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java
index 7d4d23540d..87d8446484 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java
@@ -29,4 +29,5 @@ public interface Url {
     String MARKETPLACE_ITEM_URL = BASE_URL + VERSION + "/items";
     String ASSET_URL = BASE_URL + VERSION + "/assets";
     String COMMENT_URL = BASE_URL + VERSION + "/comments";
+    String NOTIFICATION_URL = BASE_URL + VERSION + "/notifications";
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java
index b036eed859..4e3d1269be 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java
@@ -2,6 +2,7 @@ package com.appsmith.server.controllers;
 
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.ApplicationJson;
 import com.appsmith.server.dtos.ApplicationAccessDTO;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.dtos.UserHomepageDTO;
@@ -11,9 +12,15 @@ import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.solutions.ApplicationFetcher;
 import com.appsmith.server.solutions.ApplicationForkingService;
+import com.appsmith.server.solutions.ImportExportApplicationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ContentDisposition;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.codec.multipart.Part;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -22,12 +29,14 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 import javax.validation.Valid;
+import java.nio.charset.StandardCharsets;
 
 @RestController
 @RequestMapping(Url.APPLICATION_URL)
@@ -37,17 +46,20 @@ public class ApplicationController extends BaseController<ApplicationService, Ap
     private final ApplicationPageService applicationPageService;
     private final ApplicationFetcher applicationFetcher;
     private final ApplicationForkingService applicationForkingService;
+    private final ImportExportApplicationService importExportApplicationService;
 
     @Autowired
     public ApplicationController(
             ApplicationService service,
             ApplicationPageService applicationPageService,
             ApplicationFetcher applicationFetcher,
-            ApplicationForkingService applicationForkingService) {
+            ApplicationForkingService applicationForkingService,
+            ImportExportApplicationService importExportApplicationService) {
         super(service);
         this.applicationPageService = applicationPageService;
         this.applicationFetcher = applicationFetcher;
         this.applicationForkingService = applicationForkingService;
+        this.importExportApplicationService = importExportApplicationService;
     }
 
     @PostMapping
@@ -66,7 +78,13 @@ public class ApplicationController extends BaseController<ApplicationService, Ap
     @PostMapping("/publish/{applicationId}")
     public Mono<ResponseDTO<Boolean>> publish(@PathVariable String applicationId) {
         return applicationPageService.publish(applicationId)
-                .map(published -> new ResponseDTO<>(HttpStatus.OK.value(), published, null));
+                .flatMap(application ->
+                        // This event should parallel a similar event sent from the client, so we want it to be sent by the
+                        // controller and not the service method.
+                        applicationPageService.sendApplicationPublishedEvent(application)
+                                // This will only be called when the publishing was successful, so we can always return `true` here.
+                                .thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), true, null))
+                );
     }
 
     @PutMapping("/{applicationId}/page/{pageId}/makeDefault")
@@ -75,6 +93,16 @@ public class ApplicationController extends BaseController<ApplicationService, Ap
                 .map(updatedApplication -> new ResponseDTO<>(HttpStatus.OK.value(), updatedApplication, null));
     }
 
+    @PutMapping("/{applicationId}/page/{pageId}/reorder")
+    public Mono<ResponseDTO<Application>> reorderPage(
+            @PathVariable String applicationId,
+            @PathVariable String pageId,
+            @RequestParam Integer order
+    ) {
+        return applicationPageService.reorderPage(applicationId, pageId, order)
+                .map(updatedApplication -> new ResponseDTO<>(HttpStatus.OK.value(), updatedApplication, null));
+    }
+
     @DeleteMapping("/{id}")
     public Mono<ResponseDTO<Application>> delete(@PathVariable String id) {
         log.debug("Going to delete application with id: {}", id);
@@ -117,4 +145,32 @@ public class ApplicationController extends BaseController<ApplicationService, Ap
                 .map(application -> new ResponseDTO<>(HttpStatus.OK.value(), application, null));
     }
 
+    @GetMapping("/export/{id}")
+    public Mono<ResponseEntity<ApplicationJson>> getApplicationFile(@PathVariable String id) {
+        log.debug("Going to export application with id: {}", id);
+
+        return importExportApplicationService.exportApplicationById(id)
+                .map(fetchedResource -> {
+                    String applicationName = fetchedResource.getExportedApplication().getName();
+                    HttpHeaders responseHeaders = new HttpHeaders();
+                    ContentDisposition contentDisposition = ContentDisposition
+                        .builder("attachment")
+                        .filename(applicationName + ".json", StandardCharsets.UTF_8)
+                        .build();
+                    responseHeaders.setContentDisposition(contentDisposition);
+                    responseHeaders.setContentType(MediaType.APPLICATION_JSON);
+
+                    return new ResponseEntity(fetchedResource, responseHeaders, HttpStatus.OK);
+                });
+    }
+
+    @PostMapping(value = "/import/{orgId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public Mono<ResponseDTO<Application>> importApplicationFromFile(
+            @RequestPart("file") Mono<Part> fileMono, @PathVariable String orgId) {
+        log.debug("Going to import application in organization with id: {}", orgId);
+        return fileMono
+                .flatMap(file -> importExportApplicationService.extractFileAndSaveApplication(orgId, file))
+                .map(fetchedResource -> new ResponseDTO<>(HttpStatus.OK.value(), fetchedResource, null));
+    }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/CommentController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/CommentController.java
index 591bb634da..a0a4b4ca98 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/CommentController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/CommentController.java
@@ -10,10 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
@@ -41,16 +42,16 @@ public class CommentController extends BaseController<CommentService, Comment, S
                                              @RequestParam String threadId,
                                              ServerWebExchange exchange) {
         log.debug("Going to create resource {}", resource.getClass().getName());
-        return service.create(threadId, resource)
+        return service.create(threadId, resource, exchange.getRequest().getHeaders().getOrigin())
                 .map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
     }
 
     @PostMapping("/threads")
     @ResponseStatus(HttpStatus.CREATED)
     public Mono<ResponseDTO<CommentThread>> createThread(@Valid @RequestBody CommentThread resource,
-                                                         ServerWebExchange exchange) {
+                                                         @RequestHeader(name = "Origin") String originHeader) {
         log.debug("Going to create resource {}", resource.getClass().getName());
-        return service.createThread(resource)
+        return service.createThread(resource, originHeader)
                 .map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
     }
 
@@ -60,13 +61,13 @@ public class CommentController extends BaseController<CommentService, Comment, S
                 .map(threads -> new ResponseDTO<>(HttpStatus.OK.value(), threads, null));
     }
 
-    @PatchMapping("/threads/{threadId}")
+    @PutMapping("/threads/{threadId}")
     public Mono<ResponseDTO<CommentThread>> updateThread(
             @Valid @RequestBody CommentThread resource,
-            @PathVariable String threadId
+            @PathVariable String threadId, ServerWebExchange exchange
     ) {
         log.debug("Going to update resource {}", resource.getClass().getName());
-        return service.updateThread(threadId, resource)
+        return service.updateThread(threadId, resource, exchange.getRequest().getHeaders().getOrigin())
                 .map(updated -> new ResponseDTO<>(HttpStatus.ACCEPTED.value(), updated, null));
     }
 
@@ -78,4 +79,30 @@ public class CommentController extends BaseController<CommentService, Comment, S
                 .map(deletedResource -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResource, null));
     }
 
+    @DeleteMapping("/threads/{threadId}")
+    public Mono<ResponseDTO<CommentThread>> deleteThread(@PathVariable String threadId) {
+        log.debug("Going to delete thread with id: {}", threadId);
+        return service.deleteThread(threadId)
+                .map(deletedResource -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResource, null));
+    }
+
+    @PostMapping("/{commentId}/reactions")
+    public Mono<ResponseDTO<Boolean>> createReaction(
+            @PathVariable String commentId,
+            @Valid @RequestBody Comment.Reaction reaction
+    ) {
+        log.debug("Going to create reaction on comment with id: {}", commentId);
+        return service.createReaction(commentId, reaction)
+                .map(isSaved -> new ResponseDTO<>(HttpStatus.OK.value(), isSaved, null));
+    }
+
+    @DeleteMapping("/{commentId}/reactions")
+    public Mono<ResponseDTO<Boolean>> deleteReaction(
+            @PathVariable String commentId,
+            @Valid @RequestBody Comment.Reaction reaction
+    ) {
+        log.debug("Going to delete reaction on comment with id: {}", commentId);
+        return service.deleteReaction(commentId, reaction)
+                .map(isSaved -> new ResponseDTO<>(HttpStatus.OK.value(), isSaved, null));
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/DatasourceController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/DatasourceController.java
index 4f5cb2f8ab..1c8c526387 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/DatasourceController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/DatasourceController.java
@@ -5,10 +5,14 @@ import com.appsmith.external.models.DatasourceTestResult;
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.domains.Datasource;
 import com.appsmith.server.dtos.AuthorizationCodeCallbackDTO;
+import com.appsmith.server.dtos.MockDataSet;
+import com.appsmith.server.dtos.MockDataSource;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.services.DatasourceService;
+import com.appsmith.server.services.MockDataService;
 import com.appsmith.server.solutions.AuthenticationService;
 import com.appsmith.server.solutions.DatasourceStructureSolution;
+import com.appsmith.server.solutions.ExamplesOrganizationCloner;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +28,7 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 import java.net.URI;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -32,14 +37,21 @@ public class DatasourceController extends BaseController<DatasourceService, Data
 
     private final DatasourceStructureSolution datasourceStructureSolution;
     private final AuthenticationService authenticationService;
+    private final ExamplesOrganizationCloner examplesOrganizationCloner;
+    private final MockDataService mockDataService;
+
 
     @Autowired
     public DatasourceController(DatasourceService service,
                                 DatasourceStructureSolution datasourceStructureSolution,
-                                AuthenticationService authenticationService) {
+                                AuthenticationService authenticationService,
+                                ExamplesOrganizationCloner examplesOrganizationCloner,
+                                MockDataService datasourceService) {
         super(service);
         this.datasourceStructureSolution = datasourceStructureSolution;
         this.authenticationService = authenticationService;
+        this.examplesOrganizationCloner = examplesOrganizationCloner;
+        this.mockDataService = datasourceService;
     }
 
     @PostMapping("/test")
@@ -79,5 +91,16 @@ public class DatasourceController extends BaseController<DatasourceService, Data
                 });
     }
 
+    @GetMapping("/mocks")
+    public Mono<ResponseDTO<List<MockDataSet>>> getMockDataSets() {
+        return mockDataService.getMockDataSet()
+                .map(config -> new ResponseDTO<>(HttpStatus.OK.value(), config.getMockdbs(), null));
+    }
+
+    @PostMapping("/mocks")
+    public Mono<ResponseDTO<Datasource>> createMockDataSet(@RequestBody MockDataSource mockDataSource) {
+        return mockDataService.createMockDataSet(mockDataSource)
+                .map(datasource -> new ResponseDTO<>(HttpStatus.OK.value(), datasource, null));
+    }
 
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/NotificationController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/NotificationController.java
new file mode 100644
index 0000000000..b958f76fc1
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/NotificationController.java
@@ -0,0 +1,71 @@
+package com.appsmith.server.controllers;
+
+import com.appsmith.server.constants.Url;
+import com.appsmith.server.domains.Notification;
+import com.appsmith.server.dtos.ResponseDTO;
+import com.appsmith.server.dtos.UpdateIsReadNotificationByIdDTO;
+import com.appsmith.server.dtos.UpdateIsReadNotificationDTO;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.services.NotificationService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+import javax.validation.Valid;
+
+import static com.appsmith.server.exceptions.AppsmithError.UNSUPPORTED_OPERATION;
+
+@Slf4j
+@RestController
+@RequestMapping(Url.NOTIFICATION_URL)
+public class NotificationController extends BaseController<NotificationService, Notification, String> {
+
+    public NotificationController(NotificationService service) {
+        super(service);
+    }
+
+    @GetMapping("count/unread")
+    public Mono<ResponseDTO<Long>> getUnreadCount() {
+        return service.getUnreadCount()
+                .map(response -> new ResponseDTO<>(HttpStatus.OK.value(), response, null));
+    }
+
+    @PatchMapping("isRead")
+    public Mono<ResponseDTO<UpdateIsReadNotificationByIdDTO>> updateIsRead(
+            @RequestBody @Valid UpdateIsReadNotificationByIdDTO body) {
+        log.debug("Going to set isRead to notifications by id");
+        return service.updateIsRead(body).map(
+                dto -> new ResponseDTO<>(HttpStatus.OK.value(), dto, null, true)
+        );
+    }
+
+    @PatchMapping("isRead/all")
+    public Mono<ResponseDTO<UpdateIsReadNotificationDTO>> updateIsRead(
+            @RequestBody @Valid UpdateIsReadNotificationDTO body) {
+        log.debug("Going to set isRead to all notifications");
+        return service.updateIsRead(body).map(
+                dto -> new ResponseDTO<>(HttpStatus.OK.value(), dto, null, true)
+        );
+    }
+
+    @Override
+    public Mono<ResponseDTO<Notification>> create(Notification resource, String originHeader, ServerWebExchange exchange) {
+        return Mono.error(new AppsmithException(UNSUPPORTED_OPERATION));
+    }
+
+    @Override
+    public Mono<ResponseDTO<Notification>> update(String s, Notification resource) {
+        return Mono.error(new AppsmithException(UNSUPPORTED_OPERATION));
+    }
+
+    @Override
+    public Mono<ResponseDTO<Notification>> delete(String s) {
+        return Mono.error(new AppsmithException(UNSUPPORTED_OPERATION));
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PageController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PageController.java
index 67379a4ae3..93af1e2d62 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PageController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PageController.java
@@ -2,10 +2,13 @@ package com.appsmith.server.controllers;
 
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.dtos.ApplicationPagesDTO;
+import com.appsmith.server.dtos.CRUDPageResourceDTO;
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.NewPageService;
+import com.appsmith.server.solutions.CreateDBTablePageSolution;
+import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -30,12 +33,16 @@ import javax.validation.Valid;
 public class PageController {
     private final ApplicationPageService applicationPageService;
     private final NewPageService newPageService;
-
+    private final CreateDBTablePageSolution createDBTablePageSolution;
+    
     @Autowired
     public PageController(ApplicationPageService applicationPageService,
-                          NewPageService newPageService) {
+                          NewPageService newPageService,
+                          CreateDBTablePageSolution createDBTablePageSolution
+    ) {
         this.applicationPageService = applicationPageService;
         this.newPageService = newPageService;
+        this.createDBTablePageSolution = createDBTablePageSolution;
     }
 
     @PostMapping
@@ -48,6 +55,23 @@ public class PageController {
                 .map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
     }
 
+    @PostMapping("/crud-page")
+    @ResponseStatus(HttpStatus.CREATED)
+    public Mono<ResponseDTO<PageDTO>> createCRUDPage(@RequestBody @NonNull CRUDPageResourceDTO resource) {
+        log.debug("Going to create crud-page");
+        return createDBTablePageSolution.createPageFromDBTable(null, resource)
+            .map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
+    }
+    
+    @PutMapping("/crud-page/{pageId}")
+    @ResponseStatus(HttpStatus.OK)
+    public Mono<ResponseDTO<PageDTO>> createCRUDPage(@PathVariable String pageId,
+                                                     @NonNull @RequestBody CRUDPageResourceDTO resource) {
+        log.debug("Going to update resource {}", pageId);
+        return createDBTablePageSolution.createPageFromDBTable(pageId, resource)
+            .map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
+    }
+
     @Deprecated
     @GetMapping("/application/{applicationId}")
     public Mono<ResponseDTO<ApplicationPagesDTO>> getPageNamesByApplicationId(@PathVariable String applicationId) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/UserController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/UserController.java
index 42e0a66836..b2c7133a59 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/UserController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/UserController.java
@@ -90,6 +90,12 @@ public class UserController extends BaseController<UserService, User, String> {
                 .map(user -> new ResponseDTO<>(HttpStatus.OK.value(), user, null));
     }
 
+    @PutMapping("/leaveOrganization/{orgId}")
+    public Mono<ResponseDTO<User>> leaveOrganization(@PathVariable String orgId) {
+        return userOrganizationService.leaveOrganization(orgId)
+                .map(user -> new ResponseDTO<>(HttpStatus.OK.value(), user, null));
+    }
+
     /**
      * This function initiates the process to reset a user's password. We require the Origin header from the request
      * in order to construct client facing URLs that will be sent to the user over email.
@@ -134,7 +140,8 @@ public class UserController extends BaseController<UserService, User, String> {
      * @return List of new users who have been created/existing users who have been added to the organization.
      */
     @PostMapping("/invite")
-    public Mono<ResponseDTO<List<User>>> inviteUsers(@RequestBody InviteUsersDTO inviteUsersDTO, @RequestHeader("Origin") String originHeader) {
+    public Mono<ResponseDTO<List<User>>> inviteUsers(@RequestBody InviteUsersDTO inviteUsersDTO,
+                                                     @RequestHeader("Origin") String originHeader) {
         return service.inviteUsers(inviteUsersDTO, originHeader)
                 .map(users -> new ResponseDTO<>(HttpStatus.OK.value(), users, null));
     }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
index 31f7c8dca4..9e9e634bed 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
@@ -46,6 +46,9 @@ public class Application extends BaseDomain {
     @Transient
     boolean appIsExample = false;
 
+    @Transient
+    long unreadCommentThreads;
+
     @JsonIgnore
     String clonedFromApplicationId;
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ApplicationJson.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ApplicationJson.java
new file mode 100644
index 0000000000..4c7942a1ec
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ApplicationJson.java
@@ -0,0 +1,38 @@
+package com.appsmith.server.domains;
+
+import com.appsmith.external.models.DecryptedSensitiveFields;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A DTO class to hold complete information about an application, which will then be serialized to a file so as to
+ * export that application into a file.
+ */
+@Getter
+@Setter
+public class ApplicationJson {
+    
+    Application exportedApplication;
+    
+    List<Datasource> datasourceList;
+    
+    List<NewPage> pageList;
+    
+    String publishedDefaultPageName;
+    
+    String unpublishedDefaultPageName;
+    
+    List<NewAction> actionList;
+    
+    Map<String, DecryptedSensitiveFields> decryptedFields;
+    
+    /**
+     * Mapping mongoEscapedWidgets with layoutId
+     */
+    Map<String, Set<String>> publishedLayoutmongoEscapedWidgets;
+    Map<String, Set<String>> unpublishedLayoutmongoEscapedWidgets;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ApplicationPage.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ApplicationPage.java
index b304224291..e6ab71aae1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ApplicationPage.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ApplicationPage.java
@@ -20,6 +20,8 @@ public class ApplicationPage {
 
     Boolean isDefault;
 
+    Integer order;
+
     @JsonIgnore
     public boolean isDefault() {
         return Boolean.TRUE.equals(isDefault);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Comment.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Comment.java
index dc67d106f4..165b8ec281 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Comment.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Comment.java
@@ -1,21 +1,24 @@
 package com.appsmith.server.domains;
 
 import com.appsmith.external.models.BaseDomain;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import static com.appsmith.server.helpers.DateUtils.ISO_FORMATTER;
+
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Document
 public class Comment extends BaseDomain {
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     String threadId;
 
     /**
@@ -30,8 +33,26 @@ public class Comment extends BaseDomain {
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     String authorName;
 
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    String authorUsername;
+
+    private String applicationId;
+    private String applicationName;
+    private String pageId;
+
     Body body;
 
+    /** Edit/Published Mode */
+    String mode;
+
+    List<Reaction> reactions;
+
+    /**
+     * Indicates whether this comment is the leading comment in it's thread. Such a comment cannot be deleted.
+     */
+    @JsonIgnore
+    Boolean leading;
+
     @Data
     public static class Body {
         List<Block> blocks;
@@ -79,4 +100,16 @@ public class Comment extends BaseDomain {
         }
     }
 
+    public String getCreationTime() {
+        return ISO_FORMATTER.format(createdAt);
+    }
+
+    @Data
+    public static class Reaction {
+        String emoji;
+        String byUsername;
+        String byName;
+        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX", timezone = "UTC")
+        Date createdAt;
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CommentNotification.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CommentNotification.java
new file mode 100644
index 0000000000..b2277fd173
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CommentNotification.java
@@ -0,0 +1,14 @@
+package com.appsmith.server.domains;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Document
+public class CommentNotification extends Notification {
+
+    Comment comment;
+
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CommentThread.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CommentThread.java
index d715e909f4..7e01fe72fc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CommentThread.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CommentThread.java
@@ -2,19 +2,18 @@ package com.appsmith.server.domains;
 
 import com.appsmith.external.models.BaseDomain;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Set;
 
+import static com.appsmith.server.helpers.DateUtils.ISO_FORMATTER;
+
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Document
@@ -26,6 +25,8 @@ public class CommentThread extends BaseDomain {
 
     String refId;
 
+    String pageId;
+
     CommentThreadState pinnedState;
 
     CommentThreadState resolvedState;
@@ -34,9 +35,29 @@ public class CommentThread extends BaseDomain {
 
     String applicationId;
 
+    String applicationName;
+
     @JsonIgnore
     Set<String> viewedByUsers;
 
+    /**
+     * username i.e. email of users who are subscribed for notifications in this thread
+     */
+    @JsonIgnore
+    Set<String> subscribers;
+
+    /** Edit/Published Mode */
+    String mode;
+
+    /**
+     * Display name of the user, who authored this comment thread.
+     */
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    String authorName;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    String authorUsername;
+
     @Transient
     Boolean isViewed;
 
@@ -44,9 +65,6 @@ public class CommentThread extends BaseDomain {
     @Transient
     List<Comment> comments;
 
-    private static final DateTimeFormatter ISO_FORMATTER =
-            DateTimeFormatter.ISO_INSTANT.withZone(ZoneId.from(ZoneOffset.UTC));
-
     @Data
     public static class Position {
         Float top;
@@ -57,7 +75,6 @@ public class CommentThread extends BaseDomain {
     public static class CommentThreadState {
         String authorName;
         String authorUsername;
-        @LastModifiedDate
         Instant updatedAt;
         Boolean active;
     }
@@ -69,5 +86,4 @@ public class CommentThread extends BaseDomain {
     public String getUpdationTime() {
         return ISO_FORMATTER.format(updatedAt);
     }
-
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CommentThreadNotification.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CommentThreadNotification.java
new file mode 100644
index 0000000000..ab3834805c
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CommentThreadNotification.java
@@ -0,0 +1,14 @@
+package com.appsmith.server.domains;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Document
+public class CommentThreadNotification extends Notification {
+
+    CommentThread commentThread;
+
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Notification.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Notification.java
new file mode 100644
index 0000000000..f9e248caf7
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Notification.java
@@ -0,0 +1,36 @@
+package com.appsmith.server.domains;
+
+import com.appsmith.external.models.BaseDomain;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import static com.appsmith.server.helpers.DateUtils.ISO_FORMATTER;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Document
+public class Notification extends BaseDomain {
+
+    // TODO: This class extends BaseDomain, so it has policies. Should we use information from policies instead of this field?
+    String forUsername;
+
+    /**
+     * Read status for this notification. If it is `true`, then this notification is read. If `false` or `null`, it's unread.
+     */
+    Boolean isRead;
+
+    public String getType() {
+        return getClass().getSimpleName();
+    }
+
+    /**
+     * This method has been added because the createdAt property in base domain has @JsonIgnore annotation
+     * @return created time as a string
+     */
+    @JsonProperty(value = "createdAt", access = JsonProperty.Access.READ_ONLY)
+    public String getCreationTime() {
+        return ISO_FORMATTER.format(createdAt);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java
index 0d5b30df11..f61ebf9756 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java
@@ -8,6 +8,8 @@ import lombok.Setter;
 import lombok.ToString;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.List;
+
 /**
  * This model is intended to hold any user-specific information that is not directly about the user's authentication.
  */
@@ -27,6 +29,9 @@ public class UserData extends BaseDomain {
     // The version where this user has last viewed the release notes.
     private String releaseNotesViewedVersion;
 
+    // list of organisation ids that were recently accessed by the user
+    private List<String> recentlyUsedOrgIds;
+
     public UserData(String userId) {
         this.userId = userId;
     }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/CRUDPageResourceDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/CRUDPageResourceDTO.java
new file mode 100644
index 0000000000..1e95cd7459
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/CRUDPageResourceDTO.java
@@ -0,0 +1,27 @@
+package com.appsmith.server.dtos;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Set;
+
+/**
+ * This class will hold the fields that will be consumed by the server, which will be received
+ * from the clients request body
+ */
+@NoArgsConstructor
+@Getter
+@Setter
+public class CRUDPageResourceDTO {
+
+    String applicationId;
+
+    String datasourceId;
+
+    String tableName;
+
+    String searchColumn;
+
+    Set<String> columns;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataCredentials.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataCredentials.java
new file mode 100644
index 0000000000..d29d28f26f
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataCredentials.java
@@ -0,0 +1,18 @@
+package com.appsmith.server.dtos;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class MockDataCredentials {
+    String dbname;
+
+    String username;
+
+    String password;
+
+    String host;
+
+    Integer port;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataDTO.java
new file mode 100644
index 0000000000..b321161323
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataDTO.java
@@ -0,0 +1,18 @@
+package com.appsmith.server.dtos;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class MockDataDTO {
+    String id;
+
+    List<MockDataSet> mockdbs;
+
+    List<MockDataCredentials> credentials;
+
+    String name;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataSet.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataSet.java
new file mode 100644
index 0000000000..6d93596dea
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataSet.java
@@ -0,0 +1,17 @@
+package com.appsmith.server.dtos;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class MockDataSet {
+
+    String pluginType;
+
+    String packageName;
+
+    String description;
+
+    String name;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataSource.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataSource.java
new file mode 100644
index 0000000000..bba97c5ba4
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataSource.java
@@ -0,0 +1,18 @@
+package com.appsmith.server.dtos;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class MockDataSource {
+
+    String name;
+
+    String organizationId;
+
+    String pluginId;
+
+    String packageName;
+
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageDTO.java
index 3931091825..389b5c31a0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageDTO.java
@@ -41,4 +41,7 @@ public class PageDTO {
 
     Boolean isHidden;
 
+    @Transient
+    Long lastUpdatedTime;
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UpdateIsReadNotificationByIdDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UpdateIsReadNotificationByIdDTO.java
new file mode 100644
index 0000000000..1b4aa2c812
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UpdateIsReadNotificationByIdDTO.java
@@ -0,0 +1,19 @@
+package com.appsmith.server.dtos;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+public class UpdateIsReadNotificationByIdDTO extends UpdateIsReadNotificationDTO {
+    @NotNull
+    @NotEmpty
+    private List<String> idList;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UpdateIsReadNotificationDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UpdateIsReadNotificationDTO.java
new file mode 100644
index 0000000000..fb85db61a1
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UpdateIsReadNotificationDTO.java
@@ -0,0 +1,15 @@
+package com.appsmith.server.dtos;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@EqualsAndHashCode
+public class UpdateIsReadNotificationDTO {
+    @NotNull
+    private Boolean isRead;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/events/AbstractCommentEvent.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/AbstractCommentEvent.java
new file mode 100644
index 0000000000..003947218f
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/AbstractCommentEvent.java
@@ -0,0 +1,13 @@
+package com.appsmith.server.events;
+
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.Organization;
+import lombok.Data;
+
+@Data
+public abstract class AbstractCommentEvent {
+    private final String authorUserName;
+    private final Organization organization;
+    private final Application application;
+    private final String originHeader;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentAddedEvent.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentAddedEvent.java
new file mode 100644
index 0000000000..58ec0dae48
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentAddedEvent.java
@@ -0,0 +1,21 @@
+package com.appsmith.server.events;
+
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.Comment;
+import com.appsmith.server.domains.Organization;
+import lombok.Getter;
+
+import java.util.Set;
+
+@Getter
+public class CommentAddedEvent extends AbstractCommentEvent {
+    private final Comment comment;
+    private final Set<String> subscribers;
+
+    public CommentAddedEvent(String authorUserName, Organization organization, Application application,
+                             String originHeader, Comment comment, Set<String> subscribers) {
+        super(authorUserName, organization, application, originHeader);
+        this.comment = comment;
+        this.subscribers = subscribers;
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentThreadClosedEvent.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentThreadClosedEvent.java
new file mode 100644
index 0000000000..6c2fc7bea1
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentThreadClosedEvent.java
@@ -0,0 +1,16 @@
+package com.appsmith.server.events;
+
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.CommentThread;
+import com.appsmith.server.domains.Organization;
+import lombok.Getter;
+
+@Getter
+public class CommentThreadClosedEvent extends AbstractCommentEvent {
+    private final CommentThread commentThread;
+
+    public CommentThreadClosedEvent(String authorUserName, Organization organization, Application application, String originHeader, CommentThread commentThread) {
+        super(authorUserName, organization, application, originHeader);
+        this.commentThread = commentThread;
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/events/UserChangedEvent.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/UserChangedEvent.java
new file mode 100644
index 0000000000..af2d27d937
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/UserChangedEvent.java
@@ -0,0 +1,11 @@
+package com.appsmith.server.events;
+
+import com.appsmith.server.domains.User;
+import lombok.Data;
+
+@Data
+public class UserChangedEvent {
+
+    private final User user;
+
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
index d9bef4bcbc..481b4dddc8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
@@ -52,7 +52,7 @@ public enum AppsmithError {
     JSON_PROCESSING_ERROR(400, 4022, "Json processing error with error {0}", AppsmithErrorAction.LOG_EXTERNALLY, null),
     INVALID_CREDENTIALS(200, 4023, "Invalid credentials provided. Did you input the credentials correctly?", AppsmithErrorAction.DEFAULT, null),
     UNAUTHORIZED_ACCESS(403, 4025, "Unauthorized access", AppsmithErrorAction.DEFAULT, null),
-    DUPLICATE_KEY(409, 4024, "Unexpected state : Duplicate key error. Please reach out to Appsmith customer support to report this", AppsmithErrorAction.DEFAULT, null),
+    DUPLICATE_KEY(409, 4024, "Unexpected state : Duplicate key error. Message : {0}. Please reach out to Appsmith customer support to report this", AppsmithErrorAction.DEFAULT, null),
     USER_ALREADY_EXISTS_SIGNUP(409, 4025, "There is already an account registered with this email {0}. Please sign in instead.", AppsmithErrorAction.DEFAULT, null),
     ACTION_IS_NOT_AUTHORIZED(403, 4026, "Uh oh! You do not have permissions to do : {0}", AppsmithErrorAction.DEFAULT, null),
     NO_RESOURCE_FOUND(404, 4027, "Unable to find {0} {1}", AppsmithErrorAction.DEFAULT, null),
@@ -61,6 +61,7 @@ public enum AppsmithError {
     GENERIC_BAD_REQUEST(400, 4028, "Bad Request: {0}", AppsmithErrorAction.DEFAULT, null),
     VALIDATION_FAILURE(400, 4028, "Validation Failure(s): {0}", AppsmithErrorAction.DEFAULT, null),
     INVALID_CURL_COMMAND(400, 4029, "Invalid cURL command, couldn't import.", AppsmithErrorAction.DEFAULT, null),
+    REMOVE_LAST_ORG_ADMIN_ERROR(400, 4037, "The last admin can not be removed from an organization", AppsmithErrorAction.DEFAULT, null),
     INTERNAL_SERVER_ERROR(500, 5000, "Internal server error while processing request", AppsmithErrorAction.LOG_EXTERNALLY, null),
     REPOSITORY_SAVE_FAILED(500, 5001, "Failed to save the repository. Try again.", AppsmithErrorAction.DEFAULT, null),
     PLUGIN_INSTALLATION_FAILED_DOWNLOAD_ERROR(500, 5002, "Plugin installation failed due to an error while " +
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
index 82163a8509..f1860ab985 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
@@ -92,7 +92,7 @@ public class GlobalExceptionHandler {
         exchange.getResponse().setStatusCode(HttpStatus.resolve(appsmithError.getHttpErrorCode()));
         doLog(e);
         return Mono.just(new ResponseDTO<>(appsmithError.getHttpErrorCode(), new ErrorDTO(appsmithError.getAppErrorCode(),
-                appsmithError.getMessage(e.getMessage()))));
+                appsmithError.getMessage(e.getCause().getMessage()))));
     }
 
     @ExceptionHandler
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CollectionUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CollectionUtils.java
index 9d329f7ee2..e6b59a1b00 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CollectionUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CollectionUtils.java
@@ -1,7 +1,11 @@
 package com.appsmith.server.helpers;
 
+
 import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class CollectionUtils {
 
@@ -25,4 +29,40 @@ public class CollectionUtils {
         return (m == null || m.isEmpty());
     }
 
+    /**
+     * Puts an item at the beginning of the list. If the item already exists in other position, it'll move it to first
+     * @param list
+     * @param item
+     * @param <E>
+     */
+    public static <E> void putAtFirst(List<E> list, E item) {
+        // check if item already exists
+        int index = list.indexOf(item);
+        if(index == -1) {  // does not exist so put it at first
+            list.add(0, item);
+        } else if(index > 0) {
+            list.remove(item);
+            list.add(0, item);
+        }
+    }
+
+    /**
+     * Removes duplicate items from an array list
+     * @param list
+     * @param <T>
+     * @return
+     */
+    public static <T> void removeDuplicates(List<T> list)
+    {
+        // Create a new LinkedHashSet
+        Set<T> set = new LinkedHashSet<T>(list);
+
+        // Clear the list
+        list.clear();
+
+        // add the elements of set
+        // with no duplicates to the list
+        list.addAll(set);
+    }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CommentUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CommentUtils.java
new file mode 100644
index 0000000000..e7298f422c
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CommentUtils.java
@@ -0,0 +1,74 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.domains.Comment;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class CommentUtils {
+    /**
+     * Checks whether provided user has been mentioned in the comment. Returns true if yes and false otherwise.
+     * @param comment Comment objects
+     * @param userEmail email address of the user
+     * @return true or false based on the condition
+     */
+    public static boolean isUserMentioned(Comment comment, String userEmail) {
+        if(comment.getBody() != null && comment.getBody().getEntityMap() != null) {
+            for(String key : comment.getBody().getEntityMap().keySet()) {
+                Comment.Entity commentEntity = comment.getBody().getEntityMap().get(key);
+                if(commentEntity != null && commentEntity.getType() != null
+                        && commentEntity.getType().equals("mention")) {
+                    // this comment has a mention, check the provided user is mentioned or not
+                    if(commentEntity.getData() != null) {
+                        Comment.EntityData.Mention mention = commentEntity.getData().getMention();
+                        if(mention.getUser().getUsername().equals(userEmail)) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns the list of usernames who should subscribe to a thread
+     * It'll include the author username. It'll also include anyone who is mentioned in this comment by the author.
+     * For example, if this comment is from user1 where user2 and user3 are mentioned in this comment,
+     * it'll return a list of user1, user2, user3
+     * @param comment The comment object
+     * @return list of usernames. Size of the list will be at least 1
+     */
+    public static Set<String> getSubscriberUsernames(Comment comment) {
+        Set<String> usernamesSet = new HashSet<>();
+        // add the author itself
+        usernamesSet.add(comment.getAuthorUsername());
+
+        if(comment.getBody() != null && comment.getBody().getEntityMap() != null) {
+            for(String key : comment.getBody().getEntityMap().keySet()) {
+                Comment.Entity commentEntity = comment.getBody().getEntityMap().get(key);
+                if(commentEntity != null && commentEntity.getType() != null
+                        && commentEntity.getType().equals("mention")) {
+                    // this comment has a mention, check the provided user is mentioned or not
+                    if(commentEntity.getData() != null) {
+                        Comment.EntityData.Mention mention = commentEntity.getData().getMention();
+                        usernamesSet.add(mention.getUser().getUsername());
+                    }
+                }
+            }
+        }
+        return usernamesSet;
+    }
+
+    public static List<String> getCommentBody(Comment comment) {
+        List<String> commentLines = new ArrayList<>();
+        if(comment.getBody() != null && comment.getBody().getBlocks() != null) {
+            for (Comment.Block block : comment.getBody().getBlocks()) {
+                commentLines.add(block.getText());
+            }
+        }
+        return commentLines;
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/DateUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/DateUtils.java
new file mode 100644
index 0000000000..219f965b3e
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/DateUtils.java
@@ -0,0 +1,10 @@
+package com.appsmith.server.helpers;
+
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+
+public class DateUtils {
+    public static final DateTimeFormatter ISO_FORMATTER =
+            DateTimeFormatter.ISO_INSTANT.withZone(ZoneId.from(ZoneOffset.UTC));
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/NumberUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/NumberUtils.java
new file mode 100644
index 0000000000..471593e20b
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/NumberUtils.java
@@ -0,0 +1,23 @@
+package com.appsmith.server.helpers;
+
+public class NumberUtils {
+    /**
+     * Parses an integer from a string. If the provided string is not an integer, it'll return the default value instead.
+     * If the parsed integer is less than minValue, it'll return the default value
+     * @param str
+     * @param minValue
+     * @param defaultValue
+     * @return parsed integer or default value depending on the conditions.
+     */
+    public static int parseInteger(String str, int minValue, int defaultValue) {
+        try {
+            int i = Integer.parseInt(str);
+            if(i < minValue) {
+                return defaultValue;
+            }
+            return i;
+        } catch(Exception e) {
+            return defaultValue;
+        }
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PolicyUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PolicyUtils.java
index b67a6d967a..979345fa3d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PolicyUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PolicyUtils.java
@@ -5,19 +5,25 @@ import com.appsmith.external.models.Policy;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.acl.PolicyGenerator;
 import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.CommentThread;
 import com.appsmith.server.domains.Datasource;
 import com.appsmith.server.domains.NewAction;
 import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.repositories.ApplicationRepository;
+import com.appsmith.server.repositories.CommentThreadRepository;
 import com.appsmith.server.repositories.DatasourceRepository;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.repositories.NewPageRepository;
+import com.appsmith.server.solutions.UserChangedHandler;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -30,6 +36,7 @@ import java.util.stream.Collectors;
 import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
 
 @Component
+@AllArgsConstructor
 public class PolicyUtils {
 
     private final PolicyGenerator policyGenerator;
@@ -37,18 +44,8 @@ public class PolicyUtils {
     private final DatasourceRepository datasourceRepository;
     private final NewPageRepository newPageRepository;
     private final NewActionRepository newActionRepository;
-
-    public PolicyUtils(PolicyGenerator policyGenerator,
-                       ApplicationRepository applicationRepository,
-                       DatasourceRepository datasourceRepository,
-                       NewPageRepository newPageRepository,
-                       NewActionRepository newActionRepository) {
-        this.policyGenerator = policyGenerator;
-        this.applicationRepository = applicationRepository;
-        this.datasourceRepository = datasourceRepository;
-        this.newPageRepository = newPageRepository;
-        this.newActionRepository = newActionRepository;
-    }
+    private final UserChangedHandler userChangedHandler;
+    private final CommentThreadRepository commentThreadRepository;
 
     public <T extends BaseDomain> T addPoliciesToExistingObject(Map<String, Policy> policyMap, T obj) {
         // Making a deep copy here so we don't modify the `policyMap` object.
@@ -222,6 +219,23 @@ public class PolicyUtils {
                         .saveAll(updatedPages));
     }
 
+    public Flux<CommentThread> updateWithApplicationPermissionsToAllItsCommentThreads(String applicationId, Map<String, Policy> commentThreadPolicyMap, boolean addPolicyToObject) {
+
+        return
+                // fetch comment threads with read permissions
+                commentThreadRepository.findByApplicationId(applicationId, AclPermission.READ_THREAD)
+                .switchIfEmpty(Mono.empty())
+                .map(thread -> {
+                    if (addPolicyToObject) {
+                        return addPoliciesToExistingObject(commentThreadPolicyMap, thread);
+                    } else {
+                        return removePoliciesFromExistingObject(commentThreadPolicyMap, thread);
+                    }
+                })
+                .collectList()
+                .flatMapMany(commentThreads -> commentThreadRepository.saveAll(commentThreads));
+    }
+
     /**
      * Instead of fetching actions by pageId, fetch actions by applicationId and then update the action policies
      * using the new ActionPoliciesMap. This ensures the following :
@@ -282,4 +296,18 @@ public class PolicyUtils {
 
         return false;
     }
+
+    public Set<String> findUsernamesWithPermission(Set<Policy> policies, AclPermission permission) {
+        if (CollectionUtils.isNotEmpty(policies) && permission != null) {
+            final String permissionString = permission.getValue();
+            for (Policy policy : policies) {
+                if (permissionString.equals(policy.getPermission())) {
+                    return policy.getUsers();
+                }
+            }
+        }
+
+        return Collections.emptySet();
+    }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RedirectHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RedirectHelper.java
index 443a991992..36d960405b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RedirectHelper.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RedirectHelper.java
@@ -21,6 +21,7 @@ import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
 public class RedirectHelper {
 
     public static final String DEFAULT_REDIRECT_URL = "/applications";
+    public static final String SIGNUP_SUCCESS_URL = "/signup-success";
     public static final String DEFAULT_REDIRECT_ORIGIN = "https://app.appsmith.com";
     private static final String REDIRECT_URL_HEADER = "X-Redirect-Url";
     private static final String REDIRECT_URL_QUERY_PARAM = "redirectUrl";
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
index b214257337..931fb049c6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
@@ -42,6 +42,7 @@ import com.appsmith.server.domains.Sequence;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.UserData;
 import com.appsmith.server.domains.UserRole;
+import com.appsmith.server.domains.ApplicationPage;
 import com.appsmith.server.dtos.ActionDTO;
 import com.appsmith.server.dtos.DslActionDTO;
 import com.appsmith.server.dtos.OrganizationPluginStatus;
@@ -50,6 +51,7 @@ import com.appsmith.server.services.OrganizationService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
+import com.github.cloudyrock.mongock.decorator.impl.MongockTemplate;
 import com.google.gson.Gson;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoException;
@@ -98,7 +100,9 @@ import java.util.stream.Collectors;
 
 import static com.appsmith.external.helpers.BeanCopyUtils.copyNewFieldValuesIntoOldObject;
 import static com.appsmith.server.acl.AclPermission.EXECUTE_ACTIONS;
+import static com.appsmith.server.acl.AclPermission.EXPORT_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.MAKE_PUBLIC_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.ORGANIZATION_EXPORT_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.ORGANIZATION_INVITE_USERS;
 import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
 import static com.appsmith.server.helpers.CollectionUtils.isNullOrEmpty;
@@ -173,8 +177,8 @@ public class DatabaseChangelog {
         return actionDTO;
     }
 
-    private void installPluginToAllOrganizations(MongoTemplate mongoTemplate, String pluginId) {
-        for (Organization organization : mongoTemplate.findAll(Organization.class)) {
+    private void installPluginToAllOrganizations(MongockTemplate mongockTemplate, String pluginId) {
+        for (Organization organization : mongockTemplate.findAll(Organization.class)) {
             if (CollectionUtils.isEmpty(organization.getPlugins())) {
                 organization.setPlugins(new ArrayList<>());
             }
@@ -187,7 +191,7 @@ public class DatabaseChangelog {
                         .add(new OrganizationPlugin(pluginId, OrganizationPluginStatus.FREE));
             }
 
-            mongoTemplate.save(organization);
+            mongockTemplate.save(organization);
         }
     }
 
@@ -583,7 +587,7 @@ public class DatabaseChangelog {
     }
 
     @ChangeSet(order = "018", id = "install-mysql-plugins", author = "")
-    public void mysqlPlugin(MongoTemplate mongoTemplate) {
+    public void mysqlPlugin(MongockTemplate mongoTemplate) {
         Plugin plugin1 = new Plugin();
         plugin1.setName("Mysql");
         plugin1.setType(PluginType.DB);
@@ -991,7 +995,7 @@ public class DatabaseChangelog {
     }
 
     @ChangeSet(order = "027", id = "add-elastic-search-plugin", author = "")
-    public void addElasticSearchPlugin(MongoTemplate mongoTemplate) {
+    public void addElasticSearchPlugin(MongockTemplate mongoTemplate) {
         Plugin plugin1 = new Plugin();
         plugin1.setName("ElasticSearch");
         plugin1.setType(PluginType.DB);
@@ -1011,7 +1015,7 @@ public class DatabaseChangelog {
     }
 
     @ChangeSet(order = "028", id = "add-dynamo-plugin", author = "")
-    public void addDynamoPlugin(MongoTemplate mongoTemplate) {
+    public void addDynamoPlugin(MongockTemplate mongoTemplate) {
         Plugin plugin1 = new Plugin();
         plugin1.setName("DynamoDB");
         plugin1.setType(PluginType.DB);
@@ -1041,7 +1045,7 @@ public class DatabaseChangelog {
     }
 
     @ChangeSet(order = "030", id = "add-redis-plugin", author = "")
-    public void addRedisPlugin(MongoTemplate mongoTemplate) {
+    public void addRedisPlugin(MongockTemplate mongoTemplate) {
         Plugin plugin1 = new Plugin();
         plugin1.setName("Redis");
         plugin1.setType(PluginType.DB);
@@ -1061,7 +1065,7 @@ public class DatabaseChangelog {
     }
 
     @ChangeSet(order = "031", id = "add-msSql-plugin", author = "")
-    public void addMsSqlPlugin(MongoTemplate mongoTemplate) {
+    public void addMsSqlPlugin(MongockTemplate mongoTemplate) {
         Plugin plugin1 = new Plugin();
         plugin1.setName("MsSQL");
         plugin1.setType(PluginType.DB);
@@ -1269,7 +1273,7 @@ public class DatabaseChangelog {
     }
 
     @ChangeSet(order = "043", id = "add-firestore-plugin", author = "")
-    public void addFirestorePlugin(MongoTemplate mongoTemplate) {
+    public void addFirestorePlugin(MongockTemplate mongoTemplate) {
         Plugin plugin = new Plugin();
         plugin.setName("Firestore");
         plugin.setType(PluginType.DB);
@@ -1509,26 +1513,6 @@ public class DatabaseChangelog {
         });
     }
 
-    @ChangeSet(order = "046", id = "ensure-encrypted-field-for-datasources", author = "")
-    public void ensureIsEncryptedFieldForDatasources(MongoTemplate mongoTemplate) {
-        final String isEncryptedField = "datasourceConfiguration.authentication.isEncrypted";
-        final String passwordField = "datasourceConfiguration.authentication.password";
-
-        final org.springframework.data.mongodb.core.query.Query query = query(new Criteria().andOperator(
-                where(passwordField).exists(true),
-                where(isEncryptedField).exists(false)
-        ));
-        query.fields().include("_id");
-
-        for (final Datasource datasource : mongoTemplate.find(query, Datasource.class)) {
-            mongoTemplate.updateFirst(
-                    query(where(fieldName(QDatasource.datasource.id)).is(datasource.getId())),
-                    update(isEncryptedField, true),
-                    Datasource.class
-            );
-        }
-    }
-
     @ChangeSet(order = "047", id = "add-isSendSessionEnabled-key-for-datasources", author = "")
     public void addIsSendSessionEnabledPropertyInDatasources(MongoTemplate mongoTemplate) {
 
@@ -1576,7 +1560,7 @@ public class DatabaseChangelog {
     }
 
     @ChangeSet(order = "048", id = "add-redshift-plugin", author = "")
-    public void addRedshiftPlugin(MongoTemplate mongoTemplate) {
+    public void addRedshiftPlugin(MongockTemplate mongoTemplate) {
         Plugin plugin = new Plugin();
         plugin.setName("Redshift");
         plugin.setType(PluginType.DB);
@@ -1640,7 +1624,7 @@ public class DatabaseChangelog {
     }
 
     @ChangeSet(order = "051", id = "add-amazons3-plugin", author = "")
-    public void addAmazonS3Plugin(MongoTemplate mongoTemplate) {
+    public void addAmazonS3Plugin(MongockTemplate mongoTemplate) {
         Plugin plugin = new Plugin();
         plugin.setName("Amazon S3");
         plugin.setType(PluginType.DB);
@@ -2108,7 +2092,7 @@ public class DatabaseChangelog {
     }
 
     @ChangeSet(order = "062", id = "add-google-sheets-plugin", author = "")
-    public void addGoogleSheetsPlugin(MongoTemplate mongoTemplate) {
+    public void addGoogleSheetsPlugin(MongockTemplate mongoTemplate) {
         Plugin plugin = new Plugin();
         plugin.setName("Google Sheets");
         plugin.setType(PluginType.SAAS);
@@ -2242,4 +2226,577 @@ public class DatabaseChangelog {
                 NewAction.class
         );
     }
+
+    @ChangeSet(order = "067", id = "update-mongo-import-from-srv-field", author = "")
+    public void updateMongoImportFromSrvField(MongoTemplate mongoTemplate) {
+        Plugin mongoPlugin = mongoTemplate
+                .findOne(query(where("packageName").is("mongo-plugin")), Plugin.class);
+
+        List<Datasource> mongoDatasources = mongoTemplate
+                .find(query(where("pluginId").is(mongoPlugin.getId())), Datasource.class);
+
+        mongoDatasources.stream()
+                .forEach(datasource -> {
+                    datasource.getDatasourceConfiguration().setProperties(List.of(new Property("Use Mongo Connection " +
+                            "String URI", "No")));
+                    mongoTemplate.save(datasource);
+                });
+    }
+
+    @ChangeSet(order = "068", id = "delete-mongo-datasource-structures", author = "")
+    public void deleteMongoDatasourceStructures(MongoTemplate mongoTemplate, MongoOperations mongoOperations) {
+
+        // Mongo Form requires the query templates to change as well. To ensure this, mongo datasources
+        // must re-compute the structure. The following deletes all such structures. Whenever getStructure API call is
+        // made for these datasources, the server would re-compute the structure.
+        Plugin mongoPlugin = mongoTemplate.findOne(query(where("packageName").is("mongo-plugin")), Plugin.class);
+
+        Query query = query(new Criteria().andOperator(
+                where(fieldName(QDatasource.datasource.pluginId)).is(mongoPlugin.getId()),
+                where(fieldName(QDatasource.datasource.structure)).exists(true)
+        ));
+
+        Update update = new Update().set(fieldName(QDatasource.datasource.structure), null);
+
+        // Delete all the existing mongo datasource structures by setting the key to null.
+        mongoOperations.updateMulti(query, update, Datasource.class);
+    }
+
+    @ChangeSet(order = "069", id = "set-mongo-actions-type-to-raw", author = "")
+    public void setMongoActionInputToRaw(MongockTemplate mongockTemplate) {
+
+        // All the existing mongo actions at this point will only have ever been in the raw format
+        // For these actions to be readily available to users, we need to set their input type to raw manually
+        // This is required because since the mongo form, the default input type on the UI has been set to FORM
+        Plugin mongoPlugin = mongockTemplate.findOne(query(where("packageName").is("mongo-plugin")), Plugin.class);
+
+        // Fetch all the actions built on top of a mongo database, not having any value set for input type
+        assert mongoPlugin != null;
+        List<NewAction> rawMongoActions = mongockTemplate.find(
+                query(new Criteria().andOperator(
+                        where(fieldName(QNewAction.newAction.pluginId)).is(mongoPlugin.getId()))),
+                NewAction.class
+        )
+                .stream()
+                .filter(mongoAction -> {
+                    if (mongoAction.getUnpublishedAction() == null || mongoAction.getUnpublishedAction().getActionConfiguration() == null) {
+                        return false;
+                    }
+                    final List<Property> pluginSpecifiedTemplates = mongoAction.getUnpublishedAction().getActionConfiguration().getPluginSpecifiedTemplates();
+                    return pluginSpecifiedTemplates != null && pluginSpecifiedTemplates.size() == 1;
+                })
+                .collect(Collectors.toList());
+
+        for (NewAction action : rawMongoActions) {
+            List<Property> pluginSpecifiedTemplates = action.getUnpublishedAction().getActionConfiguration().getPluginSpecifiedTemplates();
+            pluginSpecifiedTemplates.add(new Property(null, "RAW"));
+
+            mongockTemplate.save(action);
+        }
+    }
+
+    /**
+     * - Older firestore action form had support for only on where condition, which mapped path, operator and value to
+     * three different indexes on the pluginSpecifiedTemplates list.
+     * - In the newer form, the three properties are treated as a tuple, and a list of tuples is mapped to only one
+     * index in pluginSpecifiedTemplates list.
+     * - [... path, operator, value, ...] --> [... [ {"path":path, "operator":operator, "value":value} ] ...]
+     */
+    @ChangeSet(order = "070", id = "update-firestore-where-conditions-data", author = "")
+    public void updateFirestoreWhereConditionsData(MongoTemplate mongoTemplate) {
+        Plugin firestorePlugin = mongoTemplate
+                .findOne(query(where("packageName").is("firestore-plugin")), Plugin.class);
+
+        Query query = query(new Criteria().andOperator(
+                where("pluginId").is(firestorePlugin.getId()),
+                new Criteria().orOperator(
+                        where("unpublishedAction.actionConfiguration.pluginSpecifiedTemplates.3").exists(true),
+                        where("unpublishedAction.actionConfiguration.pluginSpecifiedTemplates.4").exists(true),
+                        where("unpublishedAction.actionConfiguration.pluginSpecifiedTemplates.5").exists(true),
+                        where("publishedAction.actionConfiguration.pluginSpecifiedTemplates.3").exists(true),
+                        where("publishedAction.actionConfiguration.pluginSpecifiedTemplates.4").exists(true),
+                        where("publishedAction.actionConfiguration.pluginSpecifiedTemplates.5").exists(true)
+                )));
+
+        List<NewAction> firestoreActionQueries = mongoTemplate.find(query, NewAction.class);
+
+        firestoreActionQueries.stream()
+                .forEach(action -> {
+                    // For unpublished action
+                    if (action.getUnpublishedAction() != null
+                            && action.getUnpublishedAction().getActionConfiguration() != null
+                            && action.getUnpublishedAction().getActionConfiguration().getPluginSpecifiedTemplates() != null
+                            && action.getUnpublishedAction().getActionConfiguration().getPluginSpecifiedTemplates().size() > 3) {
+
+                        String path = null;
+                        String op = null;
+                        String value = null;
+                        List<Property> properties = action.getUnpublishedAction().getActionConfiguration().getPluginSpecifiedTemplates();
+                        if (properties.size() > 3 && properties.get(3) != null) {
+                            path = (String) properties.get(3).getValue();
+                        }
+                        if (properties.size() > 4 && properties.get(4) != null) {
+                            op = (String) properties.get(4).getValue();
+                            properties.set(4, null); // Index 4 does not map to any value in the new query format
+                        }
+                        if (properties.size() > 5 && properties.get(5) != null) {
+                            value = (String) properties.get(5).getValue();
+                            properties.set(5, null); // Index 5 does not map to any value in the new query format
+                        }
+
+                        Map newFormat = new HashMap();
+                        newFormat.put("path", path);
+                        newFormat.put("operator", op);
+                        newFormat.put("value", value);
+                        properties.set(3, new Property("whereConditionTuples", List.of(newFormat)));
+                    }
+
+                    // For published action
+                    if (action.getPublishedAction() != null
+                            && action.getPublishedAction().getActionConfiguration() != null
+                            && action.getPublishedAction().getActionConfiguration().getPluginSpecifiedTemplates() != null
+                            && action.getPublishedAction().getActionConfiguration().getPluginSpecifiedTemplates().size() > 3) {
+
+                        String path = null;
+                        String op = null;
+                        String value = null;
+                        List<Property> properties = action.getPublishedAction().getActionConfiguration().getPluginSpecifiedTemplates();
+                        if (properties.size() > 3 && properties.get(3) != null) {
+                            path = (String) properties.get(3).getValue();
+                        }
+                        if (properties.size() > 4 && properties.get(4) != null) {
+                            op = (String) properties.get(4).getValue();
+                            properties.set(4, null); // Index 4 does not map to any value in the new query format
+                        }
+                        if (properties.size() > 5 && properties.get(5) != null) {
+                            value = (String) properties.get(5).getValue();
+                            properties.set(5, null); // Index 5 does not map to any value in the new query format
+                        }
+
+                        HashMap newFormat = new HashMap();
+                        newFormat.put("path", path);
+                        newFormat.put("operator", op);
+                        newFormat.put("value", value);
+                        properties.set(3, new Property("whereConditionTuples", List.of(newFormat)));
+                    }
+                });
+
+        /**
+         * - Save changes only after all the processing is done so that in case any data manipulation fails, no data
+         * write occurs.
+         * - Write data back to db only if all data manipulations done above have succeeded.
+         */
+        firestoreActionQueries.stream()
+                .forEach(action -> mongoTemplate.save(action));
+    }
+
+    @ChangeSet(order = "071", id = "add-application-export-permissions", author = "")
+    public void addApplicationExportPermissions(MongoTemplate mongoTemplate) {
+        final List<Organization> organizations = mongoTemplate.find(
+                query(where("userRoles").exists(true)),
+                Organization.class
+        );
+
+        for (final Organization organization : organizations) {
+            Set<String> adminUsernames = organization.getUserRoles()
+                    .stream()
+                    .filter(role -> (role.getRole().equals(AppsmithRole.ORGANIZATION_ADMIN)))
+                    .map(role -> role.getUsername())
+                    .collect(Collectors.toSet());
+
+            if (adminUsernames.isEmpty()) {
+                continue;
+            }
+            // All the administrators of the organization should be allowed to export applications permission
+            Set<String> exportApplicationPermissionUsernames = new HashSet<>();
+            exportApplicationPermissionUsernames.addAll(adminUsernames);
+
+            Set<Policy> policies = organization.getPolicies();
+            if (policies == null) {
+                policies = new HashSet<>();
+            }
+
+            Optional<Policy> exportAppOrgLevelOptional = policies.stream()
+                    .filter(policy -> policy.getPermission().equals(ORGANIZATION_EXPORT_APPLICATIONS.getValue())).findFirst();
+
+            if (exportAppOrgLevelOptional.isPresent()) {
+                Policy exportApplicationPolicy = exportAppOrgLevelOptional.get();
+                exportApplicationPolicy.getUsers().addAll(exportApplicationPermissionUsernames);
+            } else {
+                // this policy doesnt exist. create and add this to the policy set
+                Policy inviteUserPolicy = Policy.builder().permission(ORGANIZATION_EXPORT_APPLICATIONS.getValue())
+                        .users(exportApplicationPermissionUsernames).build();
+                organization.getPolicies().add(inviteUserPolicy);
+            }
+
+            mongoTemplate.save(organization);
+
+            // Update the applications with export applications policy for all administrators of the organization
+            List<Application> orgApplications = mongoTemplate.find(
+                    query(where(fieldName(QApplication.application.organizationId)).is(organization.getId())),
+                    Application.class
+            );
+
+            for (final Application application : orgApplications) {
+                Set<Policy> applicationPolicies = application.getPolicies();
+                if (applicationPolicies == null) {
+                    applicationPolicies = new HashSet<>();
+                }
+
+                Optional<Policy> exportAppOptional = applicationPolicies.stream()
+                        .filter(policy -> policy.getPermission().equals(EXPORT_APPLICATIONS.getValue())).findFirst();
+
+                if (exportAppOptional.isPresent()) {
+                    Policy exportAppPolicy = exportAppOptional.get();
+                    exportAppPolicy.getUsers().addAll(adminUsernames);
+                } else {
+                    // this policy doesn't exist, create and add this to the policy set
+                    Policy newExportAppPolicy = Policy.builder().permission(EXPORT_APPLICATIONS.getValue())
+                            .users(adminUsernames).build();
+                    application.getPolicies().add(newExportAppPolicy);
+                }
+                
+                mongoTemplate.save(application);
+            }
+        }
+    }
+
+    private List<Property> generateMongoFormConfigTemplates(Map<Integer, Object> configuration) {
+        List<Property> templates = new ArrayList<>();
+        for (int i = 0; i < 22; i++) {
+            Property template = new Property();
+            if (configuration.containsKey(i)) {
+                template.setValue(configuration.get(i));
+            }
+            templates.add(template);
+        }
+        return templates;
+    }
+
+    @ChangeSet(order = "072", id = "add-snowflake-plugin", author = "")
+    public void addSnowflakePlugin(MongockTemplate mongoTemplate) {
+        Plugin plugin = new Plugin();
+        plugin.setName("Snowflake");
+        plugin.setType(PluginType.DB);
+        plugin.setPackageName("snowflake-plugin");
+        plugin.setUiComponent("DbEditorForm");
+        plugin.setDatasourceComponent("AutoForm");
+        plugin.setResponseType(Plugin.ResponseType.TABLE);
+        plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/Snowflake.png");
+        plugin.setDocumentationLink("https://docs.appsmith.com/datasource-reference/querying-snowflake-db");
+        plugin.setDefaultInstall(true);
+        try {
+            mongoTemplate.insert(plugin);
+        } catch (DuplicateKeyException e) {
+            log.warn(plugin.getPackageName() + " already present in database.");
+        }
+
+        installPluginToAllOrganizations(mongoTemplate, plugin.getId());
+
+    }
+
+    @ChangeSet(order = "073", id = "mongo-form-merge-update-commands", author = "")
+    public void migrateUpdateOneToUpdateManyMongoFormCommand(MongockTemplate mongockTemplate) {
+
+        Plugin mongoPlugin = mongockTemplate.findOne(query(where("packageName").is("mongo-plugin")), Plugin.class);
+
+        // Fetch all the actions built on top of a mongo database with command type update_one or update_many
+        assert mongoPlugin != null;
+        List<NewAction> updateMongoActions = mongockTemplate.find(
+                query(new Criteria().andOperator(
+                        where(fieldName(QNewAction.newAction.pluginId)).is(mongoPlugin.getId()))),
+                NewAction.class
+        )
+                .stream()
+                .filter(mongoAction -> {
+                    if (mongoAction.getUnpublishedAction() == null || mongoAction.getUnpublishedAction().getActionConfiguration() == null) {
+                        return false;
+                    }
+                    final List<Property> pluginSpecifiedTemplates = mongoAction.getUnpublishedAction().getActionConfiguration().getPluginSpecifiedTemplates();
+
+                    // Filter out all the actions which are of either of the two update command type
+                    if (pluginSpecifiedTemplates != null && pluginSpecifiedTemplates.size() == 21) {
+                        Property commandProperty = pluginSpecifiedTemplates.get(2);
+                        if (commandProperty != null && commandProperty.getValue() != null) {
+                            String command = (String) commandProperty.getValue();
+                            if (command.equals("UPDATE_ONE") || command.equals("UPDATE_MANY")) {
+                                return true;
+                            }
+                        }
+                    }
+                    // Not an action of interest for migration.
+                    return false;
+                })
+                .collect(Collectors.toList());
+
+        for (NewAction action : updateMongoActions) {
+            List<Property> pluginSpecifiedTemplates = action.getUnpublishedAction().getActionConfiguration().getPluginSpecifiedTemplates();
+            String command = (String) pluginSpecifiedTemplates.get(2).getValue();
+
+            // In case of update one, migrate the query and update configurations.
+            if (command.equals("UPDATE_ONE")) {
+
+                String query = "";
+                String update = "";
+                String collection = "";
+
+                Property queryProperty = pluginSpecifiedTemplates.get(8);
+                if (queryProperty != null) {
+                    query = (String) queryProperty.getValue();
+                }
+
+                Property updateProperty = pluginSpecifiedTemplates.get(10);
+                if (updateProperty != null) {
+                    update = (String) updateProperty.getValue();
+                }
+
+                Property collectionProperty = pluginSpecifiedTemplates.get(19);
+                if (collectionProperty != null) {
+                    collection = (String) collectionProperty.getValue();
+                }
+
+                Map<Integer, Object> configMap = new HashMap<>();
+                configMap.put(0, pluginSpecifiedTemplates.get(0).getValue());
+                configMap.put(1, "FORM");
+                // All update commands have to be migrated to the new update name
+                configMap.put(2, "UPDATE");
+                configMap.put(19, collection);
+                // Query for all the documents in the collection
+                configMap.put(11, query);
+                configMap.put(12, update);
+                configMap.put(21, "SINGLE");
+
+                List<Property> updatedTemplates = generateMongoFormConfigTemplates(configMap);
+                action.getUnpublishedAction().getActionConfiguration().setPluginSpecifiedTemplates(updatedTemplates);
+
+            }
+        }
+
+        // Now that all the actions have been updated, save all the actions
+        for (NewAction action : updateMongoActions) {
+            mongockTemplate.save(action);
+        }
+    }
+
+    
+    @ChangeSet(order = "074", id = "ensure-user-created-and-updated-at-fields", author = "")
+    public void ensureUserCreatedAndUpdatedAt(MongoTemplate mongoTemplate) {
+        final List<User> missingCreatedAt = mongoTemplate.find(
+            query(where("createdAt").exists(false)),
+            User.class
+        );
+
+        for (User user : missingCreatedAt) {
+            user.setCreatedAt(Instant.parse("2019-01-07T00:00:00.00Z"));
+            mongoTemplate.save(user);
+        }
+
+        final List<User> missingUpdatedAt = mongoTemplate.find(
+            query(where("updatedAt").exists(false)),
+            User.class
+        );
+
+        for (User user : missingUpdatedAt) {
+            user.setUpdatedAt(Instant.now());
+            mongoTemplate.save(user);
+        }
+    }
+  
+    /**
+     * - Older order file where not present for the pages created within the application because page reordering with in
+     * the application was not supported.
+     * - New Form order field will be added to the Page object and is used to order the pages with in the application
+     * Since the previously created pages doesnt have the order, we will be updating/adding order to all the previously
+     * created pages of all the application present.
+     * - []
+     */
+    @ChangeSet(order = "075", id = "add-and-update-order-for-all-pages", author = "")
+    public void addOrderToAllPagesOfApplication(MongoTemplate mongoTemplate) {
+        for (Application application : mongoTemplate.findAll(Application.class)) {
+            if(application.getPages() != null) {
+                int i = 0;
+                for (ApplicationPage page : application.getPages()) {
+                    page.setOrder(i);
+                    i++;
+                }
+                if(application.getPublishedPages() != null) {
+                    i = 0;
+                    for (ApplicationPage page : application.getPublishedPages()) {
+                        page.setOrder(i);
+                        i++;
+                    }
+                }
+                mongoTemplate.save(application);
+            }
+        }
+    }
+
+    @ChangeSet(order = "076", id = "mongo-form-migrate-raw", author = "")
+    public void migrateRawInputTypeToRawCommand(MongockTemplate mongockTemplate) {
+
+        Plugin mongoPlugin = mongockTemplate.findOne(query(where("packageName").is("mongo-plugin")), Plugin.class);
+
+        // Fetch all the actions built on top of a mongo database with input type set to raw.
+        assert mongoPlugin != null;
+        List<NewAction> rawMongoQueryActions = mongockTemplate.find(
+                query(new Criteria().andOperator(
+                        where(fieldName(QNewAction.newAction.pluginId)).is(mongoPlugin.getId()))),
+                NewAction.class
+        )
+                .stream()
+                .filter(mongoAction -> {
+                    boolean result = false;
+                    if (mongoAction.getUnpublishedAction() == null || mongoAction.getUnpublishedAction().getActionConfiguration() == null) {
+                        return false;
+                    }
+
+                    List<Property> pluginSpecifiedTemplates = mongoAction.getUnpublishedAction().getActionConfiguration().getPluginSpecifiedTemplates();
+
+                    // Filter out all the unpublished actions which have the input type raw configured.
+                    if (pluginSpecifiedTemplates != null && pluginSpecifiedTemplates.size() >= 2) {
+                        Property inputTypeProperty = pluginSpecifiedTemplates.get(1);
+                        if (inputTypeProperty != null && inputTypeProperty.getValue() != null) {
+                            String inputType = (String) inputTypeProperty.getValue();
+                            if (inputType.equals("RAW")) {
+                                result = true;
+                            }
+                        }
+                    }
+
+                    ActionDTO publishedAction = mongoAction.getPublishedAction();
+                    if (publishedAction != null && publishedAction.getActionConfiguration() != null) {
+                        pluginSpecifiedTemplates = publishedAction.getActionConfiguration().getPluginSpecifiedTemplates();
+
+                        // Filter out all the published actions which have the input type raw configured.
+                        if (pluginSpecifiedTemplates != null && pluginSpecifiedTemplates.size() >= 2) {
+                            Property inputTypeProperty = pluginSpecifiedTemplates.get(1);
+                            if (inputTypeProperty != null && inputTypeProperty.getValue() != null) {
+                                String inputType = (String) inputTypeProperty.getValue();
+                                if (inputType.equals("RAW")) {
+                                    result = true;
+                                }
+                            }
+                        }
+                    }
+                    return result;
+                })
+                .collect(Collectors.toList());
+
+        for (NewAction action : rawMongoQueryActions) {
+
+            Boolean smartSub = true;
+            Property smartSubProperty;
+            Map<Integer, Object> configMap;
+            List<Property> updatedTemplates;
+
+            // Migrate the unpublished actions
+            List<Property> pluginSpecifiedTemplates = action.getUnpublishedAction().getActionConfiguration().getPluginSpecifiedTemplates();
+            if (pluginSpecifiedTemplates != null) {
+                smartSubProperty = pluginSpecifiedTemplates.get(0);
+                if (smartSubProperty != null) {
+                    Object value = smartSubProperty.getValue();
+                    if (value instanceof Boolean) {
+                        smartSub = (Boolean) value;
+                    } else if (value instanceof String) {
+                        smartSub = Boolean.parseBoolean((String) value);
+                    }
+                }
+
+                configMap = new HashMap<>();
+                configMap.put(0, smartSub);
+                configMap.put(2, "RAW");
+
+                updatedTemplates = generateMongoFormConfigTemplates(configMap);
+                action.getUnpublishedAction().getActionConfiguration().setPluginSpecifiedTemplates(updatedTemplates);
+            }
+
+
+            // Now migrate the published actions
+            ActionDTO publishedAction = action.getPublishedAction();
+            if (publishedAction != null && publishedAction.getActionConfiguration() != null) {
+                pluginSpecifiedTemplates = publishedAction.getActionConfiguration().getPluginSpecifiedTemplates();
+
+                if (pluginSpecifiedTemplates != null) {
+                    smartSub = true;
+                    smartSubProperty = pluginSpecifiedTemplates.get(0);
+                    if (smartSubProperty != null) {
+                        Object value = smartSubProperty.getValue();
+                        if (value instanceof Boolean) {
+                            smartSub = (Boolean) value;
+                        } else if (value instanceof String) {
+                            smartSub = Boolean.parseBoolean((String) value);
+                        }
+                    }
+
+                    configMap = new HashMap<>();
+                    configMap.put(0, smartSub);
+                    configMap.put(2, "RAW");
+
+                    updatedTemplates = generateMongoFormConfigTemplates(configMap);
+                    action.getPublishedAction().getActionConfiguration().setPluginSpecifiedTemplates(updatedTemplates);
+                }
+            }
+        }
+
+        // Now that all the actions have been updated, save all the actions
+        for (NewAction action : rawMongoQueryActions) {
+            mongockTemplate.save(action);
+        }
+    }
+
+    @ChangeSet(order = "077", id = "add-arangodb-plugin", author = "")
+    public void addArangoDBPlugin(MongockTemplate mongoTemplate) {
+        Plugin plugin = new Plugin();
+        plugin.setName("ArangoDB");
+        plugin.setType(PluginType.DB);
+        plugin.setPackageName("arangodb-plugin");
+        plugin.setUiComponent("DbEditorForm");
+        plugin.setDatasourceComponent("AutoForm");
+        plugin.setResponseType(Plugin.ResponseType.TABLE);
+        plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/ArangoDB.png");
+        plugin.setDocumentationLink("https://docs.appsmith.com/datasource-reference/querying-arango-db");
+        plugin.setDefaultInstall(true);
+        try {
+            mongoTemplate.insert(plugin);
+        } catch (DuplicateKeyException e) {
+            log.warn(plugin.getPackageName() + " already present in database.");
+        }
+
+        installPluginToAllOrganizations(mongoTemplate, plugin.getId());
+    }
+
+    @ChangeSet(order = "078", id = "set-svg-logo-to-plugins", author = "")
+    public void setSvgLogoToPluginIcons(MongockTemplate mongoTemplate) {
+        for (Plugin plugin : mongoTemplate.findAll(Plugin.class)) {
+            if ("postgres-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/postgresql.svg");
+            } else if ("dynamo-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/aws-dynamodb.svg");
+            } else if ("firestore-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/firestore.svg");
+            } else if ("redshift-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/aws-redshift.svg");
+            } else if ("mongo-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/mongodb.svg");
+            } else if ("redis-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/redis.svg");
+            } else if ("amazons3-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/aws-s3.svg");
+            } else if ("mssql-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/mssql.svg");
+            } else if ("snowflake-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/snowflake.svg");
+            } else if ("elasticsearch-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/elastic.svg");
+            } else if ("mysql-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/mysql.svg");
+            } else if ("arangodb-plugin".equals(plugin.getPackageName())) {
+                plugin.setIconLocation("https://s3.us-east-2.amazonaws.com/assets.appsmith.com/logo/arangodb.svg");
+            } else {
+                continue;
+            }
+
+            mongoTemplate.save(plugin);
+        }
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/notifications/EmailSender.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/notifications/EmailSender.java
index e9062dd637..c90ad40cf8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/notifications/EmailSender.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/notifications/EmailSender.java
@@ -43,7 +43,7 @@ public class EmailSender {
         REPLY_TO = makeReplyTo();
     }
 
-    public Mono<Boolean> sendMail(String to, String subject, String text, Map<String, String> params) {
+    public Mono<Boolean> sendMail(String to, String subject, String text, Map<String, ? extends Object> params) {
 
         /**
          * Creating a publisher which sends email in a blocking fashion, subscribing on the bounded elastic
@@ -104,6 +104,8 @@ public class EmailSender {
             helper.setSubject(subject);
             helper.setText(text, true);
             javaMailSender.send(mimeMessage);
+
+            log.debug("Email sent successfully to {} with subject {}", to, subject);
         } catch (MessagingException e) {
             log.error("Unable to create the mime message while sending an email to {} with subject: {}. Cause: ", to, subject, e);
         } catch (MailException e) {
@@ -120,7 +122,7 @@ public class EmailSender {
      * @return Template string with Mustache replacements applied.
      * @throws IOException bubbled from Mustache renderer.
      */
-    private String replaceEmailTemplate(String template, Map<String, String> params) throws IOException {
+    private String replaceEmailTemplate(String template, Map<String, ? extends Object> params) throws IOException {
         MustacheFactory mf = new DefaultMustacheFactory();
         StringWriter stringWriter = new StringWriter();
         Mustache mustache = mf.compile(template);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java
index 02f4021033..71ddf35d9d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java
@@ -20,6 +20,7 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -143,22 +144,36 @@ public abstract class BaseAppsmithRepositoryImpl<T extends BaseDomain> {
                 .map(ctx -> ctx.getAuthentication())
                 .flatMap(auth -> {
                     User user = (User) auth.getPrincipal();
-                    Query query = new Query();
-                    criterias.stream()
-                            .forEach(criteria -> query.addCriteria(criteria));
-                    if (aclPermission == null) {
-                        query.addCriteria(new Criteria().andOperator(notDeleted()));
-                    } else {
-                        query.addCriteria(new Criteria().andOperator(notDeleted(), userAcl(user, aclPermission)));
-                    }
-
                     return mongoOperations.query(this.genericDomain)
-                            .matching(query)
+                            .matching(createQueryWithPermission(criterias, auth,aclPermission))
                             .one()
                             .map(obj -> (T) setUserPermissionsInObject(obj, user));
                 });
     }
 
+    private Query createQueryWithPermission(List<Criteria> criterias, Authentication auth, AclPermission aclPermission) {
+        User user = (User) auth.getPrincipal();
+        Query query = new Query();
+        criterias.stream()
+                .forEach(criteria -> query.addCriteria(criteria));
+        if (aclPermission == null) {
+            query.addCriteria(new Criteria().andOperator(notDeleted()));
+        } else {
+            query.addCriteria(new Criteria().andOperator(notDeleted(), userAcl(user, aclPermission)));
+        }
+        return query;
+    }
+
+    protected Mono<Long> count(List<Criteria> criterias, AclPermission aclPermission) {
+        return ReactiveSecurityContextHolder.getContext()
+                .map(ctx -> ctx.getAuthentication())
+                .flatMap(auth ->
+                    mongoOperations.count(
+                            createQueryWithPermission(criterias, auth, aclPermission), this.genericDomain
+                    )
+                );
+    }
+
     public Flux<T> queryAll(List<Criteria> criterias, AclPermission aclPermission) {
         return queryAll(criterias, aclPermission, null);
     }
@@ -168,14 +183,7 @@ public abstract class BaseAppsmithRepositoryImpl<T extends BaseDomain> {
                 .map(ctx -> ctx.getAuthentication())
                 .flatMapMany(auth -> {
                     User user = (User) auth.getPrincipal();
-                    Query query = new Query();
-                    criterias.stream()
-                            .forEach(criteria -> query.addCriteria(criteria));
-                    if (aclPermission == null) {
-                        query.addCriteria(new Criteria().andOperator(notDeleted()));
-                    } else {
-                        query.addCriteria(new Criteria().andOperator(notDeleted(), userAcl(user, aclPermission)));
-                    }
+                    Query query = createQueryWithPermission(criterias, auth, aclPermission);
                     if (sort != null) {
                         query.with(sort);
                     }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepository.java
index 435c489799..80d1aa0761 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepository.java
@@ -2,10 +2,12 @@ package com.appsmith.server.repositories;
 
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.ApplicationPage;
 import com.mongodb.client.result.UpdateResult;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
 import java.util.Set;
 
 public interface CustomApplicationRepository extends AppsmithRepository<Application> {
@@ -20,7 +22,9 @@ public interface CustomApplicationRepository extends AppsmithRepository<Applicat
 
     Flux<Application> findByClonedFromApplicationId(String applicationId, AclPermission permission);
 
-    Mono<UpdateResult> addPageToApplication(String applicationId, String pageId, boolean isDefault);
+    Mono<UpdateResult> addPageToApplication(String applicationId, String pageId, boolean isDefault, Integer order);
+
+    Mono<UpdateResult> setPages(String applicationId, List<ApplicationPage> pages);
 
     Mono<UpdateResult> setDefaultPage(String applicationId, String pageId);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepositoryImpl.java
index c89afbed96..93ed1e9f84 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepositoryImpl.java
@@ -73,11 +73,20 @@ public class CustomApplicationRepositoryImpl extends BaseAppsmithRepositoryImpl<
     }
 
     @Override
-    public Mono<UpdateResult> addPageToApplication(String applicationId, String pageId, boolean isDefault) {
-        final ApplicationPage applicationPage = new ApplicationPage(pageId, isDefault);
+    public Mono<UpdateResult> addPageToApplication(String applicationId, String pageId, boolean isDefault, Integer order) {
+        final ApplicationPage applicationPage = new ApplicationPage(pageId, isDefault, order);
         return mongoOperations.updateFirst(
                 Query.query(getIdCriteria(applicationId)),
-                new Update().addToSet(FieldName.PAGES, applicationPage),
+                new Update().addToSet(fieldName(QApplication.application.pages), applicationPage),
+                Application.class
+        );
+    }
+
+    @Override
+    public Mono<UpdateResult> setPages(String applicationId, List<ApplicationPage> pages) {
+        return mongoOperations.updateFirst(
+                Query.query(getIdCriteria(applicationId)),
+                new Update().set(fieldName(QApplication.application.pages), pages),
                 Application.class
         );
     }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentRepository.java
index 816b1e2ae4..e071c9ae9e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentRepository.java
@@ -1,7 +1,15 @@
 package com.appsmith.server.repositories;
 
 import com.appsmith.server.domains.Comment;
+import com.mongodb.client.result.UpdateResult;
+import reactor.core.publisher.Mono;
 
 public interface CustomCommentRepository extends AppsmithRepository<Comment> {
 
+    Mono<UpdateResult> pushReaction(String commentId, Comment.Reaction reaction);
+
+    Mono<UpdateResult> deleteReaction(String commentId, Comment.Reaction reaction);
+
+    Mono<Void> updateAuthorNames(String authorId, String authorName);
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentRepositoryImpl.java
index 0bb974fea9..a8bfd5cbfa 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentRepositoryImpl.java
@@ -1,10 +1,18 @@
 package com.appsmith.server.repositories;
 
 import com.appsmith.server.domains.Comment;
+import com.appsmith.server.domains.QComment;
+import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import static org.springframework.data.mongodb.core.query.Criteria.where;
 
 @Component
 @Slf4j
@@ -14,4 +22,54 @@ public class CustomCommentRepositoryImpl extends BaseAppsmithRepositoryImpl<Comm
         super(mongoOperations, mongoConverter);
     }
 
+    /**
+     * Add a reaction, by a user, if the reaction by that user already doesn't exist on this comment.
+     * @param commentId UUID string of the comment to add the reaction to.
+     * @param reaction The reaction object to add to the comment.
+     * @return Mono that publishes an UpdateResult that will contain the number of reactions added. It's only ever 0 or 1.
+     */
+    @Override
+    public Mono<UpdateResult> pushReaction(String commentId, Comment.Reaction reaction) {
+        final String reactionsField = fieldName(QComment.comment.reactions);
+        return mongoOperations.updateFirst(
+                Query.query(new Criteria().andOperator(
+                        where("id").is(commentId),
+                        Criteria
+                                .where(reactionsField)
+                                .not()
+                                .elemMatch(where("emoji").is(reaction.getEmoji()).and("byUsername").is(reaction.getByUsername()))
+                )),
+                new Update().addToSet(reactionsField, reaction),
+                Comment.class
+        );
+    }
+
+    /**
+     * Atomically delete a reaction, by a user, if the reaction by that user exists on this comment.
+     * @param commentId UUID string of the comment on which to delete a reaction.
+     * @param reaction The reaction object to be deleted.
+     * @return Mono that publishes an UpdateResult that will contain the number of reactions deleted. It's usually 0 or 1, but can theoretically be more.
+     */
+    @Override
+    public Mono<UpdateResult> deleteReaction(String commentId, Comment.Reaction reaction) {
+        reaction.setByName(null);
+        reaction.setCreatedAt(null);
+        return mongoOperations.updateFirst(
+                Query.query(where("id").is(commentId)),
+                new Update().pull(fieldName(QComment.comment.reactions), reaction),
+                Comment.class
+        );
+    }
+
+    @Override
+    public Mono<Void> updateAuthorNames(String authorId, String authorName) {
+        return mongoOperations
+                .updateMulti(
+                        Query.query(Criteria.where("authorId").is(authorId)),
+                        Update.update("authorName", authorName),
+                        Comment.class
+                )
+                .then();
+    }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentThreadRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentThreadRepository.java
index 7d121d0978..9587950a62 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentThreadRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentThreadRepository.java
@@ -2,10 +2,14 @@ package com.appsmith.server.repositories;
 
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.CommentThread;
+import com.mongodb.client.result.UpdateResult;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Set;
 
 public interface CustomCommentThreadRepository extends AppsmithRepository<CommentThread> {
-
     Flux<CommentThread> findByApplicationId(String applicationId, AclPermission permission);
-
+    Mono<UpdateResult> addToSubscribers(String threadId, Set<String> usernames);
+    Mono<Long> countUnreadThreads(String applicationId, String userEmail);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentThreadRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentThreadRepositoryImpl.java
index 80f44f5dcd..ac943af1b1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentThreadRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomCommentThreadRepositoryImpl.java
@@ -3,20 +3,26 @@ package com.appsmith.server.repositories;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.CommentThread;
 import com.appsmith.server.domains.QCommentThread;
+import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import java.util.List;
+import java.util.Set;
 
 import static org.springframework.data.mongodb.core.query.Criteria.where;
 
 @Component
 @Slf4j
-public class CustomCommentThreadRepositoryImpl extends BaseAppsmithRepositoryImpl<CommentThread> implements CustomCommentThreadRepository {
+public class CustomCommentThreadRepositoryImpl extends BaseAppsmithRepositoryImpl<CommentThread>
+        implements CustomCommentThreadRepository {
 
     public CustomCommentThreadRepositoryImpl(ReactiveMongoOperations mongoOperations, MongoConverter mongoConverter) {
         super(mongoOperations, mongoConverter);
@@ -28,4 +34,25 @@ public class CustomCommentThreadRepositoryImpl extends BaseAppsmithRepositoryImp
         return queryAll(List.of(criteria), permission);
     }
 
+    /**
+     * Adds the provided username i.e. email address to the subscriber list of this thread
+     * @return updated result object
+     */
+    @Override
+    public Mono<UpdateResult> addToSubscribers(String threadId, Set<String> usernames) {
+        return mongoOperations.updateFirst(
+                Query.query(where("id").is(threadId)),
+                new Update().addToSet(fieldName(QCommentThread.commentThread.subscribers)).each(usernames),
+                CommentThread.class
+        );
+    }
+
+    @Override
+    public Mono<Long> countUnreadThreads(String applicationId, String userEmail) {
+        List<Criteria> criteriaList = List.of(
+            where(fieldName(QCommentThread.commentThread.viewedByUsers)).ne(userEmail),
+            where(fieldName(QCommentThread.commentThread.applicationId)).is(applicationId)
+        );
+        return count(criteriaList, AclPermission.READ_THREAD);
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomDatasourceRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomDatasourceRepository.java
index efe7fa06c9..c1e46d8b85 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomDatasourceRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomDatasourceRepository.java
@@ -12,7 +12,7 @@ import java.util.Set;
 public interface CustomDatasourceRepository extends AppsmithRepository<Datasource> {
     Flux<Datasource> findAllByOrganizationId(String organizationId, AclPermission permission);
 
-    Mono<Datasource> findByName(String name, AclPermission aclPermission);
+    Mono<Datasource> findByNameAndOrganizationId(String name, String organizationId, AclPermission aclPermission);
 
     Mono<Datasource> findById(String id, AclPermission aclPermission);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomDatasourceRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomDatasourceRepositoryImpl.java
index a7774860d2..e6b416649e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomDatasourceRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomDatasourceRepositoryImpl.java
@@ -33,9 +33,10 @@ public class CustomDatasourceRepositoryImpl extends BaseAppsmithRepositoryImpl<D
     }
 
     @Override
-    public Mono<Datasource> findByName(String name, AclPermission aclPermission) {
+    public Mono<Datasource> findByNameAndOrganizationId(String name, String organizationId, AclPermission aclPermission) {
         Criteria nameCriteria = where(fieldName(QDatasource.datasource.name)).is(name);
-        return queryOne(List.of(nameCriteria), aclPermission);
+        Criteria orgIdCriteria = where(fieldName(QDatasource.datasource.organizationId)).is(organizationId);
+        return queryOne(List.of(nameCriteria, orgIdCriteria), aclPermission);
     }
 
     @Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepository.java
new file mode 100644
index 0000000000..48aeeaa18a
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepository.java
@@ -0,0 +1,12 @@
+package com.appsmith.server.repositories;
+
+import com.appsmith.server.domains.Notification;
+import com.mongodb.client.result.UpdateResult;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+public interface CustomNotificationRepository extends AppsmithRepository<Notification> {
+    Mono<UpdateResult> updateIsReadByForUsernameAndIdList(String forUsername, List<String> idList, boolean isRead);
+    Mono<UpdateResult> updateIsReadByForUsername(String forUsername, boolean isRead);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepositoryImpl.java
new file mode 100644
index 0000000000..136f380d9f
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepositoryImpl.java
@@ -0,0 +1,42 @@
+package com.appsmith.server.repositories;
+
+import com.appsmith.server.domains.Notification;
+import com.appsmith.server.domains.QNotification;
+import com.mongodb.client.result.UpdateResult;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.query.Update;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
+
+public class CustomNotificationRepositoryImpl extends BaseAppsmithRepositoryImpl<Notification>
+        implements CustomNotificationRepository {
+
+    public CustomNotificationRepositoryImpl(ReactiveMongoOperations mongoOperations, MongoConverter mongoConverter) {
+        super(mongoOperations, mongoConverter);
+    }
+
+    @Override
+    public Mono<UpdateResult> updateIsReadByForUsernameAndIdList(String forUsername, List<String> idList, boolean isRead) {
+        return mongoOperations.updateMulti(
+                query(where(fieldName(QNotification.notification.forUsername)).is(forUsername)
+                        .and(fieldName(QNotification.notification.id)).in(idList)
+                ),
+                new Update().set(fieldName(QNotification.notification.isRead), isRead),
+                Notification.class
+        );
+    }
+
+    @Override
+    public Mono<UpdateResult> updateIsReadByForUsername(String forUsername, boolean isRead) {
+        return mongoOperations.updateMulti(
+                query(where(fieldName(QNotification.notification.forUsername)).is(forUsername)),
+                new Update().set(fieldName(QNotification.notification.isRead), isRead),
+                Notification.class
+        );
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java
index 3d80001be8..59d9e1f33a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java
@@ -16,4 +16,5 @@ public interface CustomOrganizationRepository extends AppsmithRepository<Organiz
 
     Mono<Long> nextSlugNumber(String slugPrefix);
 
+    Mono<Void> updateUserRoleNames(String userId, String userName);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java
index 9b45fa8d70..b96c0ff0b8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java
@@ -1,6 +1,7 @@
 package com.appsmith.server.repositories;
 
 import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.domains.Comment;
 import com.appsmith.server.domains.Organization;
 import com.appsmith.server.domains.QOrganization;
 import lombok.extern.slf4j.Slf4j;
@@ -9,6 +10,7 @@ import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -66,4 +68,14 @@ public class CustomOrganizationRepositoryImpl extends BaseAppsmithRepositoryImpl
                 });
     }
 
+    @Override
+    public Mono<Void> updateUserRoleNames(String userId, String userName) {
+        return mongoOperations
+                .updateMulti(
+                        Query.query(Criteria.where("userRoles.userId").is(userId)),
+                        Update.update("userRoles.$.name", userName),
+                        Organization.class
+                )
+                .then();
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserDataRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserDataRepository.java
index cf6cf8d89a..102e12bd88 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserDataRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserDataRepository.java
@@ -7,5 +7,5 @@ import reactor.core.publisher.Mono;
 public interface CustomUserDataRepository extends AppsmithRepository<UserData> {
 
     Mono<UpdateResult> saveReleaseNotesViewedVersion(String userId, String version);
-
+    Mono<UpdateResult> removeOrgFromRecentlyUsedList(String userId, String organizationId);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserDataRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserDataRepositoryImpl.java
index 96010eb732..eea4a60049 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserDataRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserDataRepositoryImpl.java
@@ -31,4 +31,12 @@ public class CustomUserDataRepositoryImpl extends BaseAppsmithRepositoryImpl<Use
                 );
     }
 
+    @Override
+    public Mono<UpdateResult> removeOrgFromRecentlyUsedList(String userId, String organizationId) {
+        return mongoOperations.updateFirst(
+                query(where(fieldName(QUserData.userData.userId)).is(userId)),
+                new Update().pull(fieldName(QUserData.userData.recentlyUsedOrgIds), organizationId),
+                UserData.class
+                );
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserRepository.java
index 13782fee32..3fe8d060f9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserRepository.java
@@ -5,7 +5,6 @@ import com.appsmith.server.domains.User;
 import reactor.core.publisher.Mono;
 
 public interface CustomUserRepository extends AppsmithRepository<User> {
-
     Mono<User> findByEmail(String email, AclPermission aclPermission);
-
+    Mono<User> findByCaseInsensitiveEmail(String email);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserRepositoryImpl.java
index d22caefe43..6692cc2794 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomUserRepositoryImpl.java
@@ -7,10 +7,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
 import java.util.List;
+import java.util.regex.Pattern;
 
 import static org.springframework.data.mongodb.core.query.Criteria.where;
 
@@ -25,8 +27,15 @@ public class CustomUserRepositoryImpl extends BaseAppsmithRepositoryImpl<User> i
     @Override
     public Mono<User> findByEmail(String email, AclPermission aclPermission) {
         Criteria emailCriteria = where(fieldName(QUser.user.email)).is(email);
-
         return queryOne(List.of(emailCriteria), aclPermission);
     }
 
+    @Override
+    public Mono<User> findByCaseInsensitiveEmail(String email) {
+        String findEmailRegex = String.format("^%s$", Pattern.quote(email));
+        Criteria emailCriteria = where(fieldName(QUser.user.email)).regex(findEmailRegex, "i");
+        Query query = new Query();
+        query.addCriteria(emailCriteria);
+        return mongoOperations.findOne(query, User.class);
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/NotificationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/NotificationRepository.java
new file mode 100644
index 0000000000..80e6c5828e
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/NotificationRepository.java
@@ -0,0 +1,17 @@
+package com.appsmith.server.repositories;
+
+import com.appsmith.server.domains.Notification;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.Instant;
+
+@Repository
+public interface NotificationRepository extends BaseRepository<Notification, String>, CustomNotificationRepository {
+    Flux<Notification> findByForUsername(String userId, Pageable pageable);
+    Flux<Notification> findByForUsernameAndCreatedAtBefore(String userId, Instant instant, Pageable pageable);
+    Mono<Long> countByForUsername(String userId);
+    Mono<Long> countByForUsernameAndIsReadIsFalse(String userId);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java
index 6d2224f775..76e51eaf35 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java
@@ -13,4 +13,6 @@ public interface OrganizationRepository extends BaseRepository<Organization, Str
 
     Mono<Organization> findByName(String name);
 
+    Mono<Void> updateUserRoleNames(String userId, String userName);
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/UserRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/UserRepository.java
index 75d4de2e9b..408782e8fe 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/UserRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/UserRepository.java
@@ -7,4 +7,5 @@ import reactor.core.publisher.Mono;
 @Repository
 public interface UserRepository extends BaseRepository<User, String>, CustomUserRepository {
     Mono<User> findByEmail(String email);
+    Mono<User> findByCaseInsensitiveEmail(String email);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageService.java
index 5c66bc4bf2..09ca039955 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageService.java
@@ -33,5 +33,11 @@ public interface ApplicationPageService {
 
     Mono<PageDTO> deleteUnpublishedPage(String id);
 
-    Mono<Boolean> publish(String applicationId);
+    Mono<Application> publish(String applicationId);
+
+    void generateAndSetPagePolicies(Application application, PageDTO page);
+
+    Mono<Void> sendApplicationPublishedEvent(Application application);
+
+    Mono<Application> reorderPage(String applicationId, String pageId, Integer order);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
index 11e074e079..c3c8c5eb41 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
@@ -139,7 +139,8 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
      */
     @Override
     public Mono<UpdateResult> addPageToApplication(Application application, PageDTO page, Boolean isDefault) {
-        return applicationRepository.addPageToApplication(application.getId(), page.getId(), isDefault)
+        Integer order = application.getPages() != null ? application.getPages().size() : 0;
+        return applicationRepository.addPageToApplication(application.getId(), page.getId(), isDefault, order)
                 .doOnSuccess(result -> {
                     if (result.getModifiedCount() != 1) {
                         log.error("Add page to application didn't update anything, probably because application wasn't found.");
@@ -277,7 +278,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
                 });
     }
 
-    private void generateAndSetPagePolicies(Application application, PageDTO page) {
+    public void generateAndSetPagePolicies(Application application, PageDTO page) {
         Set<Policy> documentPolicies = policyGenerator.getAllChildPolicies(application.getPolicies(), Application.class, Page.class);
         page.setPolicies(documentPolicies);
     }
@@ -561,7 +562,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
      * @return Publishes a Boolean true, when the application has been published.
      */
     @Override
-    public Mono<Boolean> publish(String applicationId) {
+    public Mono<Application> publish(String applicationId) {
         Mono<Application> applicationMono = applicationService.findById(applicationId, MANAGE_APPLICATIONS)
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, applicationId)))
                 .cache();
@@ -642,13 +643,13 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
 
         return Mono.when(
                 publishApplicationAndPages.collectList(),
-                publishedActionsFlux.collectList(),
-                applicationMono.flatMap(this::sendApplicationPublishedEvent)
+                publishedActionsFlux.collectList()
         )
-                .thenReturn(true);
+                .then(applicationMono);
     }
 
-    private Mono<Void> sendApplicationPublishedEvent(Application application) {
+    @Override
+    public Mono<Void> sendApplicationPublishedEvent(Application application) {
         if (!analyticsService.isActive()) {
             return Mono.empty();
         }
@@ -667,4 +668,55 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
                 });
     }
 
+    /** This function walks through all the pages and reorders them and updates the order as per the user preference.
+     * A page can be moved up or down from the current position and accordingly the order of the remaining page changes.
+     * @param applicationId The id of the Application
+     * @param pageId Targetted page id
+     * @param order New order for the selected page
+     * @return Application object with the latest order
+     **/
+    @Override
+    public Mono<Application> reorderPage(String applicationId, String pageId, Integer order) {
+        return applicationService.findById(applicationId, MANAGE_APPLICATIONS)
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION, applicationId)))
+                .flatMap(application -> {
+                    // Update the order in unpublished pages here, since this should only ever happen in edit mode.
+                    final List<ApplicationPage> pages = application.getPages();
+
+                    ApplicationPage foundPage = null;
+                    for (final ApplicationPage page : pages) {
+                        if (pageId.equals(page.getId())) {
+                            foundPage = page;
+                        }
+                    }
+
+                    /* there are two cases where page is re-ordered. Lets assume there are five pages 1,2,3,4,5
+                     * Case 1(isMovingUp == true): p5 to p2, order of p2,p3,p4 increases by 1.
+                     *
+                     * Case 2(isMovingUp == false): p2 to p5, order of p3,p4,p5 decreases by 1.
+                     **/
+                    if(foundPage != null) {
+                        boolean isMovingUp = order < foundPage.getOrder();
+                        if(isMovingUp) {
+                            for (final ApplicationPage page : pages) {
+                                if (page.getOrder() < foundPage.getOrder() && page.getOrder() >= order) {
+                                    page.setOrder(page.getOrder()+1);
+                                }
+                            }
+                        } else {
+                            for (final ApplicationPage page : pages) {
+                                if (page.getOrder() > foundPage.getOrder() && page.getOrder() <= order) {
+                                    page.setOrder(page.getOrder()-1);
+                                }
+                            }
+                        }
+                        //set the selected page order to the given order
+                        foundPage.setOrder(order);
+                    }
+                    return applicationRepository
+                            .setPages(applicationId, pages)
+                            .then(applicationService.getById(applicationId));
+                });
+    }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
index 7607d78eb0..0850102d1d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
@@ -15,8 +15,10 @@ import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PolicyUtils;
 import com.appsmith.server.repositories.ApplicationRepository;
+import com.appsmith.server.repositories.CommentThreadRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.stereotype.Service;
@@ -42,6 +44,8 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
 
     private final PolicyUtils policyUtils;
     private final ConfigService configService;
+    private final CommentThreadRepository commentThreadRepository;
+    private final SessionUserService sessionUserService;
 
     @Autowired
     public ApplicationServiceImpl(Scheduler scheduler,
@@ -51,10 +55,13 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
                                   ApplicationRepository repository,
                                   AnalyticsService analyticsService,
                                   PolicyUtils policyUtils,
-                                  ConfigService configService) {
+                                  ConfigService configService,
+                                  CommentThreadRepository commentThreadRepository, SessionUserService sessionUserService) {
         super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
         this.policyUtils = policyUtils;
         this.configService = configService;
+        this.commentThreadRepository = commentThreadRepository;
+        this.sessionUserService = sessionUserService;
     }
 
     @Override
@@ -70,7 +77,25 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
 
         return repository.findById(id, READ_APPLICATIONS)
                 .flatMap(this::setTransientFields)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, id)));
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, id)))
+                .zipWith(sessionUserService.getCurrentUser())
+                .flatMap(objects -> {
+                    Application application = objects.getT1();
+                    User user = objects.getT2();
+                    return setUnreadCommentCount(application, user);
+                });
+    }
+
+    private Mono<Application> setUnreadCommentCount(Application application, User user) {
+        if(!user.isAnonymous()) {
+            return commentThreadRepository.countUnreadThreads(application.getId(), user.getUsername())
+                    .map(aLong -> {
+                        application.setUnreadCommentThreads(aLong);
+                        return application;
+                    });
+        } else {
+            return Mono.just(application);
+        }
     }
 
     @Override
@@ -127,7 +152,21 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
     public Mono<Application> update(String id, Application application) {
         application.setIsPublic(null);
         return repository.updateById(id, application, AclPermission.MANAGE_APPLICATIONS)
-                .flatMap(analyticsService::sendUpdateEvent);
+            .onErrorResume(error -> {
+                if (error instanceof DuplicateKeyException) {
+                    // Error message : E11000 duplicate key error collection: appsmith.application index:
+                    // organization_application_deleted_compound_index dup key:
+                    // { organizationId: "******", name: "AppName", deletedAt: null }
+                    if (error.getCause().getMessage().contains("name:")) {
+                        return Mono.error(
+                            new AppsmithException(AppsmithError.DUPLICATE_KEY_USER_ERROR, FieldName.APPLICATION, FieldName.NAME)
+                        );
+                    }
+                    return Mono.error(new AppsmithException(AppsmithError.DUPLICATE_KEY, error.getCause().getMessage()));
+                }
+                return Mono.error(error);
+            })
+            .flatMap(analyticsService::sendUpdateEvent);
     }
 
     @Override
@@ -135,11 +174,9 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
         return repository.archive(application);
     }
 
-
-
     @Override
     public Mono<Application> changeViewAccess(String id, ApplicationAccessDTO applicationAccessDTO) {
-        return repository
+        Mono<Application> updateApplicationMono = repository
                 .findById(id, MAKE_PUBLIC_APPLICATIONS)
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION, id)))
                 .flatMap(application -> {
@@ -156,6 +193,12 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
                     application.setIsPublic(applicationAccessDTO.getPublicAccess());
                     return generateAndSetPoliciesForPublicView(application, applicationAccessDTO.getPublicAccess());
                 });
+
+        //  Use a synchronous sink which does not take subscription cancellations into account. This that even if the
+        //  subscriber has cancelled its subscription, the create method will still generates its event.
+        return Mono.create(sink -> updateApplicationMono
+                .subscribe(sink::success, sink::error, null, sink.currentContext())
+        );
     }
 
     @Override
@@ -169,6 +212,12 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
                 .map(application -> {
                     application.setViewMode(true);
                     return application;
+                })
+                .zipWith(sessionUserService.getCurrentUser())
+                .flatMap(objects -> {
+                    Application application = objects.getT1();
+                    User user = objects.getT2();
+                    return setUnreadCommentCount(application, user);
                 });
     }
 
@@ -251,4 +300,5 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
                     return application;
                 });
     }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommentService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommentService.java
index 757a7f9794..29385441ea 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommentService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommentService.java
@@ -8,14 +8,21 @@ import java.util.List;
 
 public interface CommentService extends CrudService<Comment, String> {
 
-    Mono<Comment> create(String threadId, Comment organization);
+    Mono<Comment> create(String threadId, Comment organization, String originHeader);
 
-    Mono<CommentThread> createThread(CommentThread commentThread);
+    Mono<CommentThread> createThread(CommentThread commentThread, String originHeader);
 
-    Mono<CommentThread> updateThread(String threadId, CommentThread commentThread);
+    Mono<CommentThread> updateThread(String threadId, CommentThread commentThread, String originHeader);
 
     Mono<List<CommentThread>> getThreadsByApplicationId(String applicationId);
 
     Mono<Comment> deleteComment(String id);
 
+    Mono<CommentThread> deleteThread(String threadId);
+
+    Mono<Boolean> createReaction(String commentId, Comment.Reaction reaction);
+
+    Mono<Boolean> deleteReaction(String commentId, Comment.Reaction reaction);
+
+    Mono<Long> getUnreadCount(String applicationId);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommentServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommentServiceImpl.java
index 17f372b4e4..c724b41c78 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommentServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommentServiceImpl.java
@@ -1,24 +1,29 @@
 package com.appsmith.server.services;
 
+import com.appsmith.external.models.Policy;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.acl.PolicyGenerator;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.Comment;
 import com.appsmith.server.domains.CommentThread;
+import com.appsmith.server.domains.Notification;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.CommentUtils;
+import com.appsmith.server.helpers.PolicyUtils;
 import com.appsmith.server.repositories.CommentRepository;
 import com.appsmith.server.repositories.CommentThreadRepository;
+import com.appsmith.server.solutions.EmailEventHandler;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Scheduler;
@@ -26,6 +31,7 @@ import reactor.core.scheduler.Scheduler;
 import javax.validation.Validator;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -39,10 +45,14 @@ public class CommentServiceImpl extends BaseService<CommentRepository, Comment,
 
     private final CommentThreadRepository threadRepository;
 
+    private final UserService userService;
     private final SessionUserService sessionUserService;
     private final ApplicationService applicationService;
+    private final NotificationService notificationService;
 
     private final PolicyGenerator policyGenerator;
+    private final PolicyUtils policyUtils;
+    private final EmailEventHandler emailEventHandler;
 
     public CommentServiceImpl(
             Scheduler scheduler,
@@ -52,49 +62,120 @@ public class CommentServiceImpl extends BaseService<CommentRepository, Comment,
             CommentRepository repository,
             AnalyticsService analyticsService,
             CommentThreadRepository threadRepository,
+            UserService userService,
             SessionUserService sessionUserService,
             ApplicationService applicationService,
-            PolicyGenerator policyGenerator
-    ) {
+            NotificationService notificationService,
+            PolicyGenerator policyGenerator,
+            PolicyUtils policyUtils,
+            EmailEventHandler emailEventHandler) {
         super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
         this.threadRepository = threadRepository;
+        this.userService = userService;
         this.sessionUserService = sessionUserService;
         this.applicationService = applicationService;
+        this.notificationService = notificationService;
         this.policyGenerator = policyGenerator;
+        this.policyUtils = policyUtils;
+        this.emailEventHandler = emailEventHandler;
     }
 
     @Override
-    public Mono<Comment> create(String threadId, Comment comment) {
+    public Mono<Comment> create(String threadId, Comment comment, String originHeader) {
+        return create(threadId, comment, originHeader, true);
+    }
+
+    private Mono<Comment> create(String threadId, Comment comment, String originHeader, boolean shouldCreateNotification) {
         if (StringUtils.isWhitespace(comment.getAuthorName())) {
             // Error: User can't explicitly set the author name. It will be the currently logged in user.
             return Mono.empty();
         }
 
-        return threadRepository.findById(threadId, AclPermission.COMMENT_ON_THREAD)
+        final Mono<User> userMono = sessionUserService.getCurrentUser()
+                .flatMap(user -> {
+                    if (user.getId() == null) {
+                        return userService.findByEmail(user.getEmail());
+                    } else {
+                        return Mono.just(user);
+                    }
+                });
+
+        final Mono<CommentThread> threadMono = threadRepository.findById(threadId, AclPermission.COMMENT_ON_THREAD);
+
+        return Mono.zip(userMono, threadMono)
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, "comment thread", threadId)))
-                .flatMap(thread -> {
+                .flatMap(tuple -> {
+                    final User user = tuple.getT1();
+                    final CommentThread thread = tuple.getT2();
+
+                    comment.setAuthorId(user.getId());
                     comment.setThreadId(threadId);
-                    comment.setPolicies(policyGenerator.getAllChildPolicies(
+                    comment.setApplicationId(thread.getApplicationId());
+                    comment.setApplicationName(thread.getApplicationName());
+                    comment.setPageId(thread.getPageId());
+
+                    final Set<Policy> policies = policyGenerator.getAllChildPolicies(
                             thread.getPolicies(),
                             CommentThread.class,
                             Comment.class
-                    ));
+                    );
+                    policies.add(policyUtils.generatePolicyFromPermission(
+                            Set.of(AclPermission.MANAGE_COMMENT),
+                            user
+                    ).get(AclPermission.MANAGE_COMMENT.getValue()));
+                    comment.setPolicies(policies);
+
+                    String authorName = user.getName() != null ? user.getName(): user.getUsername();
+                    comment.setAuthorUsername(user.getUsername());
+                    comment.setAuthorName(authorName);
+                    Set<String> subscribersFromThisComment = CommentUtils.getSubscriberUsernames(comment);
+
+                    // add them to current thread so that we don't need to query again
+                    if(thread.getSubscribers() != null) {
+                        thread.getSubscribers().addAll(subscribersFromThisComment);
+                    } else {
+                        thread.setSubscribers(subscribersFromThisComment);
+                    }
+
                     return Mono.zip(
-                            Mono.just(comment),
-                            sessionUserService.getCurrentUser()
+                            Mono.just(user),
+                            Mono.just(thread),
+                            repository.save(comment),
+                            threadRepository.addToSubscribers(threadId, subscribersFromThisComment)
                     );
                 })
                 .flatMap(tuple -> {
-                    final Comment comment1 = tuple.getT1();
-                    final User user = tuple.getT2();
-                    String authorName = user.getName() != null ? user.getName(): user.getUsername();
-                    comment1.setAuthorName(authorName);
-                    return repository.save(comment1);
+                    final User user = tuple.getT1();
+                    CommentThread commentThread = tuple.getT2();
+                    final Comment savedComment = tuple.getT3();
+                    Mono<Boolean> publishEmailMono = emailEventHandler.publish(
+                            comment.getAuthorUsername(),
+                            commentThread.getApplicationId(),
+                            comment,
+                            originHeader,
+                            commentThread.getSubscribers()
+                    );
+
+                    if (shouldCreateNotification) {
+                        final Set<String> usernames = commentThread.getSubscribers();
+                        List<Mono<Notification>> notificationMonos = new ArrayList<>();
+                        for (String username : usernames) {
+                            if (!username.equals(user.getUsername())) {
+                                Mono<Notification> notificationMono = notificationService.createNotification(
+                                        savedComment, username
+                                );
+                                notificationMonos.add(notificationMono);
+                            }
+                        }
+                        return Flux.concat(notificationMonos).then(publishEmailMono).thenReturn(savedComment);
+                    } else {
+                        return publishEmailMono.thenReturn(savedComment);
+                    }
                 });
     }
 
     @Override
-    public Mono<CommentThread> createThread(CommentThread commentThread) {
+    public Mono<CommentThread> createThread(CommentThread commentThread, String originHeader) {
         // 1. Check if this user has permission on the application given by `commentThread.applicationId`.
         // 2. Save the comment thread and get it's id. This is the `threadId`.
         // 3. Pull the comment out of the list of comments, set it's `threadId` and save it separately.
@@ -116,18 +197,33 @@ public class CommentServiceImpl extends BaseService<CommentRepository, Comment,
                 .flatMap(count -> {
                     count += 1;
                     commentThread.setSequenceId("#" + count);
-                    return applicationService.findById(applicationId, AclPermission.COMMENT_ON_APPLICATIONS);
+                    return Mono.zip(
+                            sessionUserService.getCurrentUser(),
+                            applicationService.findById(applicationId, AclPermission.COMMENT_ON_APPLICATIONS)
+                    );
                 })
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION, applicationId)))
-                .flatMap(application -> {
-                    commentThread.setPolicies(policyGenerator.getAllChildPolicies(
+                .switchIfEmpty(Mono.error(new AppsmithException(
+                        AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION, applicationId)
+                ))
+                .flatMap(tuple -> {
+                    final User user = tuple.getT1();
+                    final Application application = tuple.getT2();
+                    commentThread.setApplicationName(application.getName());
+                    commentThread.setAuthorName(user.getName());
+                    commentThread.setAuthorUsername(user.getUsername());
+
+                    final Set<Policy> policies = policyGenerator.getAllChildPolicies(
                             application.getPolicies(),
                             Application.class,
                             CommentThread.class
-                    ));
-                    return sessionUserService.getCurrentUser();
-                })
-                .flatMap(user -> {
+                    );
+                    policies.add(policyUtils.generatePolicyFromPermission(
+                            Set.of(AclPermission.MANAGE_THREAD),
+                            user
+                    ).get(AclPermission.MANAGE_THREAD.getValue()));
+
+                    commentThread.setPolicies(policies);
+
                     Set<String> viewedUser = new HashSet<>();
                     viewedUser.add(user.getUsername());
                     commentThread.setViewedByUsers(viewedUser);
@@ -137,9 +233,12 @@ public class CommentServiceImpl extends BaseService<CommentRepository, Comment,
                     List<Mono<Comment>> commentSaverMonos = new ArrayList<>();
 
                     if (!CollectionUtils.isEmpty(thread.getComments())) {
+                        thread.getComments().get(0).setLeading(true);
+                        boolean isFirst = true;
                         for (final Comment comment : thread.getComments()) {
                             comment.setId(null);
-                            commentSaverMonos.add(create(thread.getId(), comment));
+                            commentSaverMonos.add(create(thread.getId(), comment, originHeader, !isFirst));
+                            isFirst = false;
                         }
                     }
 
@@ -148,7 +247,9 @@ public class CommentServiceImpl extends BaseService<CommentRepository, Comment,
                     return Flux.concat(commentSaverMonos);
                 })
                 .collectList()
-                .map(comments -> {
+                .zipWith(sessionUserService.getCurrentUser())
+                .map(tuple -> {
+                    final List<Comment> comments = tuple.getT1();
                     commentThread.setComments(comments);
                     commentThread.setIsViewed(true);
                     return commentThread;
@@ -156,37 +257,73 @@ public class CommentServiceImpl extends BaseService<CommentRepository, Comment,
     }
 
     @Override
-    public Mono<CommentThread> updateThread(String threadId, CommentThread commentThread) {
-        CommentThread.CommentThreadState initState = new CommentThread.CommentThreadState();
-        // Copy over only those fields that are allowed to be updated by a PATCH request.
-        return sessionUserService.getCurrentUser()
-                .flatMap(user -> {
+    public Mono<Comment> update(String id, Comment comment) {
+        return repository.updateById(id, comment, AclPermission.MANAGE_COMMENT)
+                .flatMap(analyticsService::sendUpdateEvent);
+    }
+
+    @Override
+    public Mono<CommentThread> updateThread(String threadId, CommentThread commentThread, String originHeader) {
+        return Mono.zip(
+                sessionUserService.getCurrentUser(),
+                // Resolving, pinning and marking as read don't need manage permission on the thread.
+                threadRepository.findById(threadId, AclPermission.READ_THREAD)
+        )
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, "comment thread", threadId)))
+                .flatMap(tuple -> {
+                    final User user = tuple.getT1();
+                    final CommentThread threadFromDb = tuple.getT2();
+
                     String authorName = user.getName() != null ? user.getName(): user.getUsername();
-                    initState.setAuthorName(authorName);
-                    initState.setAuthorUsername(user.getUsername());
-                    //Nested object in mongo doc doesn't update time automatically
-                    initState.setUpdatedAt(Instant.now());
 
                     if (commentThread.getResolvedState() != null) {
-                        initState.setActive(commentThread.getResolvedState().getActive());
-                        commentThread.setResolvedState(initState);
-                    } else if (commentThread.getPinnedState() != null) {
-                        initState.setActive(commentThread.getPinnedState().getActive());
-                        commentThread.setPinnedState(initState);
+                        CommentThread.CommentThreadState state = new CommentThread.CommentThreadState();
+                        state.setAuthorName(authorName);
+                        state.setAuthorUsername(user.getUsername());
+                        state.setUpdatedAt(Instant.now());
+                        state.setActive(commentThread.getResolvedState().getActive());
+                        commentThread.setResolvedState(state);
                     }
 
-                    Set<String> viewedUser = new HashSet<>();
-                    viewedUser.add(user.getUsername());
-                    commentThread.setViewedByUsers(viewedUser);
-                    commentThread.setIsViewed(true);
-                    return threadRepository.findById(threadId);
-                })
-                .flatMap(thread -> {
-
-                    if(thread.getViewedByUsers() != null) {
-                        commentThread.getViewedByUsers().addAll(thread.getViewedByUsers());
+                    if (commentThread.getPinnedState() != null) {
+                        CommentThread.CommentThreadState state = new CommentThread.CommentThreadState();
+                        state.setAuthorName(authorName);
+                        state.setAuthorUsername(user.getUsername());
+                        state.setUpdatedAt(Instant.now());
+                        state.setActive(commentThread.getPinnedState().getActive());
+                        commentThread.setPinnedState(state);
                     }
-                    return threadRepository.updateById(threadId, commentThread, AclPermission.MANAGE_THREAD);
+
+                    final Boolean isViewed = commentThread.getIsViewed();
+                    if (isViewed != null) {
+                        commentThread.setViewedByUsers(threadFromDb.getViewedByUsers());
+                        if (isViewed) {
+                            if (CollectionUtils.isEmpty(commentThread.getViewedByUsers())) {
+                                commentThread.setViewedByUsers(new HashSet<>());
+                            }
+                            commentThread.getViewedByUsers().add(user.getUsername());
+                        } else if (!CollectionUtils.isEmpty(commentThread.getViewedByUsers())) {
+                            commentThread.getViewedByUsers().remove(user.getUsername());
+                        }
+                    }
+
+                    return threadRepository
+                            .updateById(threadId, commentThread, AclPermission.READ_THREAD)
+                            .flatMap(updatedThread -> {
+                                updatedThread.setIsViewed(true);
+                                // send email if comment thread is resolved
+                                CommentThread.CommentThreadState resolvedState = commentThread.getResolvedState();
+                                if(resolvedState != null && resolvedState.getActive()) {
+                                    return emailEventHandler.publish(
+                                            user.getUsername(),
+                                            updatedThread.getApplicationId(),
+                                            updatedThread,
+                                            originHeader
+                                    ).thenReturn(updatedThread);
+                                } else {
+                                    return Mono.just(updatedThread);
+                                }
+                            });
                 });
     }
 
@@ -232,10 +369,56 @@ public class CommentServiceImpl extends BaseService<CommentRepository, Comment,
      */
     @Override
     public Mono<Comment> deleteComment(String id) {
-
         return repository.findById(id, AclPermission.MANAGE_COMMENT)
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.COMMENT, id)))
-                .flatMap(comment -> repository.archive(comment));
+                .flatMap(repository::archive)
+                .flatMap(analyticsService::sendDeleteEvent);
     }
 
+    @Override
+    public Mono<CommentThread> deleteThread(String threadId) {
+        return threadRepository.findById(threadId, AclPermission.MANAGE_THREAD)
+                .flatMap(threadRepository::archive)
+                .flatMap(analyticsService::sendDeleteEvent);
+    }
+
+    @Override
+    public Mono<Boolean> createReaction(String commentId, Comment.Reaction reaction) {
+        return Mono.zip(
+                repository.findById(commentId, AclPermission.READ_COMMENT),
+                sessionUserService.getCurrentUser()
+        )
+                .flatMap(tuple -> {
+                    final User user = tuple.getT2();
+
+                    reaction.setByUsername(user.getUsername());
+                    reaction.setByName(user.getName());
+                    reaction.setCreatedAt(new Date(Instant.now().toEpochMilli()));
+
+                    return repository.pushReaction(commentId, reaction)
+                            .map(result -> result.getModifiedCount() == 1L);
+                });
+    }
+
+    @Override
+    public Mono<Boolean> deleteReaction(String commentId, Comment.Reaction reaction) {
+        return Mono.zip(
+                repository.findById(commentId, AclPermission.READ_COMMENT),
+                sessionUserService.getCurrentUser()
+        )
+                .flatMap(tuple -> {
+                    final User user = tuple.getT2();
+                    reaction.setByUsername(user.getUsername());
+                    return repository.deleteReaction(commentId, reaction)
+                            .map(result -> result.getModifiedCount() > 0);
+                });
+    }
+
+    @Override
+    public Mono<Long> getUnreadCount(String applicationId) {
+        return sessionUserService.getCurrentUser()
+                .flatMap(user ->
+                        threadRepository.countUnreadThreads(applicationId, user.getUsername())
+                );
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
index c83f61c9b1..56b0b1604f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
@@ -13,7 +13,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URLEncodedUtils;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
@@ -33,22 +35,18 @@ public class CurlImporterService extends BaseApiImporter {
     private static final String RESTAPI_PLUGIN = "restapi-plugin";
 
     private static final String ARG_DATA = "--data";
+    private static final String ARG_FORM = "--form";
     private static final String ARG_HEADER = "--header";
     private static final String ARG_REQUEST = "--request";
     private static final String ARG_COOKIE = "--cookie";
     private static final String ARG_USER = "--user";
     private static final String ARG_USER_AGENT = "--user-agent";
 
-    private static final String CONTENT_TYPE_URLENCODED = "application/x-www-form-urlencoded";
-
-    private final NewActionService newActionService;
     private final PluginService pluginService;
     private final LayoutActionService layoutActionService;
 
-    public CurlImporterService(NewActionService newActionService,
-                               PluginService pluginService,
+    public CurlImporterService(PluginService pluginService,
                                LayoutActionService layoutActionService) {
-        this.newActionService = newActionService;
         this.pluginService = pluginService;
         this.layoutActionService = layoutActionService;
     }
@@ -215,6 +213,9 @@ public class CurlImporterService extends BaseApiImporter {
                     normalizedTokens.add(token.substring(2));
                 }
 
+            } else if ("-F".equals(token)) {
+                normalizedTokens.add(ARG_FORM);
+
             } else if ("-H".equals(token)) {
                 normalizedTokens.add(ARG_HEADER);
 
@@ -276,6 +277,7 @@ public class CurlImporterService extends BaseApiImporter {
         final List<Property> headers = new ArrayList<>();
         String contentType = null;
         final List<String> dataParts = new ArrayList<>();
+        final List<String> formParts = new ArrayList<>();
 
         String state = null;
 
@@ -310,6 +312,10 @@ public class CurlImporterService extends BaseApiImporter {
                 // The `token` is next to `--data-urlencode`.
                 dataParts.add(token);
 
+            } else if (ARG_FORM.equals(state)) {
+                // The token is next to --form
+                formParts.add(token);
+
             } else if (ARG_COOKIE.equals(state)) {
                 // The `token` is next to `--data-cookie`.
                 headers.add(new Property("Set-Cookie", token));
@@ -347,8 +353,12 @@ public class CurlImporterService extends BaseApiImporter {
         }
 
         if (contentType == null && !dataParts.isEmpty()) {
-            contentType = CONTENT_TYPE_URLENCODED;
-            headers.add(new Property("Content-Type", contentType));
+            contentType = MediaType.APPLICATION_FORM_URLENCODED_VALUE;
+            headers.add(new Property(HttpHeaders.CONTENT_TYPE, contentType));
+
+        } else if (contentType == null && !formParts.isEmpty()) {
+            contentType = MediaType.MULTIPART_FORM_DATA_VALUE;
+            headers.add(new Property(HttpHeaders.CONTENT_TYPE, contentType));
         }
 
         if (!headers.isEmpty()) {
@@ -356,7 +366,7 @@ public class CurlImporterService extends BaseApiImporter {
         }
 
         if (!dataParts.isEmpty()) {
-            if (CONTENT_TYPE_URLENCODED.equals(contentType)) {
+            if (MediaType.APPLICATION_FORM_URLENCODED_VALUE.equals(contentType)) {
                 final ArrayList<Property> formPairs = new ArrayList<>();
                 actionConfiguration.setBodyFormData(formPairs);
                 for (String part : dataParts) {
@@ -369,6 +379,22 @@ public class CurlImporterService extends BaseApiImporter {
 
             }
         }
+        if (!formParts.isEmpty()) {
+            if (MediaType.MULTIPART_FORM_DATA_VALUE.equals(contentType)) {
+                final ArrayList<Property> formPairs = new ArrayList<>();
+                actionConfiguration.setBodyFormData(formPairs);
+                for (String part : formParts) {
+                    final String[] parts = part.split("=", 2);
+                    // Multipart form values are double quoted. Eg: "value"
+                    // We trim the quotes from the beginning & end of the string
+                    String formValue = (parts.length > 1) ? parts[1].replaceAll("^\"|\"$", "") : "";
+                    formPairs.add(new Property(parts[0], formValue));
+                }
+
+            } else {
+                actionConfiguration.setBody(StringUtils.join(formParts, '&'));
+            }
+        }
 
         if (actionConfiguration.getHttpMethod() == null) {
             // Default HTTP method is POST if there is body data to send, else GET.
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextService.java
index 231d38168f..98ce6ef748 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextService.java
@@ -1,6 +1,5 @@
 package com.appsmith.server.services;
 
-import com.appsmith.external.models.AuthenticationDTO;
 import com.appsmith.server.domains.Datasource;
 import com.appsmith.server.domains.DatasourceContext;
 import reactor.core.publisher.Mono;
@@ -22,6 +21,4 @@ public interface DatasourceContextService {
     <T> Mono<T> retryOnce(Datasource datasource, Function<DatasourceContext, Mono<T>> task);
 
     Mono<DatasourceContext> deleteDatasourceContext(String datasourceId);
-
-    AuthenticationDTO decryptSensitiveFields(AuthenticationDTO authenticationDTO);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java
index 2ad3e9949e..ad2724b376 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java
@@ -18,7 +18,6 @@ import java.time.Instant;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import static com.appsmith.server.acl.AclPermission.EXECUTE_DATASOURCES;
 
@@ -88,13 +87,6 @@ public class DatasourceContextServiceImpl implements DatasourceContextService {
                 .flatMap(objects -> {
                     Datasource datasource1 = objects.getT1();
 
-                    // If authentication exists for the datasource, decrypt the fields
-                    if (datasource1.getDatasourceConfiguration() != null &&
-                            datasource1.getDatasourceConfiguration().getAuthentication() != null) {
-                        AuthenticationDTO authentication = datasource1.getDatasourceConfiguration().getAuthentication();
-                        datasource1.getDatasourceConfiguration().setAuthentication(decryptSensitiveFields(authentication));
-                    }
-
                     PluginExecutor<Object> pluginExecutor = objects.getT2();
 
                     if (isStale) {
@@ -185,18 +177,4 @@ public class DatasourceContextServiceImpl implements DatasourceContextService {
                     return datasourceContextMap.remove(datasourceId);
                 });
     }
-
-    @Override
-    public AuthenticationDTO decryptSensitiveFields(AuthenticationDTO authentication) {
-        if (authentication != null && Boolean.TRUE.equals(authentication.isEncrypted())) {
-            Map<String, String> decryptedFields = authentication.getEncryptionFields().entrySet().stream()
-                    .filter(e -> e.getValue() != null && !e.getValue().isBlank())
-                    .collect(Collectors.toMap(
-                            Map.Entry::getKey,
-                            e -> encryptionService.decryptString(e.getValue())));
-            authentication.setEncryptionFields(decryptedFields);
-            authentication.setIsEncrypted(false);
-        }
-        return authentication;
-    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceService.java
index 3ac255de0b..f0d7369c31 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceService.java
@@ -1,6 +1,5 @@
 package com.appsmith.server.services;
 
-import com.appsmith.external.models.AuthenticationDTO;
 import com.appsmith.external.models.DatasourceTestResult;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.Datasource;
@@ -14,7 +13,7 @@ public interface DatasourceService extends CrudService<Datasource, String> {
 
     Mono<DatasourceTestResult> testDatasource(Datasource datasource);
 
-    Mono<Datasource> findByName(String name, AclPermission permission);
+    Mono<Datasource> findByNameAndOrganizationId(String name, String organizationId, AclPermission permission);
 
     Mono<Datasource> findById(String id, AclPermission aclPermission);
 
@@ -30,7 +29,5 @@ public interface DatasourceService extends CrudService<Datasource, String> {
 
     Flux<Datasource> saveAll(List<Datasource> datasourceList);
 
-    AuthenticationDTO encryptAuthenticationFields(AuthenticationDTO authentication);
-
-    public Mono<Datasource> populateHintMessages(Datasource datasource);
+    Mono<Datasource> populateHintMessages(Datasource datasource);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceServiceImpl.java
index 871e36404a..74146f3551 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceServiceImpl.java
@@ -1,13 +1,12 @@
 package com.appsmith.server.services;
 
+import com.appsmith.external.helpers.BeanCopyUtils;
 import com.appsmith.external.helpers.MustacheHelper;
-import com.appsmith.external.models.AuthenticationDTO;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.DatasourceTestResult;
 import com.appsmith.external.models.Endpoint;
 import com.appsmith.external.models.Policy;
 import com.appsmith.external.plugins.PluginExecutor;
-import com.appsmith.external.services.EncryptionService;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.acl.PolicyGenerator;
 import com.appsmith.server.constants.FieldName;
@@ -36,7 +35,6 @@ import javax.validation.Validator;
 import javax.validation.constraints.NotNull;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -49,6 +47,9 @@ import static com.appsmith.server.acl.AclPermission.ORGANIZATION_READ_APPLICATIO
 @Service
 public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Datasource, String> implements DatasourceService {
 
+    private static final String LOCALHOST_STRING = "localhost";
+    private static final String LOCALHOST_IP = "127.0.0.1";
+
     private final OrganizationService organizationService;
     private final SessionUserService sessionUserService;
     private final PluginService pluginService;
@@ -56,7 +57,7 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
     private final PolicyGenerator policyGenerator;
     private final SequenceService sequenceService;
     private final NewActionRepository newActionRepository;
-    private final EncryptionService encryptionService;
+
 
     @Autowired
     public DatasourceServiceImpl(Scheduler scheduler,
@@ -71,8 +72,7 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
                                  PluginExecutorHelper pluginExecutorHelper,
                                  PolicyGenerator policyGenerator,
                                  SequenceService sequenceService,
-                                 NewActionRepository newActionRepository,
-                                 EncryptionService encryptionService) {
+                                 NewActionRepository newActionRepository) {
         super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
         this.organizationService = organizationService;
         this.sessionUserService = sessionUserService;
@@ -81,18 +81,6 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
         this.policyGenerator = policyGenerator;
         this.sequenceService = sequenceService;
         this.newActionRepository = newActionRepository;
-        this.encryptionService = encryptionService;
-    }
-
-    @Override
-    public Mono<Datasource> getById(String s) {
-        return super.getById(s).flatMap(datasource -> {
-            if (datasource.getDatasourceConfiguration().getAuthentication() != null &&
-                    Boolean.TRUE.equals(datasource.getDatasourceConfiguration().getAuthentication().isEncrypted())) {
-                datasource.getDatasourceConfiguration().setAuthentication(decryptSensitiveFields(datasource.getDatasourceConfiguration().getAuthentication()));
-            }
-            return Mono.just(datasource);
-        });
     }
 
     @Override
@@ -105,11 +93,6 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
             return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ID));
         }
 
-        // If Authentication Details are present in the datasource, encrypt the details before saving
-        if (datasource.getDatasourceConfiguration() != null) {
-            datasource.getDatasourceConfiguration().setAuthentication(encryptAuthenticationFields(datasource.getDatasourceConfiguration().getAuthentication()));
-        }
-
         Mono<Datasource> datasourceMono = Mono.just(datasource);
         if (StringUtils.isEmpty(datasource.getName())) {
             datasourceMono = sequenceService
@@ -120,31 +103,50 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
                     });
         }
 
-        return datasourceMono
-                .flatMap(datasource1 ->
-                        sessionUserService.getCurrentUser()
-                                .flatMap(user -> {
-                                    // Create policies for this datasource -> This datasource should inherit its permissions and policies from
-                                    // the organization and this datasource should also allow the current user to crud this datasource.
-                                    return organizationService.findById(datasource1.getOrganizationId(), AclPermission.ORGANIZATION_MANAGE_APPLICATIONS)
-                                            .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.ORGANIZATION, datasource1.getOrganizationId())))
-                                            .map(org -> {
-                                                Set<Policy> policySet = org.getPolicies().stream()
-                                                        .filter(policy ->
-                                                                policy.getPermission().equals(ORGANIZATION_MANAGE_APPLICATIONS.getValue()) ||
-                                                                        policy.getPermission().equals(ORGANIZATION_READ_APPLICATIONS.getValue())
-                                                        ).collect(Collectors.toSet());
+        Mono<Datasource> datasourceWithPoliciesMono = datasourceMono
+                .flatMap(datasource1 -> {
+                    Mono<User> userMono = sessionUserService.getCurrentUser();
+                    return generateAndSetDatasourcePolicies(userMono, datasource1);
+                });
 
-                                                Set<Policy> documentPolicies = policyGenerator.getAllChildPolicies(policySet, Organization.class, Datasource.class);
-                                                datasource1.setPolicies(documentPolicies);
-                                                return datasource1;
-                                            });
-                                })
-                )
+        return datasourceWithPoliciesMono
                 .flatMap(this::validateAndSaveDatasourceToRepository)
                 .flatMap(this::populateHintMessages); // For REST API datasource create flow.
     }
 
+    private Mono<Datasource> generateAndSetDatasourcePolicies(Mono<User> userMono, Datasource datasource) {
+        return userMono
+                .flatMap(user -> {
+                    Mono<Organization> orgMono = organizationService.findById(datasource.getOrganizationId(), ORGANIZATION_MANAGE_APPLICATIONS)
+                            .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.ORGANIZATION, datasource.getOrganizationId())));
+
+                    return orgMono.map(org -> {
+                        Set<Policy> policySet = org.getPolicies().stream()
+                                .filter(policy ->
+                                        policy.getPermission().equals(ORGANIZATION_MANAGE_APPLICATIONS.getValue()) ||
+                                                policy.getPermission().equals(ORGANIZATION_READ_APPLICATIONS.getValue())
+                                ).collect(Collectors.toSet());
+
+                        Set<Policy> documentPolicies = policyGenerator.getAllChildPolicies(policySet, Organization.class, Datasource.class);
+                        datasource.setPolicies(documentPolicies);
+                        return datasource;
+                    });
+                });
+    }
+
+    private boolean endpointContainsLocalhost(Endpoint endpoint) {
+        if (endpoint == null || StringUtils.isEmpty(endpoint.getHost())) {
+            return false;
+        }
+
+        String host = endpoint.getHost().toLowerCase();
+        if (host.contains(LOCALHOST_STRING) || host.contains(LOCALHOST_IP)) {
+            return true;
+        }
+
+        return false;
+    }
+
     public Mono<Datasource> populateHintMessages(Datasource datasource) {
 
         if(datasource == null) {
@@ -168,7 +170,7 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
                         .getDatasourceConfiguration()
                         .getEndpoints()
                         .stream()
-                        .anyMatch(endpoint -> endpoint.getHost().contains("localhost"));
+                        .anyMatch(endpoint -> endpointContainsLocalhost(endpoint));
             }
 
             if(usingLocalhostUrl) {
@@ -190,11 +192,6 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
             return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ID));
         }
 
-        // If Authentication Details are present in the datasource, encrypt the details before saving
-        if (datasource.getDatasourceConfiguration() != null) {
-            datasource.getDatasourceConfiguration().setAuthentication(encryptAuthenticationFields(datasource.getDatasourceConfiguration().getAuthentication()));
-        }
-
         // Since policies are a server only concept, first set the empty set (set by constructor) to null
         datasource.setPolicies(null);
 
@@ -215,23 +212,6 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
                 .flatMap(this::populateHintMessages);
     }
 
-    @Override
-    public AuthenticationDTO encryptAuthenticationFields(AuthenticationDTO authentication) {
-        if (authentication != null
-                && !Boolean.TRUE.equals(authentication.isEncrypted())) {
-            Map<String, String> encryptedFields = authentication.getEncryptionFields().entrySet().stream()
-                    .filter(e -> e.getValue() != null)
-                    .collect(Collectors.toMap(
-                            Map.Entry::getKey,
-                            e -> encryptionService.encryptString(e.getValue())));
-            if (!encryptedFields.isEmpty()) {
-                authentication.setEncryptionFields(encryptedFields);
-                authentication.setIsEncrypted(true);
-            }
-        }
-        return authentication;
-    }
-
     @Override
     public Mono<Datasource> validateDatasource(Datasource datasource) {
         Set<String> invalids = new HashSet<>();
@@ -318,22 +298,18 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
      */
     @Override
     public Mono<DatasourceTestResult> testDatasource(Datasource datasource) {
-        Mono<Datasource> datasourceMono = null;
+        Mono<Datasource> datasourceMono = Mono.just(datasource);
         // Fetch any fields that maybe encrypted from the db if the datasource being tested does not have those fields set.
         // This scenario would happen whenever an existing datasource is being tested and no changes are present in the
         // encrypted field (because encrypted fields are not sent over the network after encryption back to the client
         if (datasource.getId() != null && datasource.getDatasourceConfiguration() != null &&
                 datasource.getDatasourceConfiguration().getAuthentication() != null) {
-            Set<String> emptyFields = datasource.getDatasourceConfiguration().getAuthentication().getEmptyEncryptionFields();
-            if (emptyFields != null && !emptyFields.isEmpty()) {
-
-                datasourceMono = getById(datasource.getId())
-                        .switchIfEmpty(Mono.just(datasource));
-            }
-        }
-
-        if (datasourceMono == null) {
-            datasourceMono = Mono.just(datasource);
+            datasourceMono = getById(datasource.getId())
+                    .map(datasource1 -> {
+                        BeanCopyUtils.copyNestedNonNullProperties(datasource, datasource1);
+                        return datasource1;
+                    })
+                    .switchIfEmpty(Mono.just(datasource));
         }
 
         return datasourceMono
@@ -364,8 +340,8 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
     }
 
     @Override
-    public Mono<Datasource> findByName(String name, AclPermission permission) {
-        return repository.findByName(name, permission);
+    public Mono<Datasource> findByNameAndOrganizationId(String name, String organizationId, AclPermission permission) {
+        return repository.findByNameAndOrganizationId(name, organizationId, permission);
     }
 
     @Override
@@ -426,19 +402,4 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
                 .flatMap(toDelete -> repository.archive(toDelete).thenReturn(toDelete))
                 .flatMap(analyticsService::sendDeleteEvent);
     }
-
-    private AuthenticationDTO decryptSensitiveFields(AuthenticationDTO authentication) {
-        if (authentication != null && Boolean.TRUE.equals(authentication.isEncrypted())) {
-            Map<String, String> decryptedFields = authentication.getEncryptionFields().entrySet().stream()
-                    .filter(e -> e.getValue() != null)
-                    .collect(Collectors.toMap(
-                            Map.Entry::getKey,
-                            e -> encryptionService.decryptString(e.getValue())));
-            authentication.setEncryptionFields(decryptedFields);
-            authentication.setIsEncrypted(false);
-        }
-        return authentication;
-    }
-
-
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MockDataService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MockDataService.java
new file mode 100644
index 0000000000..4e9eb640e2
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MockDataService.java
@@ -0,0 +1,12 @@
+package com.appsmith.server.services;
+
+import com.appsmith.server.domains.Datasource;
+import com.appsmith.server.dtos.MockDataDTO;
+import com.appsmith.server.dtos.MockDataSource;
+import reactor.core.publisher.Mono;
+
+public interface MockDataService {
+    Mono<MockDataDTO> getMockDataSet();
+
+    Mono<Datasource> createMockDataSet(MockDataSource mockDataSource);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MockDataServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MockDataServiceImpl.java
new file mode 100644
index 0000000000..5fb62fb3c4
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MockDataServiceImpl.java
@@ -0,0 +1,161 @@
+package com.appsmith.server.services;
+
+import com.appsmith.external.models.Connection;
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.Endpoint;
+import com.appsmith.external.models.Property;
+import com.appsmith.external.models.SSLDetails;
+import com.appsmith.server.configurations.CloudServicesConfig;
+import com.appsmith.server.domains.Datasource;
+import com.appsmith.server.dtos.MockDataCredentials;
+import com.appsmith.server.dtos.MockDataDTO;
+import com.appsmith.server.dtos.MockDataSource;
+import com.appsmith.server.dtos.ResponseDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class MockDataServiceImpl implements MockDataService {
+
+    private final CloudServicesConfig cloudServicesConfig;
+    private final DatasourceService datasourceService;
+
+    public MockDataDTO mockData = new MockDataDTO();
+
+    private Instant cacheExpiryTime = null;
+
+    @Autowired
+    public MockDataServiceImpl(CloudServicesConfig cloudServicesConfig, DatasourceService datasourceService) {
+        this.cloudServicesConfig = cloudServicesConfig;
+        this.datasourceService = datasourceService;
+    }
+
+    @Override
+    public Mono<MockDataDTO> getMockDataSet() {
+        if (cacheExpiryTime != null && Instant.now().isBefore(cacheExpiryTime)) {
+            return Mono.justOrEmpty(mockData);
+        }
+
+        final String baseUrl = cloudServicesConfig.getBaseUrl();
+        if (StringUtils.isEmpty(baseUrl)) {
+            return Mono.justOrEmpty(mockData);
+        }
+
+        return  WebClient
+                .create( baseUrl + "/api/v1/mocks")
+                .get()
+                .exchange()
+                .flatMap(response -> response.bodyToMono(new ParameterizedTypeReference<ResponseDTO<MockDataDTO>>() {}))
+                .map(result -> result.getData())
+                .map(config -> {
+                    mockData = config;
+                    cacheExpiryTime = Instant.now().plusSeconds(2 * 60 * 60);
+                    return config;
+                })
+                .doOnError(error -> log.error("Error fetching mock data sets config from cloud services", error));
+
+    }
+
+    @Override
+    public Mono<Datasource> createMockDataSet(MockDataSource mockDataSource) {
+
+        Mono<MockDataDTO> mockDataSet;
+        if (cacheExpiryTime == null || !Instant.now().isBefore(cacheExpiryTime)) {
+            mockDataSet = getMockDataSet();
+        } else {
+            mockDataSet = Mono.just(mockData);
+        }
+        return mockDataSet.flatMap(mockDataDTO -> {
+            DatasourceConfiguration datasourceConfiguration;
+            if (mockDataSource.getPackageName().equals("mongo-plugin")) {
+                datasourceConfiguration = getMongoDataSourceConfiguration(mockDataSource.getName(), mockDataDTO);
+            } else {
+                datasourceConfiguration = getPostgresDataSourceConfiguration(mockDataSource.getName(), mockDataDTO);
+            }
+            Datasource datasource = new Datasource();
+            datasource.setOrganizationId(mockDataSource.getOrganizationId());
+            datasource.setPluginId(mockDataSource.getPluginId());
+            datasource.setName(mockDataSource.getName().toUpperCase(Locale.ROOT)+" - Mock");
+            datasource.setDatasourceConfiguration(datasourceConfiguration);
+            return datasourceService.create(datasource);
+        });
+
+    }
+
+    private DatasourceConfiguration getMongoDataSourceConfiguration(String name, MockDataDTO mockDataSet) {
+
+        DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+        Connection connection = new Connection();
+        DBAuth auth = new DBAuth();
+        Property property = new Property();
+        List<Property> listProperty = new ArrayList<>();
+        SSLDetails sslDetails = new SSLDetails();
+
+        MockDataCredentials credentials = mockDataSet.getCredentials().stream().filter(cred -> cred.getDbname().equals(name)).collect(Collectors.toList()).get(0);
+
+        property.setKey("Use Mongo Connection String URI");
+        property.setValue("Yes");
+        listProperty.add(property);
+        property = new Property();
+        property.setKey("Connection String URI");
+        property.setValue(credentials.getHost());
+        listProperty.add(property);
+        sslDetails.setAuthType(SSLDetails.AuthType.DEFAULT);
+
+        connection.setSsl(sslDetails);
+        connection.setMode(Connection.Mode.READ_WRITE);
+        connection.setType(Connection.Type.DIRECT);
+
+        auth.setAuthType(DBAuth.Type.SCRAM_SHA_1);
+        auth.setDatabaseName(credentials.getDbname());
+        auth.setPassword(credentials.getPassword());
+        auth.setUsername(credentials.getUsername());
+
+        datasourceConfiguration.setProperties(listProperty);
+        datasourceConfiguration.setConnection(connection);
+        datasourceConfiguration.setAuthentication(auth);
+        return datasourceConfiguration;
+
+    }
+
+    private DatasourceConfiguration getPostgresDataSourceConfiguration(String name, MockDataDTO mockDataSet) {
+        DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+        Connection connection = new Connection();
+        DBAuth auth = new DBAuth();
+        SSLDetails sslDetails = new SSLDetails();
+        Endpoint endpoint = new Endpoint();
+        List<Endpoint> endpointList = new ArrayList<>();
+
+        MockDataCredentials credentials = mockDataSet.getCredentials().stream().filter( cred -> cred.getDbname().equals(name)).collect(Collectors.toList()).get(0);
+
+        sslDetails.setAuthType(SSLDetails.AuthType.DEFAULT);
+        connection.setSsl(sslDetails);
+        connection.setMode(Connection.Mode.READ_WRITE);
+        endpoint.setHost(credentials.getHost());
+        endpointList.add(endpoint);
+
+
+        auth.setDatabaseName(credentials.getDbname());
+        auth.setPassword(credentials.getPassword());
+        auth.setUsername(credentials.getUsername());
+
+        datasourceConfiguration.setConnection(connection);
+        datasourceConfiguration.setAuthentication(auth);
+        datasourceConfiguration.setEndpoints(endpointList);
+        return datasourceConfiguration;
+    }
+
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
index ad68c2b1da..37dd7df91d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
@@ -8,11 +8,11 @@ import com.appsmith.external.helpers.MustacheHelper;
 import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.ActionExecutionRequest;
 import com.appsmith.external.models.ActionExecutionResult;
-import com.appsmith.external.models.AuthenticationDTO;
 import com.appsmith.external.models.Param;
 import com.appsmith.external.models.Policy;
 import com.appsmith.external.models.Provider;
 import com.appsmith.external.models.RequestParamDTO;
+import com.appsmith.external.models.WidgetType;
 import com.appsmith.external.plugins.PluginExecutor;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.acl.PolicyGenerator;
@@ -39,6 +39,8 @@ import com.appsmith.server.repositories.NewActionRepository;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeType;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -59,10 +61,9 @@ import javax.validation.Validator;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -244,17 +245,6 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
 
         Mono<Datasource> datasourceMono;
         if (action.getDatasource().getId() == null) {
-            if (action.getDatasource().getDatasourceConfiguration() != null &&
-                    action.getDatasource().getDatasourceConfiguration().getAuthentication() != null) {
-                action.getDatasource()
-                        .getDatasourceConfiguration()
-                        .setAuthentication(datasourceService.encryptAuthenticationFields(action
-                                .getDatasource()
-                                .getDatasourceConfiguration()
-                                .getAuthentication()
-                        ));
-            }
-
             datasourceMono = Mono.just(action.getDatasource())
                     .flatMap(datasourceService::validateDatasource);
         } else {
@@ -540,13 +530,6 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
                     // Set the action name
                     actionName.set(action.getName());
 
-                    // If authentication exists for the datasource, decrypt the fields
-                    if (datasource.getDatasourceConfiguration() != null &&
-                            datasource.getDatasourceConfiguration().getAuthentication() != null) {
-                        AuthenticationDTO authentication = datasource.getDatasourceConfiguration().getAuthentication();
-                        datasource.getDatasourceConfiguration().setAuthentication(datasourceContextService.decryptSensitiveFields(authentication));
-                    }
-
                     ActionConfiguration actionConfiguration = action.getActionConfiguration();
 
                     Integer timeoutDuration = actionConfiguration.getTimeoutInMillisecond();
@@ -557,17 +540,11 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
 
                     Mono<Datasource> validatedDatasourceMono = authenticationValidator.validateAuthentication(datasource).cache();
 
-
                     Mono<ActionExecutionResult> executionMono = validatedDatasourceMono
                             .flatMap(datasourceContextService::getDatasourceContext)
                             // Now that we have the context (connection details), execute the action.
-                            .flatMap(resourceContext -> validatedDatasourceMono.flatMap(datasource1 -> {
-                                        // Check encryption again
-                                        if (datasource1.getDatasourceConfiguration() != null &&
-                                                datasource1.getDatasourceConfiguration().getAuthentication() != null) {
-                                            AuthenticationDTO authentication = datasource1.getDatasourceConfiguration().getAuthentication();
-                                            datasource1.getDatasourceConfiguration().setAuthentication(datasourceContextService.decryptSensitiveFields(authentication));
-                                        }
+                            .flatMap(resourceContext -> validatedDatasourceMono
+                                    .flatMap(datasource1 -> {
                                         return (Mono<ActionExecutionResult>) pluginExecutor.executeParameterized(
                                                 resourceContext.getConnection(),
                                                 executeActionDTO,
@@ -679,44 +656,100 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
 
                     return Mono.just(result);
                 })
-                .map(result -> addDataTypes(result));
+                .map(result -> addDataTypesAndSetSuggestedWidget(result, executeActionDTO.getViewMode()));
     }
 
-    // Add label and data types to request param entities.
+    /*
+     * - Get label for request params.
+     * - Transform request params list: [""] to a map: {"label": {"value": ...}}
+     * - Rearrange request params in the order as they appear in query editor form.
+     */
     private void transformRequestParams(ActionExecutionResult result, Map<String, String> labelMap) {
-        List<RequestParamDTO> transformedParams = new ArrayList<>();
+        Map<String, Object> transformedParams = new LinkedHashMap<>();
         Map<String, RequestParamDTO> requestParamsConfigMap = new HashMap();
-        result.getRequest().getRequestParams().stream()
-                .forEach(param -> requestParamsConfigMap.put(param.getConfigProperty(), param));
+        ((List)result.getRequest().getRequestParams()).stream()
+                .forEach(param -> requestParamsConfigMap.put(((RequestParamDTO) param).getConfigProperty(),
+                        (RequestParamDTO) param));
 
         labelMap.entrySet().stream()
                 .forEach(e -> {
                     String configProperty = e.getKey();
                     if(requestParamsConfigMap.containsKey(configProperty)) {
                         RequestParamDTO param = requestParamsConfigMap.get(configProperty);
-                        param.setTypes(param.getValue() != null ?
-                                getDisplayDataTypes(param.getValue()) : new ArrayList<>());
-                        param.setLabel(e.getValue());
-                        transformedParams.add(param);
+                        transformedParams.put(e.getValue(), param);
                     }
                 });
 
         result.getRequest().setRequestParams(transformedParams);
     }
 
-    private ActionExecutionResult addDataTypes(ActionExecutionResult result) {
+    private ActionExecutionResult addDataTypesAndSetSuggestedWidget(ActionExecutionResult result, Boolean viewMode) {
         /*
          * - Do not process if data types are already present.
          * - It means that data types have been added by specific plugin.
          */
+
         if (!CollectionUtils.isEmpty(result.getDataTypes())) {
             return result;
         }
 
         result.setDataTypes(getDisplayDataTypes(result.getBody()));
+
+        if(FALSE.equals(viewMode)) {
+            result.setSuggestedWidgets(getSuggestedWidget(result.getBody()));
+        }
+
         return result;
     }
 
+    /**
+     * Suggest the best widget to the query response. We currently planning to support List, Select, Table and Chart widgets
+     * @return List of Widgets
+     */
+    private List<WidgetType> getSuggestedWidget(Object data) {
+
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+
+        if(data instanceof ArrayNode && ((ArrayNode) data).isArray()) {
+            if(!((ArrayNode) data).isEmpty()) {
+                try {
+                    ArrayNode array = (ArrayNode) data;
+                    int length = array.size();
+                    JsonNode node = array.get(0);
+                    JsonNodeType nodeType = node.getNodeType();
+
+                    if(JsonNodeType.STRING.equals(nodeType)) {
+                        if (length > 1) {
+                            widgetTypeList.add(WidgetType.DROP_DOWN_WIDGET);
+                        }
+                        else {
+                            widgetTypeList.add(WidgetType.TEXT_WIDGET);
+                        }
+                    }
+
+                    if(JsonNodeType.OBJECT.equals(nodeType) || JsonNodeType.ARRAY.equals(nodeType)) {
+                        widgetTypeList.add(WidgetType.CHART_WIDGET);
+                        widgetTypeList.add(WidgetType.DROP_DOWN_WIDGET);
+                        widgetTypeList.add(WidgetType.LIST_WIDGET);
+                        widgetTypeList.add(WidgetType.TABLE_WIDGET);
+                    }
+
+                    if(JsonNodeType.NUMBER.equals(nodeType)) {
+                        widgetTypeList.add(WidgetType.INPUT_WIDGET);
+                        widgetTypeList.add(WidgetType.TEXT_WIDGET);
+                    }
+
+                } catch(ClassCastException e) {
+                    log.warn("Error while casting data to suggest widget.", e);
+                    widgetTypeList.add(WidgetType.TEXT_WIDGET);
+                }
+            }
+        } else {
+            widgetTypeList.add(WidgetType.TEXT_WIDGET);
+        }
+        return widgetTypeList;
+    }
+
     private Mono<ActionExecutionRequest> sendExecuteAnalyticsEvent(
             NewAction action,
             ActionDTO actionDTO,
@@ -780,12 +813,14 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
                 .flatMap(application -> Mono.zip(
                         Mono.just(application),
                         sessionUserService.getCurrentUser(),
-                        newPageService.getNameByPageId(actionDTO.getPageId(), viewMode)
+                        newPageService.getNameByPageId(actionDTO.getPageId(), viewMode),
+                        pluginService.getById(action.getPluginId())
                 ))
                 .map(tuple -> {
                     final Application application = tuple.getT1();
                     final User user = tuple.getT2();
                     final String pageName = tuple.getT3();
+                    final Plugin plugin = tuple.getT4();
 
                     final PluginType pluginType = action.getPluginType();
                     final Map<String, Object> data = new HashMap<>();
@@ -793,6 +828,7 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
                     data.putAll(Map.of(
                             "username", user.getUsername(),
                             "type", pluginType,
+                            "pluginName", plugin.getName(),
                             "name", actionDTO.getName(),
                             "datasource", Map.of(
                                     "name", datasource.getName()
@@ -801,11 +837,11 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
                             "appId", action.getApplicationId(),
                             "appMode", TRUE.equals(viewMode) ? "view" : "edit",
                             "appName", application.getName(),
-                            "isExampleApp", application.isAppIsExample(),
-                            "request", request
+                            "isExampleApp", application.isAppIsExample()
                     ));
 
                     data.putAll(Map.of(
+                            "request", request,
                             "pageId", ObjectUtils.defaultIfNull(actionDTO.getPageId(), ""),
                             "pageName", pageName,
                             "isSuccessfulExecution", ObjectUtils.defaultIfNull(actionExecutionResult.getIsExecutionSuccess(), false),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java
index fabc926722..6bd11ee721 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java
@@ -39,6 +39,7 @@ import static com.appsmith.server.acl.AclPermission.READ_PAGES;
 public class NewPageServiceImpl extends BaseService<NewPageRepository, NewPage, String> implements NewPageService {
 
     private final ApplicationService applicationService;
+    private final UserDataService userDataService;
 
     @Autowired
     public NewPageServiceImpl(Scheduler scheduler,
@@ -47,9 +48,10 @@ public class NewPageServiceImpl extends BaseService<NewPageRepository, NewPage,
                               ReactiveMongoTemplate reactiveMongoTemplate,
                               NewPageRepository repository,
                               AnalyticsService analyticsService,
-                              ApplicationService applicationService) {
+                              ApplicationService applicationService, UserDataService userDataService) {
         super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
         this.applicationService = applicationService;
+        this.userDataService = userDataService;
     }
 
     @Override
@@ -68,6 +70,7 @@ public class NewPageServiceImpl extends BaseService<NewPageRepository, NewPage,
             if (newPage.getUnpublishedPage() != null) {
                 page = newPage.getUnpublishedPage();
                 page.setName(newPage.getUnpublishedPage().getName());
+                page.setLastUpdatedTime(newPage.getUpdatedAt().getEpochSecond());
             }
         }
 
@@ -169,6 +172,10 @@ public class NewPageServiceImpl extends BaseService<NewPageRepository, NewPage,
                         }
                     }
                     return Mono.just(application);
+                }).flatMap(application -> {
+                    // add this organization id to the recently used organization id of User Data
+                    return userDataService.updateLastUsedOrgList(application.getOrganizationId())
+                            .thenReturn(application);
                 })
                 .cache();
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationService.java
new file mode 100644
index 0000000000..05c099e2ba
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationService.java
@@ -0,0 +1,17 @@
+package com.appsmith.server.services;
+
+import com.appsmith.server.domains.Comment;
+import com.appsmith.server.domains.CommentThread;
+import com.appsmith.server.domains.Notification;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.dtos.UpdateIsReadNotificationByIdDTO;
+import com.appsmith.server.dtos.UpdateIsReadNotificationDTO;
+import reactor.core.publisher.Mono;
+
+public interface NotificationService extends CrudService<Notification, String> {
+    Mono<Notification> createNotification(Comment comment, String forUsername);
+    Mono<Notification> createNotification(CommentThread commentThread, String forUsername, User authorUser);
+    Mono<UpdateIsReadNotificationByIdDTO> updateIsRead(UpdateIsReadNotificationByIdDTO dto);
+    Mono<UpdateIsReadNotificationDTO> updateIsRead(UpdateIsReadNotificationDTO dto);
+    Mono<Long> getUnreadCount();
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationServiceImpl.java
new file mode 100644
index 0000000000..922a6880d6
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationServiceImpl.java
@@ -0,0 +1,152 @@
+package com.appsmith.server.services;
+
+import com.appsmith.server.domains.Comment;
+import com.appsmith.server.domains.CommentNotification;
+import com.appsmith.server.domains.CommentThread;
+import com.appsmith.server.domains.CommentThreadNotification;
+import com.appsmith.server.domains.Notification;
+import com.appsmith.server.domains.QNotification;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.dtos.UpdateIsReadNotificationByIdDTO;
+import com.appsmith.server.dtos.UpdateIsReadNotificationDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.NumberUtils;
+import com.appsmith.server.repositories.NotificationRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
+
+import javax.validation.Validator;
+import java.time.Instant;
+import java.time.format.DateTimeParseException;
+
+@Slf4j
+@Service
+public class NotificationServiceImpl
+        extends BaseService<NotificationRepository, Notification, String>
+        implements NotificationService {
+
+    private final SessionUserService sessionUserService;
+
+    public NotificationServiceImpl(
+            Scheduler scheduler,
+            Validator validator,
+            MongoConverter mongoConverter,
+            ReactiveMongoTemplate reactiveMongoTemplate,
+            NotificationRepository repository,
+            AnalyticsService analyticsService,
+            SessionUserService sessionUserService) {
+        super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
+        this.sessionUserService = sessionUserService;
+    }
+
+    @Override
+    public Mono<Notification> create(Notification notification) {
+        Mono<Notification> notificationWithUsernameMono;
+        if (StringUtils.isEmpty(notification.getForUsername())) {
+            notificationWithUsernameMono = sessionUserService.getCurrentUser()
+                    .map(user -> {
+                        notification.setForUsername(user.getUsername());
+                        return notification;
+                    });
+        } else {
+            notificationWithUsernameMono = Mono.just(notification);
+        }
+
+        return notificationWithUsernameMono
+                .flatMap(super::create);
+    }
+
+    @Override
+    public Flux<Notification> get(MultiValueMap<String, String> params) {
+        // results will be sorted in descending order of createdAt
+        Sort sort = Sort.by(Sort.Direction.DESC, QNotification.notification.createdAt.getMetadata().getName());
+
+        // get page size from query params, default is 10 if param not present
+        int pageSize = 10;
+        if(params.containsKey("pageSize")) {
+            String param = params.get("pageSize").get(0);
+            pageSize = NumberUtils.parseInteger(param, 1, 10);
+        }
+        PageRequest pageRequest = PageRequest.of(0, pageSize, sort);
+
+        // get the beforeDate parameter from query param
+        final Instant instant;
+        String paramKey = "beforeDate";
+        if(params.containsKey(paramKey)) {
+            String beforeParam = params.get(paramKey).get(0);
+            try {
+                instant = Instant.parse(beforeParam);
+            } catch (DateTimeParseException e) {
+                return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "as " + paramKey));
+            }
+        } else {
+            instant = Instant.now(); // param not present, use current time
+        }
+
+        return sessionUserService.getCurrentUser()
+                .flatMapMany(
+                        user -> repository.findByForUsernameAndCreatedAtBefore(
+                                user.getUsername(), instant, pageRequest
+                        )
+                );
+    }
+
+    /**
+     * Creates a notification for the provided comment which is under provided comment thread
+     * @param comment
+     * @param forUsername
+     * @return
+     */
+    @Override
+    public Mono<Notification> createNotification(Comment comment, String forUsername) {
+        final CommentNotification notification = new CommentNotification();
+        notification.setComment(comment);
+        notification.setForUsername(forUsername);
+        notification.setIsRead(false);
+        return repository.save(notification);
+    }
+
+    @Override
+    public Mono<Notification> createNotification(CommentThread commentThread, String forUsername, User authorUser) {
+        final CommentThreadNotification notification = new CommentThreadNotification();
+        notification.setCommentThread(commentThread);
+        notification.setForUsername(forUsername);
+        notification.setIsRead(false);
+        return repository.save(notification);
+    }
+
+    @Override
+    public Mono<UpdateIsReadNotificationByIdDTO> updateIsRead(UpdateIsReadNotificationByIdDTO dto) {
+        return sessionUserService.getCurrentUser()
+                .flatMap(user ->
+                        repository.updateIsReadByForUsernameAndIdList(
+                                user.getUsername(), dto.getIdList(), dto.getIsRead()
+                        ).thenReturn(dto)
+                );
+    }
+
+    @Override
+    public Mono<UpdateIsReadNotificationDTO> updateIsRead(UpdateIsReadNotificationDTO dto) {
+        return sessionUserService.getCurrentUser()
+                .flatMap(user -> repository.updateIsReadByForUsername(user.getUsername(), dto.getIsRead())
+                        .thenReturn(dto)
+                );
+    }
+
+    @Override
+    public Mono<Long> getUnreadCount() {
+        return sessionUserService.getCurrentUser().flatMap(user ->
+            repository.countByForUsernameAndIsReadIsFalse(user.getUsername())
+        );
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java
index e45b431d1b..efd0f10899 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java
@@ -1,5 +1,6 @@
 package com.appsmith.server.services;
 
+import com.appsmith.external.models.BaseDomain;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.acl.AppsmithRole;
 import com.appsmith.server.acl.RoleGraph;
@@ -35,6 +36,7 @@ import javax.validation.Validator;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -46,7 +48,8 @@ import static com.appsmith.server.acl.AclPermission.USER_MANAGE_ORGANIZATIONS;
 
 @Slf4j
 @Service
-public class OrganizationServiceImpl extends BaseService<OrganizationRepository, Organization, String> implements OrganizationService {
+public class OrganizationServiceImpl extends BaseService<OrganizationRepository, Organization, String>
+        implements OrganizationService {
 
     private final PluginRepository pluginRepository;
     private final SessionUserService sessionUserService;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserDataService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserDataService.java
index 288b8a2bbf..d8d7609b07 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserDataService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserDataService.java
@@ -31,4 +31,5 @@ public interface UserDataService {
 
     Mono<Void> makeProfilePhotoResponse(ServerWebExchange exchange);
 
+    Mono<UserData> updateLastUsedOrgList(String currentOrgId);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserDataServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserDataServiceImpl.java
index d1ac5c2966..ae834713d8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserDataServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserDataServiceImpl.java
@@ -6,6 +6,7 @@ import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.UserData;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.CollectionUtils;
 import com.appsmith.server.repositories.UserDataRepository;
 import com.appsmith.server.solutions.ReleaseNotesService;
 import com.mongodb.DBObject;
@@ -24,6 +25,8 @@ import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Scheduler;
 
 import javax.validation.Validator;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import static com.appsmith.server.repositories.BaseAppsmithRepositoryImpl.fieldName;
@@ -207,4 +210,23 @@ public class UserDataServiceImpl extends BaseService<UserDataRepository, UserDat
                 .flatMap(assetId -> assetService.makeImageResponse(exchange, assetId));
     }
 
+    /**
+     * The {@code currentOrgId} is prepended to the list {@link UserData#getRecentlyUsedOrgIds}.
+     * If {@link UserData#getRecentlyUsedOrgIds} is null or empty, a new list will be created first.
+     * @param currentOrgId currently accessed organization
+     * @return Updated {@link UserData}
+     */
+    @Override
+    public Mono<UserData> updateLastUsedOrgList(String currentOrgId) {
+        return this.getForCurrentUser().flatMap(userData -> {
+            List<String> recentlyUsedOrgIds = userData.getRecentlyUsedOrgIds();
+            if(recentlyUsedOrgIds == null) {
+                recentlyUsedOrgIds = new ArrayList<>();
+            }
+            CollectionUtils.removeDuplicates(recentlyUsedOrgIds);
+            CollectionUtils.putAtFirst(recentlyUsedOrgIds, currentOrgId);
+            userData.setRecentlyUsedOrgIds(recentlyUsedOrgIds);
+            return repository.save(userData);
+        });
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationService.java
index 4e9c8a5f1b..8a8533bd8c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationService.java
@@ -16,7 +16,7 @@ public interface UserOrganizationService {
 
     Mono<Organization> addUserToOrganizationGivenUserObject(Organization organization, User user, UserRole userRole);
 
-    Mono<Organization> removeUserRoleFromOrganization(String orgId, UserRole userRole);
+    Mono<User> leaveOrganization(String orgId);
 
     Mono<Organization> removeUserRoleFromOrganizationGivenUserObject(Organization organization, User user);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java
index af52fa4a0d..2369927505 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java
@@ -6,6 +6,7 @@ import com.appsmith.server.acl.AppsmithRole;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Action;
 import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.CommentThread;
 import com.appsmith.server.domains.Datasource;
 import com.appsmith.server.domains.NewAction;
 import com.appsmith.server.domains.NewPage;
@@ -18,6 +19,7 @@ import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PolicyUtils;
 import com.appsmith.server.notifications.EmailSender;
 import com.appsmith.server.repositories.OrganizationRepository;
+import com.appsmith.server.repositories.UserDataRepository;
 import com.appsmith.server.repositories.UserRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +43,7 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
     private final SessionUserService sessionUserService;
     private final OrganizationRepository organizationRepository;
     private final UserRepository userRepository;
+    private final UserDataRepository userDataRepository;
     private final PolicyUtils policyUtils;
     private final EmailSender emailSender;
 
@@ -50,12 +53,13 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
     public UserOrganizationServiceImpl(SessionUserService sessionUserService,
                                        OrganizationRepository organizationRepository,
                                        UserRepository userRepository,
+                                       UserDataRepository userDataRepository,
                                        PolicyUtils policyUtils,
-                                       EmailSender emailSender
-    ) {
+                                       EmailSender emailSender) {
         this.sessionUserService = sessionUserService;
         this.organizationRepository = organizationRepository;
         this.userRepository = userRepository;
+        this.userDataRepository = userDataRepository;
         this.policyUtils = policyUtils;
         this.emailSender = emailSender;
     }
@@ -188,15 +192,23 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
     }
 
     @Override
-    public Mono<Organization> removeUserRoleFromOrganization(String orgId, UserRole userRole) {
-        Mono<Organization> organizationMono = organizationRepository.findById(orgId, MANAGE_ORGANIZATIONS);
-        Mono<User> userMono = userRepository.findByEmail(userRole.getUsername());
+    public Mono<User> leaveOrganization(String orgId) {
+        Mono<Organization> organizationMono = organizationRepository.findById(orgId);
+        Mono<User> userMono = sessionUserService.getCurrentUser()
+                    .flatMap(user1 -> userRepository.findByEmail(user1.getUsername()));
 
         return Mono.zip(organizationMono, userMono)
                 .flatMap(tuple -> {
                     Organization organization = tuple.getT1();
                     User user = tuple.getT2();
-                    return removeUserRoleFromOrganizationGivenUserObject(organization, user);
+
+                    UserRole userRole = new UserRole();
+                    userRole.setUsername(user.getUsername());
+
+                    user.getOrganizationIds().remove(organization.getId());
+                    return this.updateMemberRole(
+                            organization, user, userRole, user, null
+                    ).thenReturn(user);
                 });
     }
 
@@ -229,6 +241,9 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
         Map<String, Policy> datasourcePolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(orgPolicyMap, Organization.class, Datasource.class);
         Map<String, Policy> pagePolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(applicationPolicyMap, Application.class, Page.class);
         Map<String, Policy> actionPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(pagePolicyMap, Page.class, Action.class);
+        Map<String, Policy> commentThreadPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(
+                applicationPolicyMap, Application.class, CommentThread.class
+        );
 
         //Now update the organization policies
         Organization updatedOrganization = policyUtils.removePoliciesFromExistingObject(orgPolicyMap, organization);
@@ -242,15 +257,100 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
                 .flatMap(application -> policyUtils.updateWithApplicationPermissionsToAllItsPages(application.getId(), pagePolicyMap, false));
         Flux<NewAction> updatedActionsFlux = updatedApplicationsFlux
                 .flatMap(application -> policyUtils.updateWithPagePermissionsToAllItsActions(application.getId(), actionPolicyMap, false));
+        Flux<CommentThread> updatedThreadsFlux = updatedApplicationsFlux
+                .flatMap(application -> policyUtils.updateWithApplicationPermissionsToAllItsCommentThreads(application.getId(), commentThreadPolicyMap, false));
 
-        return Mono.zip(updatedDatasourcesFlux.collectList(), updatedPagesFlux.collectList(), updatedActionsFlux.collectList(), Mono.just(updatedOrganization))
-                .flatMap(tuple -> {
-                    //By now all the datasources/applications/pages/actions have been updated. Just save the organization now
-                    Organization updatedOrgBeforeSave = tuple.getT4();
-                    return organizationRepository.save(updatedOrgBeforeSave);
-                });
+        return Mono.zip(
+                updatedDatasourcesFlux.collectList(),
+                updatedPagesFlux.collectList(),
+                updatedActionsFlux.collectList(),
+                updatedThreadsFlux.collectList(),
+                Mono.just(updatedOrganization)
+        ).flatMap(tuple -> {
+                //By now all the datasources/applications/pages/actions have been updated. Just save the organization now
+                Organization updatedOrgBeforeSave = tuple.getT5();
+                return organizationRepository.save(updatedOrgBeforeSave);
+        });
     }
 
+    private Mono<UserRole> updateMemberRole(Organization organization, User user, UserRole userRole, User currentUser, String originHeader) {
+        List<UserRole> userRoles = organization.getUserRoles();
+
+        // count how many admins are there is this organization
+        long orgAdminCount = userRoles.stream().filter(
+                userRole1 -> userRole1.getRole() == AppsmithRole.ORGANIZATION_ADMIN
+        ).count();
+
+        for (UserRole role : userRoles) {
+            if (role.getUsername().equals(userRole.getUsername())) {
+                // User found in the organization.
+
+                if (role.getRole().equals(userRole.getRole())) {
+                    // No change in the role. Do nothing.
+                    return Mono.just(userRole);
+                } else if(role.getRole().equals(AppsmithRole.ORGANIZATION_ADMIN)) {
+                    // user is currently admin, check if this user is the only admin
+                    if(orgAdminCount == 1) {
+                        return Mono.error(new AppsmithException(AppsmithError.REMOVE_LAST_ORG_ADMIN_ERROR));
+                    }
+                }
+
+                // Step 1. Remove the existing role of the user from the organization
+                Mono<Organization> userRemovedOrganizationMono = this.removeUserRoleFromOrganizationGivenUserObject(organization, user);
+
+                // Step 2. Add the new role (if present) to the organization for the user
+                Mono<Organization> finalUpdatedOrganizationMono = userRemovedOrganizationMono;
+                if (userRole.getRoleName() != null) {
+                    // If a userRole name has been specified, then it means that the user's role has been modified.
+                    Mono<Organization> userAddedToOrganizationMono = userRemovedOrganizationMono
+                            .flatMap(organization1 -> this.addUserToOrganizationGivenUserObject(organization1, user, userRole));
+                    finalUpdatedOrganizationMono = userAddedToOrganizationMono.flatMap(addedOrganization -> {
+
+                        Map<String, String> params = new HashMap<>();
+                        params.put("Inviter_First_Name", currentUser.getName());
+                        params.put("inviter_org_name", organization.getName());
+                        params.put("inviteUrl", originHeader);
+                        params.put("user_role_name", userRole.getRoleName());
+
+                        Mono<Boolean> emailMono = emailSender.sendMail(user.getEmail(),
+                                "Appsmith: Your Role has been changed",
+                                UPDATE_ROLE_EXISTING_USER_TEMPLATE, params);
+                        return emailMono
+                                .thenReturn(addedOrganization);
+                    });
+                } else {
+                    // If the roleName was not present, then it implies that the user is being removed from the org.
+                    // Since at this point we have already removed the user from the organization,
+                    // remove the organization from recent org list of UserData
+                    // we also need to remove the org id from User.orgIdList
+                    finalUpdatedOrganizationMono = userDataRepository
+                            .removeOrgFromRecentlyUsedList(user.getId(), organization.getId())
+                            .then(userRemovedOrganizationMono)
+                            .flatMap(organization1 -> {
+                                    if(user.getOrganizationIds() != null) {
+                                        user.getOrganizationIds().remove(organization.getId());
+                                        return userRepository.save(user).thenReturn(organization1);
+                                    }
+                                    return Mono.just(organization1);
+                            });
+                }
+
+                return finalUpdatedOrganizationMono.thenReturn(userRole);
+            }
+        }
+        // The user was not found in the organization. Return an error
+        return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER, user.getUsername()
+                + " in the organization " + organization.getName()));
+    }
+
+    /**
+     * This method is used when an admin of an organization changes the role or removes a member.
+     * Admin user can also remove himself from the organization, if there is another admin there in the organization.
+     * @param orgId ID of the organization
+     * @param userRole updated role of the target member. userRole.roleName will be null when removing a member
+     * @param originHeader
+     * @return The updated UserRole
+     */
     @Override
     public Mono<UserRole> updateRoleForMember(String orgId, UserRole userRole, String originHeader) {
         if (userRole.getUsername() == null) {
@@ -269,56 +369,7 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
                     Organization organization = tuple.getT1();
                     User user = tuple.getT2();
                     User currentUser = tuple.getT3();
-
-                    if (user.getUsername().equals(currentUser.getUsername())) {
-                        // The user is trying to change its own role. Disallow the same.
-                        return Mono.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION));
-                    }
-
-                    List<UserRole> userRoles = organization.getUserRoles();
-                    for (UserRole role : userRoles) {
-                        if (role.getUsername().equals(userRole.getUsername())) {
-                            // User found in the organization.
-
-                            if (role.getRole().equals(userRole)) {
-                                // No change in the role. Do nothing.
-                                Mono.just(userRole);
-                            }
-
-                            // Step 1. Remove the existing role of the user from the organization
-                            Mono<Organization> userRemovedOrganizationMono = this.removeUserRoleFromOrganizationGivenUserObject(organization, user);
-                            // Step 2. Add the new role (if present) to the organization for the user
-                            Mono<Organization> finalUpdatedOrganizationMono = userRemovedOrganizationMono;
-                            if (userRole.getRoleName() != null) {
-                                // If a userRole name has been specified, then it means that the user's role has been modified.
-                                Mono<Organization> userAddedToOrganizationMono = userRemovedOrganizationMono
-                                        .flatMap(organization1 -> this.addUserToOrganizationGivenUserObject(organization1, user, userRole));
-                                finalUpdatedOrganizationMono = userAddedToOrganizationMono.flatMap(addedOrganization -> {
-                                    
-                                    Map<String, String> params = new HashMap<>();
-                                    params.put("Inviter_First_Name", currentUser.getName());
-                                    params.put("inviter_org_name", organization.getName());
-                                    params.put("inviteUrl", originHeader);
-                                    params.put("user_role_name", userRole.getRoleName());
-
-                                    Mono<Boolean> emailMono = emailSender.sendMail(user.getEmail(),
-                                        "Appsmith: Your Role has been changed",
-                                        UPDATE_ROLE_EXISTING_USER_TEMPLATE, params);
-                                    return emailMono
-                                           .thenReturn(addedOrganization);
-                                });
-                            } else {
-                                // If the roleName was not present, then it implies that the user is being removed from the org.
-                                // Since at this point we have already removed the user from the organization, we dont need to do anything else.
-                            }
-
-                            return finalUpdatedOrganizationMono
-                                    .thenReturn(userRole);
-                        }
-                    }
-                    // The user was not found in the organization. Return an error
-                    return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER, user.getUsername()
-                            + " in the organization " + organization.getName()));
+                    return this.updateMemberRole(organization, user, userRole, currentUser, originHeader);
                 });
     }
 
@@ -363,10 +414,13 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
         Map<String, Policy> applicationPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(orgPolicyMap, Organization.class, Application.class);
         Map<String, Policy> datasourcePolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(orgPolicyMap, Organization.class, Datasource.class);
         Map<String, Policy> pagePolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(applicationPolicyMap, Application.class, Page.class);
+        Map<String, Policy> commentThreadPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(
+                applicationPolicyMap, Application.class, CommentThread.class
+        );
         Map<String, Policy> actionPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(pagePolicyMap, Page.class, Action.class);
 
         //Now update the organization policies
-        Organization updatedOrganization = (Organization) policyUtils.addPoliciesToExistingObject(orgPolicyMap, organization);
+        Organization updatedOrganization = policyUtils.addPoliciesToExistingObject(orgPolicyMap, organization);
         updatedOrganization.setUserRoles(userRoles);
 
         // Update the underlying application/page/action
@@ -375,11 +429,16 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
                 .cache();
         Flux<NewPage> updatedPagesFlux = updatedApplicationsFlux
                 .flatMap(application -> policyUtils.updateWithApplicationPermissionsToAllItsPages(application.getId(), pagePolicyMap, true));
-
         Flux<NewAction> updatedActionsFlux = updatedApplicationsFlux
                 .flatMap(application -> policyUtils.updateWithPagePermissionsToAllItsActions(application.getId(), actionPolicyMap, true));
+        Flux<CommentThread> updatedThreadsFlux = updatedApplicationsFlux
+                .flatMap(application -> policyUtils.updateWithApplicationPermissionsToAllItsCommentThreads(application.getId(), commentThreadPolicyMap, true));
 
-        return Mono.when(updatedDatasourcesFlux.collectList(), updatedPagesFlux.collectList(), updatedActionsFlux.collectList())
+        return Mono.when(
+                updatedDatasourcesFlux.collectList(),
+                updatedPagesFlux.collectList(),
+                updatedActionsFlux.collectList(),
+                updatedThreadsFlux.collectList())
                 //By now all the datasources/applications/pages/actions have been updated. Just save the organization now
                 .then(organizationRepository.save(updatedOrganization));
     }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
index f87b372dc2..8d1ad1b3c4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
@@ -26,6 +26,7 @@ import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.OrganizationRepository;
 import com.appsmith.server.repositories.PasswordResetTokenRepository;
 import com.appsmith.server.repositories.UserRepository;
+import com.appsmith.server.solutions.UserChangedHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
@@ -76,6 +77,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
     private final ConfigService configService;
     private final CommonConfig commonConfig;
     private final EmailConfig emailConfig;
+    private final UserChangedHandler userChangedHandler;
 
     private static final String WELCOME_USER_EMAIL_TEMPLATE = "email/welcomeUserTemplate.html";
     private static final String FORGOT_PASSWORD_EMAIL_TEMPLATE = "email/forgotPasswordTemplate.html";
@@ -105,7 +107,8 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
                            RoleGraph roleGraph,
                            ConfigService configService,
                            CommonConfig commonConfig,
-                           EmailConfig emailConfig) {
+                           EmailConfig emailConfig,
+                           UserChangedHandler userChangedHandler) {
         super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
         this.organizationService = organizationService;
         this.sessionUserService = sessionUserService;
@@ -120,6 +123,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
         this.configService = configService;
         this.commonConfig = commonConfig;
         this.emailConfig = emailConfig;
+        this.userChangedHandler = userChangedHandler;
     }
 
     @Override
@@ -398,19 +402,6 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
         return Mono.just(user)
                 .flatMap(this::validateObject)
                 .flatMap(repository::save)
-                .zipWith(configService.getTemplateOrganizationId().defaultIfEmpty(""))
-                .flatMap(tuple -> {
-                    final String templateOrganizationId = tuple.getT2();
-
-                    if (!StringUtils.hasText(templateOrganizationId)) {
-                        // Since template organization is not configured, we create an empty default organization.
-                        final User savedUser = tuple.getT1();
-                        log.debug("Creating blank default organization for user '{}'.", savedUser.getEmail());
-                        return organizationService.createDefault(new Organization(), savedUser);
-                    }
-
-                    return Mono.empty();
-                })
                 .then(repository.findByEmail(user.getUsername()))
                 .flatMap(analyticsService::trackNewUser);
     }
@@ -444,7 +435,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
         }
 
         // If the user doesn't exist, create the user. If the user exists, return a duplicate key exception
-        return repository.findByEmail(user.getUsername())
+        return repository.findByCaseInsensitiveEmail(user.getUsername())
                 .flatMap(savedUser -> {
                     if (!savedUser.isEnabled()) {
                         // First enable the user
@@ -454,9 +445,25 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
                         savedUser.setPassword(user.getPassword());
                         return repository.save(savedUser);
                     }
-                    return Mono.error(new AppsmithException(AppsmithError.USER_ALREADY_EXISTS_SIGNUP, user.getUsername()));
+                    return Mono.error(new AppsmithException(AppsmithError.USER_ALREADY_EXISTS_SIGNUP, savedUser.getUsername()));
                 })
-                .switchIfEmpty(Mono.defer(() -> signupIfAllowed(user)))
+                .switchIfEmpty(Mono.defer(() -> {
+                    return signupIfAllowed(user)
+                            .zipWith(configService.getTemplateOrganizationId().defaultIfEmpty(""))
+                            .flatMap(tuple -> {
+                                final User savedUser = tuple.getT1();
+                                final String templateOrganizationId = tuple.getT2();
+
+                                if (!StringUtils.hasText(templateOrganizationId)) {
+                                    // Since template organization is not configured, we create an empty default organization.
+                                    log.debug("Creating blank default organization for user '{}'.", savedUser.getEmail());
+                                    return organizationService.createDefault(new Organization(), savedUser).thenReturn(savedUser);
+                                }
+
+                                return Mono.just(savedUser);
+                            })
+                            .flatMap(savedUser -> findByEmail(savedUser.getEmail()));
+                }))
                 .flatMap(savedUser ->
                         emailConfig.isWelcomeEmailEnabled()
                                 ? sendWelcomeEmail(savedUser, finalOriginHeader)
@@ -524,7 +531,8 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
                     BeanCopyUtils.copyNewFieldValuesIntoOldObject(userUpdate, existingUser);
                     return existingUser;
                 })
-                .flatMap(repository::save);
+                .flatMap(repository::save)
+                .map(userChangedHandler::publish);
     }
 
     /**
@@ -615,7 +623,6 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
                 .flatMap(tuple -> {
                     List<User> invitedUsers = tuple.getT1();
                     Organization organization = tuple.getT2();
-
                     return userOrganizationService.bulkAddUsersToOrganization(organization, invitedUsers, inviteUsersDTO.getRoleName());
                 });
 
@@ -748,11 +755,12 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
 
         return sessionUserService.getCurrentUser()
                 .flatMap(user ->
-                        update(user.getEmail(), allUpdates, fieldName(QUser.user.email))
+                        update(user.getEmail(), allowedUpdates, fieldName(QUser.user.email))
                                 .then(exchange == null
                                         ? repository.findByEmail(user.getEmail())
                                         : sessionUserService.refreshCurrentUser(exchange))
-                );
+                )
+                .map(userChangedHandler::publish);
     }
 
     public Map<String, String> getEmailParams(Organization organization, User inviter, String inviteUrl, boolean isNewUser) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java
index b31c3f850f..f36621a004 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java
@@ -18,12 +18,13 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import reactor.core.publisher.Mono;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
+import java.util.Collection;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Collections;
 import java.util.function.Function;
 
 import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
@@ -64,11 +65,23 @@ public class ApplicationFetcher {
                 .cache();
 
         return userMono
-                .flatMap(user -> {
+                .zipWith(userDataService.getForCurrentUser().defaultIfEmpty(new UserData()))
+                .flatMap(userAndUserDataTuple -> {
+                    User user = userAndUserDataTuple.getT1();
+                    UserData userData = userAndUserDataTuple.getT2();
+
                     Set<String> orgIds = user.getOrganizationIds();
 
-                    // Collect all the applications as a map with organization id as a key
+                    // create a set of org id where recently used ones will be at the beginning
+                    List<String> recentlyUsedOrgIds = userData.getRecentlyUsedOrgIds();
+                    Set<String> orgIdSortedSet = new LinkedHashSet<>(orgIds.size());
+                    if(recentlyUsedOrgIds != null && recentlyUsedOrgIds.size() > 0) {
+                        // user has a recently used list, add them to the beginning
+                        orgIdSortedSet.addAll(recentlyUsedOrgIds);
+                    }
+                    orgIdSortedSet.addAll(orgIds); // add all other if not added already
 
+                    // Collect all the applications as a map with organization id as a key
                     Mono<Map<String, Collection<Application>>> applicationsMapMono = applicationRepository
                             .findByMultipleOrganizationIds(orgIds, READ_APPLICATIONS)
                             .collectMultimap(Application::getOrganizationId, Function.identity());
@@ -78,29 +91,34 @@ public class ApplicationFetcher {
 
                     return organizationService
                             .findByIdsIn(orgIds, READ_ORGANIZATIONS)
-                            .collectList()
+                            .collectMap(Organization::getId, v -> v)
                             .zipWith(applicationsMapMono)
                             .map(tuple -> {
-                                List<Organization> organizations = tuple.getT1();
+                                Map<String, Organization> organizations = tuple.getT1();
+
                                 Map<String, Collection<Application>> applicationsCollectionByOrgId = tuple.getT2();
 
                                 List<OrganizationApplicationsDTO> organizationApplicationsDTOS = new ArrayList<>();
 
-                                for (Organization organization : organizations) {
-                                    Collection<Application> applicationCollection = applicationsCollectionByOrgId.get(organization.getId());
+                                for(String orgId : orgIdSortedSet) {
+                                    Organization organization = organizations.get(orgId);
+                                    if(organization != null) {
+                                        Collection<Application> applicationCollection = applicationsCollectionByOrgId.get(organization.getId());
 
-                                    final List<Application> applicationList = new ArrayList<>();
-                                    if (!CollectionUtils.isEmpty(applicationCollection)) {
-                                        applicationList.addAll(applicationCollection);
+                                        final List<Application> applicationList = new ArrayList<>();
+                                        if (!CollectionUtils.isEmpty(applicationCollection)) {
+                                            applicationList.addAll(applicationCollection);
+                                        }
+
+                                        OrganizationApplicationsDTO organizationApplicationsDTO = new OrganizationApplicationsDTO();
+                                        organizationApplicationsDTO.setOrganization(organization);
+                                        organizationApplicationsDTO.setApplications(applicationList);
+                                        organizationApplicationsDTO.setUserRoles(organization.getUserRoles());
+
+                                        organizationApplicationsDTOS.add(organizationApplicationsDTO);
                                     }
-
-                                    OrganizationApplicationsDTO organizationApplicationsDTO = new OrganizationApplicationsDTO();
-                                    organizationApplicationsDTO.setOrganization(organization);
-                                    organizationApplicationsDTO.setApplications(applicationList);
-                                    organizationApplicationsDTO.setUserRoles(organization.getUserRoles());
-
-                                    organizationApplicationsDTOS.add(organizationApplicationsDTO);
                                 }
+
                                 userHomepageDTO.setOrganizationApplications(organizationApplicationsDTOS);
                                 return userHomepageDTO;
                             });
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationForkingService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationForkingService.java
index 54dff8682f..2aafd0e3c8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationForkingService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationForkingService.java
@@ -1,24 +1,29 @@
 package com.appsmith.server.solutions;
 
 import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.constants.AnalyticsEvents;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.Organization;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PolicyUtils;
+import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.OrganizationService;
 import com.appsmith.server.services.SessionUserService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.Collections;
+import java.util.Map;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class ApplicationForkingService {
 
     private final ApplicationService applicationService;
@@ -26,6 +31,7 @@ public class ApplicationForkingService {
     private final ExamplesOrganizationCloner examplesOrganizationCloner;
     private final PolicyUtils policyUtils;
     private final SessionUserService sessionUserService;
+    private final AnalyticsService analyticsService;
 
     public Mono<Application> forkApplicationToOrganization(String applicationId, String organizationId) {
         final Mono<Application> sourceApplicationMono = applicationService.findById(applicationId, AclPermission.READ_APPLICATIONS)
@@ -34,7 +40,9 @@ public class ApplicationForkingService {
         final Mono<Organization> targetOrganizationMono = organizationService.findById(organizationId, AclPermission.ORGANIZATION_MANAGE_APPLICATIONS)
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, "organization", organizationId)));
 
-        return Mono.zip(sourceApplicationMono, targetOrganizationMono, sessionUserService.getCurrentUser())
+        Mono<User> userMono = sessionUserService.getCurrentUser();
+
+        return Mono.zip(sourceApplicationMono, targetOrganizationMono, userMono)
                 .flatMap(tuple -> {
                     final Application application = tuple.getT1();
                     final Organization targetOrganization = tuple.getT2();
@@ -58,8 +66,29 @@ public class ApplicationForkingService {
                 })
                 .flatMap(applicationIds -> {
                     final String newApplicationId = applicationIds.get(0);
-                    return applicationService.getById(newApplicationId);
+                    return applicationService.getById(newApplicationId)
+                            .flatMap(application ->
+                                    sendForkApplicationAnalyticsEvent(applicationId, organizationId, application));
                 });
     }
 
+    private Mono<Application> sendForkApplicationAnalyticsEvent(String applicationId, String orgId, Application application) {
+        return applicationService.findById(applicationId, AclPermission.READ_APPLICATIONS)
+                .flatMap(sourceApplication -> {
+
+                    final Map<String, Object> data = Map.of(
+                            "forkedFromAppId", applicationId,
+                            "forkedToOrgId", orgId,
+                            "forkedFromAppName", sourceApplication.getName()
+                    );
+
+                    return analyticsService.sendObjectEvent(AnalyticsEvents.FORK, application, data);
+                })
+                .onErrorResume(e -> {
+                    log.warn("Error sending action execution data point", e);
+                    return Mono.just(application);
+                });
+    }
+
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/AuthenticationService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/AuthenticationService.java
index a73d0dbbbf..2f59a2a42c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/AuthenticationService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/AuthenticationService.java
@@ -1,5 +1,6 @@
 package com.appsmith.server.solutions;
 
+import com.appsmith.external.constants.Authentication;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import com.appsmith.external.models.AuthenticationDTO;
@@ -44,14 +45,15 @@ import java.util.List;
 import java.util.Map;
 
 import static com.appsmith.external.constants.Authentication.ACCESS_TOKEN;
+import static com.appsmith.external.constants.Authentication.AUDIENCE;
 import static com.appsmith.external.constants.Authentication.AUTHORIZATION_CODE;
 import static com.appsmith.external.constants.Authentication.CLIENT_ID;
 import static com.appsmith.external.constants.Authentication.CLIENT_SECRET;
 import static com.appsmith.external.constants.Authentication.CODE;
-import static com.appsmith.external.constants.Authentication.EXPIRES_IN;
 import static com.appsmith.external.constants.Authentication.GRANT_TYPE;
 import static com.appsmith.external.constants.Authentication.REDIRECT_URI;
 import static com.appsmith.external.constants.Authentication.REFRESH_TOKEN;
+import static com.appsmith.external.constants.Authentication.RESOURCE;
 import static com.appsmith.external.constants.Authentication.RESPONSE_TYPE;
 import static com.appsmith.external.constants.Authentication.SCOPE;
 import static com.appsmith.external.constants.Authentication.STATE;
@@ -179,6 +181,14 @@ public class AuthenticationService {
                     if (Boolean.FALSE.equals(oAuth2.getIsAuthorizationHeader())) {
                         map.add(CLIENT_ID, oAuth2.getClientId());
                         map.add(CLIENT_SECRET, oAuth2.getClientSecret());
+                        // Adding optional audience parameter
+                        if (!StringUtils.isEmpty(oAuth2.getAudience())) {
+                            map.add(AUDIENCE, oAuth2.getAudience());
+                        }
+                        // Adding optional resource parameter
+                        if (!StringUtils.isEmpty(oAuth2.getResource())) {
+                            map.add(RESOURCE, oAuth2.getResource());
+                        }
                     } else if (Boolean.TRUE.equals(oAuth2.getIsAuthorizationHeader())) {
                         byte[] clientCredentials = (oAuth2.getClientId() + ":" + oAuth2.getClientSecret()).getBytes();
                         final String authorizationHeader = "Basic " + Base64.encode(clientCredentials);
@@ -207,7 +217,23 @@ public class AuthenticationService {
                                 authenticationResponse.setTokenResponse(response);
                                 authenticationResponse.setToken((String) response.get(ACCESS_TOKEN));
                                 authenticationResponse.setRefreshToken((String) response.get(REFRESH_TOKEN));
-                                authenticationResponse.setExpiresAt(Instant.now().plusSeconds(Long.valueOf((Integer) response.get(EXPIRES_IN))));
+                                // Parse useful fields for quick access
+                                Object issuedAtResponse = response.get(Authentication.ISSUED_AT);
+                                // Default issuedAt to current time
+                                Instant issuedAt = Instant.now();
+                                if (issuedAtResponse != null) {
+                                    issuedAt = Instant.ofEpochMilli(Long.parseLong((String) issuedAtResponse));
+                                }
+                                // We expect at least one of the following to be present
+                                Object expiresAtResponse = response.get(Authentication.EXPIRES_AT);
+                                Object expiresInResponse = response.get(Authentication.EXPIRES_IN);
+                                Instant expiresAt = null;
+                                if (expiresAtResponse != null) {
+                                    expiresAt = Instant.ofEpochSecond(Long.valueOf((Integer) expiresAtResponse));
+                                } else if (expiresInResponse != null) {
+                                    expiresAt = issuedAt.plusSeconds(Long.valueOf((Integer) expiresInResponse));
+                                }
+                                authenticationResponse.setExpiresAt(expiresAt);
                                 // Replacing with returned scope instead
                                 if (scope != null && !scope.isBlank()) {
                                     oAuth2.setScopeString(String.join(",", scope.split(" ")));
@@ -215,8 +241,6 @@ public class AuthenticationService {
                                     oAuth2.setScopeString("");
                                 }
                                 oAuth2.setAuthenticationResponse(authenticationResponse);
-                                // Resetting encryption
-                                oAuth2.setIsEncrypted(null);
                                 datasource.getDatasourceConfiguration().setAuthentication(oAuth2);
                                 return datasourceService.update(datasource.getId(), datasource);
                             });
@@ -369,7 +393,6 @@ public class AuthenticationService {
                                         .setAuthenticationStatus(AuthenticationDTO.AuthenticationStatus.SUCCESS);
                                 OAuth2 oAuth2 = (OAuth2) datasource.getDatasourceConfiguration().getAuthentication();
                                 oAuth2.setAuthenticationResponse(authenticationResponse);
-                                oAuth2.setIsEncrypted(null);
                                 datasource.getDatasourceConfiguration().setAuthentication(oAuth2);
                                 return Mono.just(datasource);
                             });
@@ -388,7 +411,6 @@ public class AuthenticationService {
                 datasource.getDatasourceConfiguration() != null &&
                 datasource.getDatasourceConfiguration().getAuthentication() instanceof OAuth2);
         OAuth2 oAuth2 = (OAuth2) datasource.getDatasourceConfiguration().getAuthentication();
-        assert (!oAuth2.isEncrypted());
         return pluginService.findById(datasource.getPluginId())
                 .filter(plugin -> PluginType.SAAS.equals(plugin.getType()))
                 .zipWith(configService.getInstanceId())
@@ -421,9 +443,12 @@ public class AuthenticationService {
                             })
                             .flatMap(authenticationResponse -> {
                                 oAuth2.setAuthenticationResponse(authenticationResponse);
-                                oAuth2.setIsEncrypted(null);
                                 datasource.getDatasourceConfiguration().setAuthentication(oAuth2);
-                                return datasourceService.update(datasource.getId(), datasource);
+                                // We return the same object instead of the update value because the updates value
+                                // will be in the encrypted form
+                                return datasourceService
+                                        .update(datasource.getId(), datasource)
+                                        .thenReturn(datasource);
                             });
                 })
                 .switchIfEmpty(Mono.just(datasource))
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolution.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolution.java
new file mode 100644
index 0000000000..82fd934b35
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolution.java
@@ -0,0 +1,662 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.external.helpers.BeanCopyUtils;
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.DatasourceStructure.Column;
+import com.appsmith.external.models.DatasourceStructure.PrimaryKey;
+import com.appsmith.external.models.DatasourceStructure.Table;
+import com.appsmith.external.models.Property;
+import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.ApplicationJson;
+import com.appsmith.server.domains.Datasource;
+import com.appsmith.server.domains.Layout;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.dtos.ActionDTO;
+import com.appsmith.server.dtos.CRUDPageResourceDTO;
+import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.services.ApplicationPageService;
+import com.appsmith.server.services.ApplicationService;
+import com.appsmith.server.services.DatasourceService;
+import com.appsmith.server.services.LayoutActionService;
+import com.appsmith.server.services.NewPageService;
+import com.appsmith.server.services.PluginService;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Streams;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.minidev.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.WordUtils;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StreamUtils;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class CreateDBTablePageSolution {
+
+    private final DatasourceStructureSolution datasourceStructureSolution;
+    private final DatasourceService datasourceService;
+    private final NewPageService newPageService;
+    private final ApplicationService applicationService;
+    private final LayoutActionService layoutActionService;
+    private final ApplicationPageService applicationPageService;
+    private final PluginService pluginService;
+    
+    private final String DATABASE_TABLE = "database table";
+    
+    private final String FILE_PATH = "CRUD-DB-Table-Template-Application.json";
+
+    private final String TEMPLATE_TABLE_NAME = "public.template_table";
+
+    private final String TEMPLATE_APPLICATION_FILE = "template application file";
+
+    private final String DELETE_FIELD = "deleteThisFieldFromActionsAndLayout";
+
+    private final String SELECT_QUERY = "SelectQuery";
+
+    private final String FIND_QUERY = "FindQuery";
+
+    // This column will be used to map filter in Find and Select query. This particular field is added to have
+    // uniformity across different datasources
+    private final String DEFAULT_SEARCH_COLUMN = "col3";
+
+    private final long MIN_TABLE_COLUMNS = 2;
+
+    // These fields contain the widget fields those need to be mapped between template DB table and DB table in
+    // current context
+    private final Set<String> WIDGET_FIELDS = Set.of(
+        "defaultText", "placeholderText", "text", "options", "defaultOptionValue", "primaryColumns", "isVisible"
+    );
+
+    // Map to select page from the template application for specific datasource
+    private final Map<String, String> templatePluginPackageToPageNamesMap = ImmutableMap.<String, String> builder()
+        .put("postgres-plugin", "SQL")
+        .put("mongo-plugin", "Mongo")
+        .put("mysql-plugin", "SQL")
+        .put("elasticsearch-plugin", "Elasticsearch")
+        .put("dynamo-plugin","Dynamo")
+        .put("redis-plugin","Redis")
+        .put("mssql-plugin", "SQL")
+        .put("firestore-plugin", "Firestore")
+        .put("redshift-plugin", "SQL")
+        .put("amazons3-plugin", "S3Assets")
+        .put("google-sheets-plugin", "GSheets")
+        .put("snowflake-plugin", "Snowflake")
+        .build();
+
+    // Pattern to break string in separate words
+    final static Pattern wordPattern = Pattern.compile("[^\\W]+");
+
+    // Pattern to get string between "_" and ._} : "templateTableColumnName" => templateTableColumnName mapped to tableColumnName
+    final static Pattern fieldNamePattern = Pattern.compile("(?<=[\".])([^ ,.{}]*?)(?=[\"}])");
+
+    /**
+     * This function will clone template page along with the actions. DatasourceStructure is used to map the
+     * templateColumns with the datasource under consideration
+     * @param pageId for which the template page needs to be replicated
+     * @param pageResourceDTO
+     * @return generated pageDTO from the template resource
+     */
+    public Mono<PageDTO> createPageFromDBTable(String pageId, CRUDPageResourceDTO pageResourceDTO) {
+
+        /*
+            1. Fetch page from the application
+            2. Fetch datasource structure
+            3. Fetch template application from json file
+            4. Map template datasource columns with resource datasource
+            5. Clone layout from template application page and update using the column map created in step 4
+            6. Clone and update actions in page from the template application
+         */
+        AtomicReference<String> savedPageId = new AtomicReference<>(pageId);
+        if (pageResourceDTO.getTableName() == null || pageResourceDTO.getDatasourceId() == null) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, ", tableName and datasourceId must be present"));
+        } else if (pageResourceDTO.getApplicationId() == null) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.APPLICATION_ID));
+        }
+
+        final String tableName =  pageResourceDTO.getTableName();
+        final String datasourceId =  pageResourceDTO.getDatasourceId();
+        final String applicationId = pageResourceDTO.getApplicationId();
+        final String searchColumn = pageResourceDTO.getSearchColumn();
+        final Set<String> columns = pageResourceDTO.getColumns();
+
+        //Mapped columns along with table name between template and concerned DB table
+        Map<String, String> mappedColumnsAndTableName = new HashMap<>();
+
+        Mono<NewPage> pageMono = getOrCreatePage(applicationId, savedPageId.get(), tableName).cache();
+
+        Mono<Datasource> datasourceMono = pageMono
+            .flatMap(newPage -> {
+                savedPageId.set(newPage.getId());
+                return applicationService.findById(newPage.getApplicationId());
+            })
+            .flatMap(application ->
+                datasourceService
+                    .findById(datasourceId, AclPermission.MANAGE_DATASOURCES)
+                    .switchIfEmpty(Mono.error(
+                        new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.DATASOURCE, datasourceId))
+                    )
+                    .filter(datasource -> datasource.getStructure() != null
+                        && !CollectionUtils.isEmpty(datasource.getStructure().getTables()))
+                    .filter(datasource -> datasource.getStructure().getTables().stream()
+                        .anyMatch(table -> StringUtils.equals(table.getName(), tableName)))
+                    .switchIfEmpty(Mono.error(
+                        new AppsmithException(
+                            AppsmithError.NO_RESOURCE_FOUND,
+                            FieldName.DATASOURCE_STRUCTURE,
+                            "containing table with name " + tableName
+                        ))
+                    )
+            );
+
+        
+        return datasourceMono
+            .zipWhen(datasource -> Mono.zip(
+                    getTable(datasource, tableName),
+                    pageMono,
+                    pluginService.findById(datasource.getPluginId())
+                )
+            )
+            .flatMap(tuple -> {
+                Datasource datasource = tuple.getT1();
+                Table table = tuple.getT2().getT1();
+                NewPage page = tuple.getT2().getT2();
+                Plugin plugin = tuple.getT2().getT3();
+                String layoutId = page.getUnpublishedPage().getLayouts().get(0).getId();
+
+                ApplicationJson applicationJson = new ApplicationJson();
+                try {
+                    BeanCopyUtils.copyNestedNonNullProperties(fetchTemplateApplication(FILE_PATH), applicationJson);
+                } catch (IOException e) {
+                    log.error(e.getMessage());
+                }
+                List<NewPage> pageList = applicationJson.getPageList();
+
+                if (pageList.isEmpty()) {
+                    return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, TEMPLATE_APPLICATION_FILE));
+                }
+
+                NewPage templatePage = pageList.stream()
+                    .filter(newPage -> StringUtils.equals(
+                            newPage.getUnpublishedPage().getName(),
+                            templatePluginPackageToPageNamesMap.get(plugin.getPackageName())
+                        )
+                    )
+                    .findAny()
+                    .orElse(null);
+
+                if (templatePage == null) {
+                    return Mono.error(
+                        new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION, plugin.getName())
+                    );
+                }
+
+                Layout layout = templatePage.getUnpublishedPage()
+                    .getLayouts()
+                    .get(0);
+
+                if (layout == null) {
+                    return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE));
+                }
+                layout.setId(null);
+                // onLoadActions will be set after it's stored in DB
+                layout.setLayoutOnLoadActions(null);
+
+                final String templateTableRef =  TEMPLATE_TABLE_NAME.split("\\.", 2)[1];
+                Datasource templateDatasource = applicationJson
+                    .getDatasourceList()
+                    .stream()
+                    .filter(datasource1 -> StringUtils.equals(datasource1.getPluginId(), plugin.getPackageName()))
+                    .findAny()
+                    .orElse(null);
+
+                if (templateDatasource == null) {
+                    return Mono.error(
+                        new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION, plugin.getName())
+                    );
+                }
+
+                DatasourceStructure templateStructure = templateDatasource.getStructure();
+                Table templateTable = templateStructure.getTables()
+                    .stream()
+                    .filter(table1 -> StringUtils.contains(table1.getName(), templateTableRef))
+                    .findAny()
+                    .orElse(null);
+
+                mappedColumnsAndTableName.putAll(mapTableColumnNames(templateTable, table, searchColumn, columns));
+                mappedColumnsAndTableName.put(
+                    templateTableRef,
+                    tableName.contains(".") ? tableName.split("\\.", 2)[1] : tableName);
+
+                Set<String> deletedWidgets = new HashSet<>();
+                layout.setDsl(
+                    extractAndUpdateAllWidgetFromDSL(layout.getDsl(), mappedColumnsAndTableName, deletedWidgets)
+                );
+
+                List<NewAction> templateActionList = applicationJson.getActionList()
+                    .stream()
+                    .filter(newAction -> StringUtils.equals(
+                            newAction.getUnpublishedAction().getPageId(),
+                            templatePluginPackageToPageNamesMap.get(plugin.getPackageName())
+                        )
+                    )
+                    .collect(Collectors.toList());
+
+                log.debug("Going to update layout for page {0} and layout {1}", savedPageId.get(), layoutId);
+                return layoutActionService.updateLayout(savedPageId.get(), layoutId, layout)
+                    .then(Mono.zip(
+                        Mono.just(datasource),
+                        Mono.just(templateActionList),
+                        Mono.just(deletedWidgets)
+                    ));
+            })
+            .flatMap(tuple -> {
+
+                Datasource datasource = tuple.getT1();
+                List<NewAction> templateActionList = tuple.getT2();
+                Set<String> deletedWidgets = tuple.getT3();
+                log.debug("Going to clone actions from template application");
+                return cloneActionsFromTemplateApplication(
+                    datasource, tableName, savedPageId.get(), templateActionList, mappedColumnsAndTableName, deletedWidgets)
+                    .flatMap(actionDTO -> StringUtils.equals(actionDTO.getName(), SELECT_QUERY)
+                        || StringUtils.equals(actionDTO.getName(), FIND_QUERY) ?
+                            layoutActionService.setExecuteOnLoad(actionDTO.getId(), true)
+                            : Mono.just(actionDTO))
+                    .then(applicationPageService.getPage(savedPageId.get(), false));
+            });
+    }
+
+
+    /**
+     * @param applicationId
+     * @param pageId
+     * @param tableName
+     * @return NewPage if not present already with the incremental suffix number to avoid duplicate application names
+     */
+    private Mono<NewPage> getOrCreatePage(String applicationId, String pageId, String tableName) {
+
+        log.debug("Fetching page from application {}", applicationId);
+        if(pageId != null) {
+            return newPageService.findById(pageId, AclPermission.MANAGE_PAGES)
+                .switchIfEmpty(Mono.error(new AppsmithException(
+                    AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE, pageId))
+                );
+        }
+
+        return newPageService.findByApplicationId(applicationId, AclPermission.MANAGE_PAGES, false)
+            .collectList()
+            .flatMap(pages -> {
+                // Avoid duplicating page names
+                String pageName = "Admin Page:" + WordUtils.capitalize(tableName);
+                long maxCount = 0L;
+                for (PageDTO pageDTO : pages) {
+                    if (pageDTO.getName().matches("^" + Pattern.quote(pageName) + "\\d*$")) {
+                        long count = 1L;
+                        String pageCount = pageDTO.getName().substring(pageName.length());
+                        if (!pageCount.isEmpty()) {
+                            count = Long.parseLong(pageCount);
+                        }
+                        maxCount = maxCount <= count ? count + 1 : maxCount;
+                    }
+
+                }
+                pageName = maxCount != 0 ? pageName + maxCount : pageName;
+                PageDTO page = new PageDTO();
+                page.setApplicationId(applicationId);
+                page.setName(pageName);
+                return applicationPageService.createPage(page);
+            })
+            .flatMap(pageDTO -> newPageService.findById(pageDTO.getId(), AclPermission.MANAGE_PAGES));
+    }
+
+    private Mono<Table> getTable(Datasource datasource, String tableName) {
+        DatasourceStructure datasourceStructure = datasource.getStructure();
+        if (datasourceStructure != null) {
+            return Mono.justOrEmpty(getTable(datasourceStructure, tableName))
+            .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, DATABASE_TABLE, tableName)));
+        }
+        return datasourceStructureSolution.getStructure(datasource.getId(), true)
+            .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, DATABASE_TABLE, tableName)))
+            .map(datasourceStructure1 -> getTable(datasourceStructure1, tableName));
+    }
+    
+    private Table getTable(DatasourceStructure datasourceStructure, String tableName) {
+        return datasourceStructure.getTables()
+            .stream()
+            .filter(table1 -> StringUtils.equals(table1.getName(),tableName))
+            .findAny()
+            .orElse(null);
+    }
+
+    /**
+     * @param filePath template application path
+     * @return application resource
+     * @throws IOException
+     */
+    private ApplicationJson fetchTemplateApplication(String filePath) throws IOException {
+
+        log.debug("Going to fetch template application");
+        final String jsonContent = StreamUtils.copyToString(
+            new DefaultResourceLoader().getResource(filePath).getInputStream(),
+            Charset.defaultCharset()
+        );
+        GsonBuilder gsonBuilder = new GsonBuilder();
+        Gson gson = gsonBuilder.registerTypeAdapter(DatasourceStructure.Key.class, new DatasourceStructure.KeyInstanceCreator())
+            .create();
+        
+        return gson.fromJson(jsonContent, ApplicationJson.class);
+    }
+
+    /**
+     * This function will clone actions from the template application and update action configuration using mapped
+     * columns between the template datasource and datasource in context
+     * @param datasource
+     * @param tableName
+     * @param pageId
+     * @param templateActionList Actions from the template application related to specific datasource
+     * @param mappedColumns Mapped column names between template and resource table under consideration
+     * @param deletedWidgetNames Deleted column ref when template application have more # of columns than the users table
+     * @return cloned and updated actions from template application actions
+     */
+    private Flux<ActionDTO> cloneActionsFromTemplateApplication(Datasource datasource,
+                                                                String tableName,
+                                                                String pageId,
+                                                                List<NewAction> templateActionList,
+                                                                Map<String, String> mappedColumns,
+                                                                Set<String> deletedWidgetNames
+    ) {
+        log.debug("Cloning actions from template application for pageId {}", pageId);
+        return Flux.fromIterable(templateActionList)
+            .flatMap(templateAction -> {
+                ActionDTO actionDTO = new ActionDTO();
+                ActionConfiguration templateActionConfiguration = templateAction.getUnpublishedAction().getActionConfiguration();
+                actionDTO.setPluginId(datasource.getPluginId());
+                actionDTO.setId(null);
+                actionDTO.setDatasource(datasource);
+                actionDTO.setPageId(pageId);
+                actionDTO.setName(templateAction.getUnpublishedAction().getName());
+
+                String actionBody = templateActionConfiguration.getBody();
+                actionDTO.setActionConfiguration(templateActionConfiguration);
+                ActionConfiguration actionConfiguration = actionDTO.getActionConfiguration();
+
+                List<Property> pluginSpecifiedTemplates = actionConfiguration.getPluginSpecifiedTemplates();
+                // SQL
+                if (actionBody != null) {
+                    String body = actionBody.replaceFirst(TEMPLATE_TABLE_NAME, tableName);
+                    final Matcher matcher = fieldNamePattern.matcher(body);
+                    actionConfiguration.setBody(matcher.replaceAll(key ->
+                        mappedColumns.get(key.group()) == null ? key.group() : mappedColumns.get(key.group()))
+                    );
+                }
+
+                if ( pluginSpecifiedTemplates != null) {
+                    pluginSpecifiedTemplates.forEach(property -> {
+                        if (property != null && property.getValue() instanceof String) {
+                            final Matcher matcher = wordPattern.matcher(property.getValue().toString());
+                            property.setValue(matcher.replaceAll(key ->
+                                mappedColumns.get(key.group()) == null ? key.group() : mappedColumns.get(key.group()))
+                            );
+                        }
+                    });
+                }
+
+                actionDTO.setActionConfiguration(deleteUnwantedWidgetReferenceInActions(actionConfiguration, deletedWidgetNames));
+                return layoutActionService.createAction(actionDTO);
+            });
+    }
+
+    /**
+     * @param sourceTable provides keys for Map from column names
+     * @param destTable provides values for Map from column names
+     * @param searchColumn specific column provided to implement the filter for Select and Find query
+     * @param tableColumns Specific columns provided by higher order function to act as values for Map
+     * @return Map of sourceColumnNames to tableColumns
+     */
+    private Map<String, String> mapTableColumnNames(Table sourceTable,
+                                                    Table destTable,
+                                                    final String searchColumn,
+                                                    Set<String> tableColumns) {
+
+        /*
+            1. Fetch and map primary keys for source and destination columns if available
+            2. Map remaining column names
+         */
+        log.debug("Mapping column names with template application for table {}", destTable.getName());
+        Map<String, String> mappedTableColumns = new HashMap<>();
+
+        if (searchColumn != null && !searchColumn.isEmpty()) {
+            mappedTableColumns.put(DEFAULT_SEARCH_COLUMN, searchColumn);
+            sourceTable.getColumns().removeIf(column -> column.getName().equals(DEFAULT_SEARCH_COLUMN));
+            destTable.getColumns().removeIf(column -> column.getName().equals(searchColumn));
+        }
+        List<Column> sourceTableColumns = sourceTable.getColumns(), destTableColumns = destTable.getColumns();
+        if (!CollectionUtils.isEmpty(tableColumns) && tableColumns.size() > MIN_TABLE_COLUMNS) {
+            destTableColumns = destTableColumns.stream()
+                .filter(column -> tableColumns.contains(column.getName()))
+                .collect(Collectors.toList());
+        }
+        mappedTableColumns.putAll(mapKeys(sourceTable, destTable));
+        sourceTableColumns = sourceTableColumns.stream()
+            .filter(key -> !mappedTableColumns.containsKey(key.toString()))
+            .collect(Collectors.toList());
+
+        destTableColumns = destTableColumns.stream()
+            .filter(key -> !mappedTableColumns.containsValue(key.toString()))
+            .collect(Collectors.toList());
+
+        int idx = 0;
+        while (idx < sourceTableColumns.size() && idx < destTableColumns.size()) {
+            if (!mappedTableColumns.containsKey(sourceTableColumns.get(idx).getName())) {
+                mappedTableColumns.put(sourceTableColumns.get(idx).getName(), destTableColumns.get(idx).getName());
+            }
+            idx++;
+        }
+        
+        if (idx < sourceTableColumns.size()) {
+            while (idx < sourceTableColumns.size()) {
+                //This will act as a ref to delete the unwanted fields from actions and layout
+                mappedTableColumns.put(sourceTableColumns.get(idx).getName(), DELETE_FIELD);
+                idx++;
+            }
+        }
+        return mappedTableColumns;
+    }
+    
+    private Map<String, String> mapKeys(Table sourceTable, Table destTable) {
+        Map<String, String> primaryKeyNameMap = new HashMap<>();
+        //keyType vs keyName
+        List<String> sourceKeys = new ArrayList<>();
+        List<String> destKeys = new ArrayList<>();
+        
+        if (sourceTable.getKeys() == null || sourceTable.getKeys().isEmpty()
+            || destTable.getKeys() == null || destTable.getKeys().isEmpty()) {
+            return primaryKeyNameMap;
+        }
+        sourceTable.getKeys().forEach(key -> {
+            if (key instanceof PrimaryKey) {
+                PrimaryKey pKey = (PrimaryKey) key;
+                sourceKeys.addAll(pKey.getColumnNames());
+            }
+        });
+        destTable.getKeys().forEach(key -> {
+            if (key instanceof PrimaryKey) {
+                PrimaryKey pKey = (PrimaryKey) key;
+                destKeys.addAll(pKey.getColumnNames());
+            }
+        });
+        return Streams.zip(sourceKeys.stream(), destKeys.stream(), Maps::immutableEntry)
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    /**
+     * @param dsl
+     * @param mappedColumnsAndTableNames map to replace column names
+     * @param deletedWidgets return the widgets those are deleted from the dsl
+     * @return updated dsl for the widget
+     */
+    private JSONObject extractAndUpdateAllWidgetFromDSL(JSONObject dsl,
+                                                        Map<String, String> mappedColumnsAndTableNames,
+                                                        Set<String> deletedWidgets) {
+
+        /*
+            1. Fetch the children of the current node in the DSL and recursively iterate over them
+            2. Delete unwanted children and update dsl
+         */
+        if (dsl.get(FieldName.WIDGET_NAME) == null) {
+            // This isn't a valid widget configuration. No need to traverse this.
+            return dsl;
+        }
+
+        updateTemplateWidgets(dsl, mappedColumnsAndTableNames);
+
+        // Updates in dynamicBindingPathlist not required as it's updated by FE code
+        // Fetch the children of the current node in the DSL and recursively iterate over them
+        ArrayList<Object> children = (ArrayList<Object>) dsl.get(FieldName.CHILDREN);
+        ArrayList<Object> newChildren = new ArrayList<>();
+        if (children != null) {
+            for (Object obj : children) {
+                if (!(obj instanceof Map)) {
+                    log.error("Child in DSL is not instanceof Map, {}", obj);
+                    continue;
+                }
+                Map data = (Map) obj;
+                JSONObject object = new JSONObject();
+                // If the children tag exists and there are entries within it
+                if (!CollectionUtils.isEmpty(data)) {
+                    object.putAll(data);
+                    JSONObject child =
+                        extractAndUpdateAllWidgetFromDSL(object, mappedColumnsAndTableNames, deletedWidgets);
+                    String widgetType = child.getAsString(FieldName.WIDGET_TYPE);
+                    if (FieldName.TABLE_WIDGET.equals(widgetType)
+                        || FieldName.CONTAINER_WIDGET.equals(widgetType)
+                        || FieldName.CANVAS_WIDGET.equals(widgetType)
+                        || FieldName.FORM_WIDGET.equals(widgetType)
+                        || !child.toString().contains(DELETE_FIELD)
+                    ) {
+                        newChildren.add(child);
+                    } else {
+                        deletedWidgets.add(child.getAsString(FieldName.WIDGET_NAME));
+                    }
+                }
+            }
+            dsl.put(FieldName.CHILDREN, newChildren);
+        }
+
+        return dsl;
+    }
+
+    /**
+     * This function will update the widget dsl fields mentioned in WIDGET_FIELDS
+     */
+    private JSONObject updateTemplateWidgets(JSONObject widgetDsl, Map<String, String> mappedColumnsAndTableNames) {
+
+        List<String> keys = widgetDsl.keySet().stream().filter(WIDGET_FIELDS::contains).collect(Collectors.toList());
+        for (String key : keys) {
+            if (FieldName.PRIMARY_COLUMNS.equals(key)) {
+                Map primaryColumns = (Map) widgetDsl.get(FieldName.PRIMARY_COLUMNS);
+                Map newPrimaryColumns = new HashMap();
+                Boolean updateRequired = false;
+                for (String columnName : (Set<String>) primaryColumns.keySet()) {
+                    if (FieldName.MONGO_ESCAPE_ID.equals(columnName)) {
+                        updateRequired = true;
+                        newPrimaryColumns.put(FieldName.MONGO_UNESCAPED_ID, primaryColumns.get(columnName));
+                    } else if (FieldName.MONGO_ESCAPE_CLASS.equals(columnName)) {
+                        updateRequired = true;
+                        newPrimaryColumns.put(FieldName.MONGO_UNESCAPED_CLASS, primaryColumns.get(columnName));
+                    } else {
+                        newPrimaryColumns.put(columnName, primaryColumns.get(columnName));
+                    }
+                }
+                if (updateRequired) {
+                    widgetDsl.put(FieldName.PRIMARY_COLUMNS, newPrimaryColumns);
+                }
+            } else {
+                //Get separate words and map to tableColumns from widgetDsl
+                Matcher matcher = wordPattern.matcher(widgetDsl.getAsString(key));
+                widgetDsl.put(key, matcher.replaceAll(field ->
+                    mappedColumnsAndTableNames.get(field.group()) == null ?
+                        field.group() : mappedColumnsAndTableNames.get(field.group())
+                ));
+            }
+        }
+        return widgetDsl;
+    }
+
+    /**
+     * This will delete widget names from body when template datasource have more number of columns
+     * @param actionConfiguration
+     * @param deletedWidgetNames widgets for which references to be removed from the actions
+     * @return updated ActionConfiguration with deleteWidgets ref removed
+     */
+    private ActionConfiguration deleteUnwantedWidgetReferenceInActions(ActionConfiguration actionConfiguration, Set<String> deletedWidgetNames) {
+
+        // We need to check this for insertQuery for SQL
+        if (StringUtils.containsIgnoreCase(actionConfiguration.getBody(), "VALUES")) {
+
+            // Get separate words and map to tableColumns from widgetDsl
+
+            Matcher matcher = wordPattern.matcher(actionConfiguration.getBody());
+            actionConfiguration.setBody(matcher.replaceAll(field -> deletedWidgetNames.contains(field.group())
+                ? DELETE_FIELD : field.group()
+            ));
+        }
+
+        // When the connected datasource have less number of columns than template datasource, delete the unwanted fields
+        // \n"DELETE_FIELD" : '{{Widget.property}}',\n => "" : As mapping is not present
+        final String regex = "[\"\n].*" + DELETE_FIELD + ".*[,\n]";
+        if (actionConfiguration.getBody() != null) {
+            actionConfiguration.setBody(actionConfiguration.getBody().replaceAll(regex, ""));
+            // This will remove the unwanted comma after fields deletion if present at the end of body
+            // "field1\","field2\",\n\t\"field3" \n,{non-word-characters})\n => insertQuery
+            if (actionConfiguration.getBody().matches("(?s).*,[\\W]*?\\).*")) {
+                actionConfiguration.setBody(actionConfiguration.getBody().replaceAll(",[\\W]*?\\)", ")"));
+            }
+            // "field1\","field2\",\n\t\"field3\" ,{non-word-characters => \n\t} WHERE => WHERE condition
+            else if (actionConfiguration.getBody().matches("(?s).*,[\\W]*?(?i)WHERE.*")) {
+                actionConfiguration.setBody(actionConfiguration.getBody().replaceAll(",[\\W]*?WHERE", "\nWHERE"));
+            }
+        }
+
+        if ( actionConfiguration.getPluginSpecifiedTemplates() != null) {
+            actionConfiguration.getPluginSpecifiedTemplates().forEach(property -> {
+                if (property != null && property.getValue() instanceof String) {
+                    property.setValue(property.getValue().toString().replaceAll(regex, ""));
+                    // This will remove the unwanted comma after fields deletion if present at the end of body
+                    // "field1\","field2\",\n\t\"field3" \n,{non-word-characters})\n
+                    if (property.getValue().toString().matches("(?s).*,[\\W]*?}.*")) {
+                        property.setValue(property.getValue().toString().replaceAll(",[\\W]*?}", "\n}"));
+                    }
+                }
+            });
+        }
+        return actionConfiguration;
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolution.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolution.java
index d7c82d720a..3f9f3f7801 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolution.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolution.java
@@ -3,9 +3,9 @@ package com.appsmith.server.solutions;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import com.appsmith.external.exceptions.pluginExceptions.StaleConnectionException;
-import com.appsmith.external.models.AuthenticationDTO;
 import com.appsmith.external.models.DatasourceStructure;
 import com.appsmith.external.plugins.PluginExecutor;
+import com.appsmith.external.services.EncryptionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Datasource;
 import com.appsmith.server.exceptions.AppsmithError;
@@ -14,7 +14,6 @@ import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.repositories.CustomDatasourceRepository;
 import com.appsmith.server.services.DatasourceContextService;
 import com.appsmith.server.services.DatasourceService;
-import com.appsmith.external.services.EncryptionService;
 import com.appsmith.server.services.PluginService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,9 +22,7 @@ import org.springframework.util.CollectionUtils;
 import reactor.core.publisher.Mono;
 
 import java.time.Duration;
-import java.util.Map;
 import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;
 
 @Component
 @RequiredArgsConstructor
@@ -78,8 +75,6 @@ public class DatasourceStructureSolution {
             return Mono.just(datasource.getStructure());
         }
 
-        decryptEncryptedFieldsInDatasource(datasource);
-
         // This mono, when computed, will load the structure of the datasource by calling the plugin method.
         return pluginExecutorHelper
                 .getPluginExecutor(pluginService.findById(datasource.getPluginId()))
@@ -130,23 +125,4 @@ public class DatasourceStructureSolution {
                         : datasourceRepository.saveStructure(datasource.getId(), structure).thenReturn(structure)
                 );
     }
-
-    private Datasource decryptEncryptedFieldsInDatasource(Datasource datasource) {
-        // If datasource has encrypted fields, decrypt and set it in the datasource.
-        if (datasource.getDatasourceConfiguration() != null) {
-            AuthenticationDTO authentication = datasource.getDatasourceConfiguration().getAuthentication();
-            if (authentication != null && authentication.isEncrypted()) {
-                Map<String, String> decryptedFields = authentication.getEncryptionFields().entrySet().stream()
-                        .filter(e -> e.getValue() != null)
-                        .collect(Collectors.toMap(
-                                Map.Entry::getKey,
-                                e -> encryptionService.decryptString(e.getValue())));
-                authentication.setEncryptionFields(decryptedFields);
-                authentication.setIsEncrypted(false);
-            }
-        }
-
-        return datasource;
-    }
-
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EmailEventHandler.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EmailEventHandler.java
new file mode 100644
index 0000000000..5e9e837014
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EmailEventHandler.java
@@ -0,0 +1,195 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.Comment;
+import com.appsmith.server.domains.CommentThread;
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.UserRole;
+import com.appsmith.server.events.CommentAddedEvent;
+import com.appsmith.server.events.CommentThreadClosedEvent;
+import com.appsmith.server.helpers.CommentUtils;
+import com.appsmith.server.helpers.PolicyUtils;
+import com.appsmith.server.notifications.EmailSender;
+import com.appsmith.server.repositories.ApplicationRepository;
+import com.appsmith.server.repositories.OrganizationRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class EmailEventHandler {
+    private static final String COMMENT_ADDED_EMAIL_TEMPLATE = "email/commentAddedTemplate.html";
+
+    private final ApplicationEventPublisher applicationEventPublisher;
+    private final EmailSender emailSender;
+    private final OrganizationRepository organizationRepository;
+    private final ApplicationRepository applicationRepository;
+    private final PolicyUtils policyUtils;
+
+    public Mono<Boolean> publish(String authorUserName, String applicationId, Comment comment, String originHeader, Set<String> subscribers) {
+        if(CollectionUtils.isEmpty(subscribers)) {  // no subscriber found, return without doing anything
+            return Mono.just(Boolean.FALSE);
+        }
+
+        return applicationRepository.findById(applicationId).flatMap(application -> {
+            return organizationRepository.findById(application.getOrganizationId()).flatMap(organization -> {
+                applicationEventPublisher.publishEvent(
+                        new CommentAddedEvent(authorUserName, organization, application, originHeader, comment, subscribers)
+                );
+                return Mono.just(organization);
+            });
+        }).thenReturn(Boolean.TRUE);
+    }
+
+    public Mono<Boolean> publish(String authorUserName, String applicationId, CommentThread thread, String originHeader) {
+        if(CollectionUtils.isEmpty(thread.getSubscribers())) {
+            // no subscriber found, return without doing anything
+            return Mono.just(Boolean.FALSE);
+        }
+
+        return applicationRepository.findById(applicationId).flatMap(application -> {
+            return organizationRepository.findById(application.getOrganizationId()).flatMap(organization -> {
+                applicationEventPublisher.publishEvent(
+                        new CommentThreadClosedEvent(authorUserName, organization, application, originHeader, thread)
+                );
+                return Mono.just(organization);
+            });
+        }).thenReturn(Boolean.TRUE);
+    }
+
+    @Async
+    @EventListener
+    public void handle(CommentAddedEvent event) {
+        this.sendEmailForComment(
+                event.getAuthorUserName(),
+                event.getOrganization(),
+                event.getApplication(),
+                event.getComment(),
+                event.getOriginHeader(),
+                event.getSubscribers()
+        ).subscribeOn(Schedulers.elastic())
+        .subscribe();
+    }
+
+    @Async
+    @EventListener
+    public void handle(CommentThreadClosedEvent event) {
+        this.sendEmailForComment(
+                event.getAuthorUserName(),
+                event.getOrganization(),
+                event.getApplication(),
+                event.getCommentThread(),
+                event.getOriginHeader(),
+                event.getCommentThread().getSubscribers()
+        )
+        .subscribeOn(Schedulers.elastic())
+        .subscribe();
+    }
+
+    private String getCommentThreadLink(Application application, String pageId, String threadId, UserRole userRole, String originHeader) {
+        Boolean canManageApplication = policyUtils.isPermissionPresentForUser(
+                application.getPolicies(), MANAGE_APPLICATIONS.getValue(), userRole.getUsername()
+        );
+        String urlPostfix = "/edit";
+        if (Boolean.FALSE.equals(canManageApplication)) {  // user has no permission to manage application
+            urlPostfix = "";
+        }
+        return String.format("%s/applications/%s/pages/%s%s?commentThreadId=%s&isCommentMode=true",
+                originHeader, application.getId(), pageId, urlPostfix, threadId
+        );
+    }
+
+    private Mono<Boolean> getResolveThreadEmailSenderMono(UserRole receiverUserRole, CommentThread commentThread,
+                                             String originHeader, Organization organization,  Application application) {
+        String receiverName = StringUtils.isEmpty(receiverUserRole.getName()) ? "User" : receiverUserRole.getName();
+        String receiverEmail = receiverUserRole.getUsername();
+        CommentThread.CommentThreadState resolvedState = commentThread.getResolvedState();
+        Map<String, Object> templateParams = new HashMap<>();
+        templateParams.put("App_User_Name", receiverName);
+        templateParams.put("Commenter_Name", resolvedState.getAuthorName());
+        templateParams.put("Application_Name", commentThread.getApplicationName());
+        templateParams.put("Organization_Name", organization.getName());
+        templateParams.put("commentUrl", getCommentThreadLink(
+                application,
+                commentThread.getPageId(),
+                commentThread.getId(),
+                receiverUserRole,
+                originHeader)
+        );
+        templateParams.put("Resolved", true);
+
+        String emailSubject = String.format(
+                "%s has resolved comment in %s", resolvedState.getAuthorName(), commentThread.getApplicationName()
+        );
+        return emailSender.sendMail(receiverEmail, emailSubject, COMMENT_ADDED_EMAIL_TEMPLATE, templateParams);
+    }
+
+    private Mono<Boolean> getAddCommentEmailSenderMono(UserRole receiverUserRole, Comment comment, String originHeader,
+                                             Organization organization, Application application) {
+        String receiverName = StringUtils.isEmpty(receiverUserRole.getName()) ? "User" : receiverUserRole.getName();
+        String receiverEmail = receiverUserRole.getUsername();
+
+        Map<String, Object> templateParams = new HashMap<>();
+        templateParams.put("App_User_Name", receiverName);
+        templateParams.put("Commenter_Name", comment.getAuthorName());
+        templateParams.put("Application_Name", comment.getApplicationName());
+        templateParams.put("Organization_Name", organization.getName());
+        templateParams.put("Comment_Body", CommentUtils.getCommentBody(comment));
+        templateParams.put("commentUrl", getCommentThreadLink(
+                application,
+                comment.getPageId(),
+                comment.getThreadId(),
+                receiverUserRole,
+                originHeader)
+        );
+
+        String emailSubject = String.format(
+                "New comment from %s in %s", comment.getAuthorName(), comment.getApplicationName()
+        );
+
+        // check if user has been mentioned in the comment
+        if(CommentUtils.isUserMentioned(comment, receiverEmail)) {
+            templateParams.put("Mentioned", true);
+            emailSubject = String.format("New comment for you from %s", comment.getAuthorName());
+        } else if(Boolean.TRUE.equals(comment.getLeading())) {
+            templateParams.put("NewComment", true);
+        } else {
+            templateParams.put("Replied", true);
+        }
+        return emailSender.sendMail(receiverEmail, emailSubject, COMMENT_ADDED_EMAIL_TEMPLATE, templateParams);
+    }
+
+    private <E> Mono<Boolean> sendEmailForComment(String authorUserName, Organization organization, Application application, E commentDomain, String originHeader, Set<String> subscribers) {
+        List<Mono<Boolean>> emailMonos = new ArrayList<>();
+        for (UserRole userRole : organization.getUserRoles()) {
+            if(!authorUserName.equals(userRole.getUsername()) && subscribers.contains(userRole.getUsername())) {
+                if(commentDomain instanceof Comment) {
+                    Comment comment = (Comment)commentDomain;
+                    emailMonos.add(getAddCommentEmailSenderMono(userRole, comment, originHeader, organization, application));
+                } else if(commentDomain instanceof CommentThread) {
+                    CommentThread commentThread = (CommentThread) commentDomain;
+                    emailMonos.add(getResolveThreadEmailSenderMono(userRole, commentThread, originHeader, organization, application));
+                }
+            }
+        }
+        return Flux.concat(emailMonos).then(Mono.just(Boolean.TRUE));
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ExamplesOrganizationCloner.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ExamplesOrganizationCloner.java
index abd99f4e91..dcdd2a57bf 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ExamplesOrganizationCloner.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ExamplesOrganizationCloner.java
@@ -21,7 +21,6 @@ import com.appsmith.server.repositories.OrganizationRepository;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.ConfigService;
-import com.appsmith.server.services.DatasourceContextService;
 import com.appsmith.server.services.DatasourceService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.NewActionService;
@@ -60,7 +59,6 @@ public class ExamplesOrganizationCloner {
     private final UserService userService;
     private final ApplicationService applicationService;
     private final ApplicationPageService applicationPageService;
-    private final DatasourceContextService datasourceContextService;
     private final NewPageRepository newPageRepository;
     private final NewActionService newActionService;
     private final LayoutActionService layoutActionService;
@@ -80,8 +78,9 @@ public class ExamplesOrganizationCloner {
      * @return Empty Mono.
      */
     private Mono<Organization> cloneExamplesOrganization(User user) {
-        if (user.getExamplesOrganizationId() != null) {
-            // This user already has an examples organization, don't have to do anything.
+        if (!CollectionUtils.isEmpty(user.getOrganizationIds())) {
+            // Don't create an examples organization if the user already has some organizations, perhaps because they
+            // were invited to some.
             return Mono.empty();
         }
 
@@ -371,7 +370,7 @@ public class ExamplesOrganizationCloner {
                 );
     }
 
-    private Mono<Datasource> cloneDatasource(String datasourceId, String toOrganizationId) {
+    public Mono<Datasource> cloneDatasource(String datasourceId, String toOrganizationId) {
         final Mono<List<Datasource>> existingDatasourcesMono = datasourceRepository.findAllByOrganizationId(toOrganizationId)
                 .collectList();
 
@@ -402,12 +401,7 @@ public class ExamplesOrganizationCloner {
                             .switchIfEmpty(Mono.defer(() -> {
                                 // No matching existing datasource found, so create a new one.
                                 makePristine(templateDatasource);
-
                                 templateDatasource.setOrganizationId(toOrganizationId);
-                                if (authentication != null) {
-                                    datasourceContextService.decryptSensitiveFields(authentication);
-                                }
-
                                 return createSuffixedDatasource(templateDatasource);
                             }));
                 });
@@ -460,8 +454,8 @@ public class ExamplesOrganizationCloner {
                     throw error;
                 });
     }
-
-    private void makePristine(BaseDomain domain) {
+    
+    public void makePristine(BaseDomain domain) {
         // Set the ID to null for this domain object so that it is saved a new document in the database (as opposed to
         // updating an existing document). If it contains any policies, they are also reset.
         domain.setId(null);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java
new file mode 100644
index 0000000000..5b5a87ddee
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java
@@ -0,0 +1,696 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.external.helpers.BeanCopyUtils;
+import com.appsmith.external.models.AuthenticationDTO;
+import com.appsmith.external.models.AuthenticationResponse;
+import com.appsmith.external.models.BaseDomain;
+import com.appsmith.external.models.BasicAuth;
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.DecryptedSensitiveFields;
+import com.appsmith.external.models.OAuth2;
+import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.ApplicationJson;
+import com.appsmith.server.domains.ApplicationPage;
+import com.appsmith.server.domains.Datasource;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.PluginType;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.dtos.ActionDTO;
+import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.repositories.DatasourceRepository;
+import com.appsmith.server.repositories.NewActionRepository;
+import com.appsmith.server.repositories.NewPageRepository;
+import com.appsmith.server.repositories.PluginRepository;
+import com.appsmith.server.services.ApplicationPageService;
+import com.appsmith.server.services.ApplicationService;
+import com.appsmith.server.services.DatasourceService;
+import com.appsmith.server.services.NewActionService;
+import com.appsmith.server.services.NewPageService;
+import com.appsmith.server.services.OrganizationService;
+import com.appsmith.server.services.SequenceService;
+import com.appsmith.server.services.SessionUserService;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.bson.types.ObjectId;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.http.MediaType;
+import org.springframework.http.codec.multipart.Part;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.lang.reflect.Type;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ImportExportApplicationService {
+    private final DatasourceService datasourceService;
+    private final SessionUserService sessionUserService;
+    private final NewActionRepository newActionRepository;
+    private final DatasourceRepository datasourceRepository;
+    private final PluginRepository pluginRepository;
+    private final OrganizationService organizationService;
+    private final ApplicationService applicationService;
+    private final NewPageService newPageService;
+    private final ApplicationPageService applicationPageService;
+    private final NewPageRepository newPageRepository;
+    private final NewActionService newActionService;
+    private final SequenceService sequenceService;
+    private final ExamplesOrganizationCloner examplesOrganizationCloner;
+
+    private static final Set<MediaType> ALLOWED_CONTENT_TYPES = Set.of(MediaType.APPLICATION_JSON);
+    public final String INVALID_JSON_FILE = "invalid json file";
+    private enum PublishType {
+        UNPUBLISHED, PUBLISHED
+    }
+
+    /**
+     * This function will give the application resource to rebuild the application in import application flow
+     * @param applicationId which needs to be exported
+     * @return
+     */
+    public Mono<ApplicationJson> exportApplicationById(String applicationId) {
+
+        /*
+            1. Fetch application by id
+            2. Fetch pages from the application
+            3. Fetch datasources from organization
+            4. Fetch actions from the application
+            5. Filter out relevant datasources using actions reference
+         */
+        ApplicationJson applicationJson = new ApplicationJson();
+        Map<String, String> pluginMap = new HashMap<>();
+        Map<String, String> datasourceIdToNameMap = new HashMap<>();
+        Map<String, String> pageIdToNameMap = new HashMap<>();
+    
+        if (applicationId == null || applicationId.isEmpty()) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.APPLICATION_ID));
+        }
+
+        Mono<Application> applicationMono = applicationService.findById(applicationId, AclPermission.EXPORT_APPLICATIONS)
+            .switchIfEmpty(Mono.error(
+                new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, applicationId))
+            );
+
+        return pluginRepository
+            .findAll()
+            .map(plugin -> {
+                pluginMap.put(plugin.getId(), plugin.getPackageName());
+                return plugin;
+            })
+            .then(applicationMono)
+            .flatMap(application -> {
+
+                ApplicationPage unpublishedDefaultPage = application.getPages()
+                    .stream()
+                    .filter(ApplicationPage::getIsDefault)
+                    .findFirst()
+                    .orElse(null);
+    
+                if (unpublishedDefaultPage == null) {
+                    return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.DEFAULT_PAGE_NAME));
+                } else {
+                    applicationJson.setUnpublishedDefaultPageName(unpublishedDefaultPage.getId());
+                }
+                
+                if (application.getPublishedPages() != null) {
+                    ApplicationPage publishedDefaultPage = application.getPublishedPages()
+                        .stream()
+                        .filter(ApplicationPage::getIsDefault)
+                        .findFirst()
+                        .orElse(null);
+                    
+                    if(publishedDefaultPage != null) {
+                        applicationJson.setPublishedDefaultPageName(publishedDefaultPage.getId());
+                    }
+                }
+                
+                final String organizationId = application.getOrganizationId();
+                application.setOrganizationId(null);
+                application.setPages(null);
+                examplesOrganizationCloner.makePristine(application);
+                applicationJson.setExportedApplication(application);
+                return newPageRepository.findByApplicationId(applicationId, AclPermission.MANAGE_PAGES)
+                    .collectList()
+                    .flatMap(newPageList -> {
+                        Map<String, Set<String>> publishedMongoEscapedWidgetsNames = new HashMap<>();
+                        Map<String, Set<String>> unpublishedMongoEscapedWidgetsNames = new HashMap<>();
+                        newPageList.forEach(newPage -> {
+    
+                            if (newPage.getUnpublishedPage() != null) {
+                                pageIdToNameMap.put(
+                                    newPage.getId() + PublishType.UNPUBLISHED, newPage.getUnpublishedPage().getName()
+                                );
+                                PageDTO unpublishedPageDTO = newPage.getUnpublishedPage();
+                                if (StringUtils.equals(
+                                    applicationJson.getUnpublishedDefaultPageName(), newPage.getId())
+                                ) {
+                                    applicationJson.setUnpublishedDefaultPageName(unpublishedPageDTO.getName());
+                                }
+                                if (unpublishedPageDTO.getLayouts() != null) {
+                                    
+                                    unpublishedPageDTO.getLayouts().forEach(layout ->
+                                        unpublishedMongoEscapedWidgetsNames
+                                            .put(layout.getId(), layout.getMongoEscapedWidgetNames())
+                                    );
+                                }
+                            }
+
+                            if (newPage.getPublishedPage() != null) {
+                                pageIdToNameMap.put(
+                                    newPage.getId() + PublishType.PUBLISHED, newPage.getPublishedPage().getName()
+                                );
+                                PageDTO publishedPageDTO = newPage.getPublishedPage();
+                                if (applicationJson.getPublishedDefaultPageName() != null &&
+                                    StringUtils.equals(
+                                        applicationJson.getPublishedDefaultPageName(), newPage.getId()
+                                    )
+                                ) {
+                                    applicationJson.setPublishedDefaultPageName(publishedPageDTO.getName());
+                                }
+                                
+                                if (publishedPageDTO.getLayouts() != null) {
+                                    newPage.getPublishedPage().getLayouts().forEach(layout ->
+                                        publishedMongoEscapedWidgetsNames
+                                            .put(layout.getId(), layout.getMongoEscapedWidgetNames())
+                                    );
+                                }
+                            }
+                            newPage.setApplicationId(null);
+                            examplesOrganizationCloner.makePristine(newPage);
+                        });
+                        applicationJson.setPageList(newPageList);
+                        applicationJson.setPublishedLayoutmongoEscapedWidgets(publishedMongoEscapedWidgetsNames);
+                        applicationJson.setUnpublishedLayoutmongoEscapedWidgets(unpublishedMongoEscapedWidgetsNames);
+                        return datasourceRepository
+                            .findAllByOrganizationId(organizationId, AclPermission.MANAGE_DATASOURCES)
+                            .collectList();
+                    })
+                    .flatMapMany(datasourceList -> {
+                        datasourceList.forEach(datasource ->
+                            datasourceIdToNameMap.put(datasource.getId(), datasource.getName()));
+                        
+                        applicationJson.setDatasourceList(datasourceList);
+                        return newActionRepository
+                            .findByApplicationId(applicationId, AclPermission.MANAGE_ACTIONS, null);
+                    })
+                    .collectList()
+                    .map(newActionList -> {
+                        Set<String> concernedDBNames = new HashSet<>();
+                        newActionList.forEach(newAction -> {
+                            newAction.setPluginId(pluginMap.get(newAction.getPluginId()));
+                            newAction.setOrganizationId(null);
+                            newAction.setPolicies(null);
+                            newAction.setApplicationId(null);
+                            //Collect Datasource names to filter only required datasources
+                            if (PluginType.DB.equals(newAction.getPluginType())
+                                || PluginType.API.equals(newAction.getPluginType())
+                                || PluginType.SAAS.equals(newAction.getPluginType())) {
+                                concernedDBNames.add(
+                                    sanitizeDatasourceInActionDTO(newAction.getPublishedAction(), datasourceIdToNameMap, pluginMap, null)
+                                );
+                                concernedDBNames.add(
+                                    sanitizeDatasourceInActionDTO(newAction.getUnpublishedAction(), datasourceIdToNameMap, pluginMap, null)
+                                );
+                            }
+                            if (newAction.getUnpublishedAction() != null) {
+                                ActionDTO actionDTO = newAction.getUnpublishedAction();
+                                actionDTO.setPageId(pageIdToNameMap.get(actionDTO.getPageId() + PublishType.UNPUBLISHED));
+                            }
+                            if (newAction.getPublishedAction() != null) {
+                                ActionDTO actionDTO = newAction.getPublishedAction();
+                                actionDTO.setPageId(pageIdToNameMap.get(actionDTO.getPageId() + PublishType.PUBLISHED));
+                            }
+                        });
+                        applicationJson
+                                .getDatasourceList()
+                                .removeIf(datasource -> !concernedDBNames.contains(datasource.getName()));
+                        
+                        applicationJson.setActionList(newActionList);
+                        
+                        //Only export those datasources which are used in the app instead of org level
+                        Map<String, DecryptedSensitiveFields> decryptedFields = new HashMap<>();
+                        applicationJson.getDatasourceList().forEach(datasource -> {
+                            decryptedFields.put(datasource.getName(), getDecryptedFields(datasource));
+                            datasource.setId(null);
+                            datasource.setOrganizationId(null);
+                            datasource.setPluginId(pluginMap.get(datasource.getPluginId()));
+                            if (datasource.getDatasourceConfiguration() != null) {
+                                datasource.getDatasourceConfiguration().setAuthentication(null);
+                            }
+                        });
+                        applicationJson.setDecryptedFields(decryptedFields);
+                        return applicationJson;
+                    });
+                })
+                .then()
+                .thenReturn(applicationJson);
+    }
+
+    /**
+     * This function will take the Json filepart and saves the application in organization
+     * @param orgId
+     * @param filePart
+     * @return
+     */
+    public Mono<Application> extractFileAndSaveApplication(String orgId, Part filePart) {
+
+        /*
+            1. Check the validity of file part
+            2. Save application to organization
+         */
+
+        final MediaType contentType = filePart.headers().getContentType();
+        
+        if (orgId == null || orgId.isEmpty()) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+        }
+        
+        if (contentType == null || !ALLOWED_CONTENT_TYPES.contains(contentType)) {
+            return Mono.error(new AppsmithException(AppsmithError.VALIDATION_FAILURE, INVALID_JSON_FILE));
+        }
+
+        final Flux<DataBuffer> contentCache = filePart.content().cache();
+        Mono<String> stringifiedFile = DataBufferUtils.join(contentCache)
+            .map(dataBuffer -> {
+                byte[] data = new byte[dataBuffer.readableByteCount()];
+                dataBuffer.read(data);
+                DataBufferUtils.release(dataBuffer);
+                return new String(data);
+            });
+
+        return stringifiedFile
+                .flatMap(data -> {
+                    Gson gson = new Gson();
+                    Type fileType = new TypeToken<ApplicationJson>() {}.getType();
+                    ApplicationJson jsonFile = gson.fromJson(data, fileType);
+                    return importApplicationInOrganization(orgId, jsonFile);
+                });
+    }
+
+    /**
+     * This function will save the application to organisation from the application resource
+     * @param organizationId organization to which application is going to be stored
+     * @param importedDoc application resource which contains necessary information to save the application
+     * @return
+     */
+    public Mono<Application> importApplicationInOrganization(String organizationId, ApplicationJson importedDoc) {
+
+        /*
+            1. Fetch organization by id
+            2. Extract datasources and update plugin information
+            3. Create new datasource if same datasource is not present
+            4. Extract and save application
+            5. Extract and save pages in the application
+            6. Extract and save actions in the application
+         */
+        Map<String, String> pluginMap = new HashMap<>();
+        Map<String, String> datasourceMap = new HashMap<>();
+        Map<String, NewPage> pageNameMap = new HashMap<>();
+        Map<String, String> actionIdMap = new HashMap<>();
+        
+        Application importedApplication = importedDoc.getExportedApplication();
+        List<Datasource> importedDatasourceList = importedDoc.getDatasourceList();
+        List<NewPage> importedNewPageList = importedDoc.getPageList();
+        List<NewAction> importedNewActionList = importedDoc.getActionList();
+        
+        Mono<User> currUserMono = sessionUserService.getCurrentUser();
+        final Flux<Datasource> existingDatasourceFlux = datasourceRepository.findAllByOrganizationId(organizationId).cache();
+        
+        String errorField = "";
+        if (importedNewPageList == null || importedNewPageList.isEmpty()) {
+            errorField = FieldName.PAGES;
+        } else if (importedApplication == null) {
+            errorField = FieldName.APPLICATION;
+        } else if (importedNewActionList == null) {
+            errorField = FieldName.ACTIONS;
+        } else if (importedDatasourceList == null) {
+            errorField = FieldName.DATASOURCE;
+        }
+        
+        if(!errorField.isEmpty()) {
+            return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, errorField, INVALID_JSON_FILE));
+        }
+        
+        return pluginRepository.findAll()
+            .map(plugin -> {
+                pluginMap.put(plugin.getPackageName(), plugin.getId());
+                return plugin;
+            })
+            .then(organizationService.findById(organizationId, AclPermission.ORGANIZATION_MANAGE_APPLICATIONS))
+            .switchIfEmpty(Mono.error(
+                new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.ORGANIZATION, organizationId))
+            )
+            .flatMap(organization -> Flux.fromIterable(importedDatasourceList)
+                //Check for duplicate datasources to avoid duplicates in target organization
+                .flatMap(datasource -> {
+                    datasource.setPluginId(pluginMap.get(datasource.getPluginId()));
+                    datasource.setOrganizationId(organization.getId());
+                    
+                    //Check if any decrypted fields are present for datasource
+                    if (importedDoc.getDecryptedFields().get(datasource.getName()) != null) {
+                        
+                        DecryptedSensitiveFields decryptedFields =
+                            importedDoc.getDecryptedFields().get(datasource.getName());
+                        
+                        updateAuthenticationDTO(datasource, decryptedFields);
+                    }
+                    return createUniqueDatasourceIfNotPresent(existingDatasourceFlux, datasource, organizationId);
+                })
+                .map(datasource -> {
+                    datasourceMap.put(datasource.getName(), datasource.getId());
+                    return datasource;
+                })
+                .collectList()
+            )
+            .then(
+                
+                applicationPageService.setApplicationPolicies(currUserMono, organizationId, importedApplication)
+                    .flatMap(application -> applicationService
+                        .findByOrganizationId(organizationId, AclPermission.MANAGE_APPLICATIONS)
+                        .collectList()
+                        .flatMap(applicationList -> {
+                            
+                            Application duplicateNameApp = applicationList
+                                .stream()
+                                .filter(application1 -> StringUtils.equals(application1.getName(), application.getName()))
+                                .findAny()
+                                .orElse(null);
+                            
+                            return getUniqueSuffixForDuplicateNameEntity(duplicateNameApp, organizationId)
+                                .map(suffix -> {
+                                    importedApplication.setName(importedApplication.getName() + suffix);
+                                    return importedApplication;
+                                });
+                        })
+                        .then(applicationService.save(importedApplication))
+                    )
+            )
+            .flatMap(savedApp -> {
+                importedApplication.setId(savedApp.getId());
+                Map<PublishType, List<ApplicationPage>> applicationPages = Map.of(
+                    PublishType.UNPUBLISHED, new ArrayList<>(),
+                    PublishType.PUBLISHED, new ArrayList<>()
+                );
+                
+                return importAndSavePages(
+                    importedNewPageList,
+                    importedApplication,
+                    importedDoc.getPublishedLayoutmongoEscapedWidgets(),
+                    importedDoc.getUnpublishedLayoutmongoEscapedWidgets()
+                )
+                .map(newPage -> {
+                    ApplicationPage unpublishedAppPage = new ApplicationPage();
+                    ApplicationPage publishedAppPage = new ApplicationPage();
+                    
+                    if (newPage.getUnpublishedPage() != null && newPage.getUnpublishedPage().getName() != null) {
+                        unpublishedAppPage.setIsDefault(
+                            StringUtils.equals(
+                                newPage.getUnpublishedPage().getName(), importedDoc.getUnpublishedDefaultPageName()
+                            )
+                        );
+                        unpublishedAppPage.setId(newPage.getId());
+                        pageNameMap.put(newPage.getUnpublishedPage().getName(), newPage);
+                    }
+    
+                    if (newPage.getPublishedPage() != null && newPage.getPublishedPage().getName() != null) {
+                        publishedAppPage.setIsDefault(
+                            StringUtils.equals(
+                                newPage.getPublishedPage().getName(), importedDoc.getPublishedDefaultPageName()
+                            )
+                        );
+                        publishedAppPage.setId(newPage.getId());
+                        pageNameMap.put(newPage.getPublishedPage().getName(), newPage);
+                    }
+                    applicationPages.get(PublishType.UNPUBLISHED).add(unpublishedAppPage);
+                    applicationPages.get(PublishType.PUBLISHED).add(publishedAppPage);
+                    return applicationPages;
+                })
+                .then()
+                .thenReturn(applicationPages);
+            })
+            .flatMap(applicationPageMap -> {
+                importedApplication.setPages(applicationPageMap.get(PublishType.UNPUBLISHED));
+                importedApplication.setPublishedPages(applicationPageMap.get(PublishType.PUBLISHED));
+                
+                importedNewActionList.forEach(newAction -> {
+                    NewPage parentPage = new NewPage();
+                    if (newAction.getUnpublishedAction() != null && newAction.getUnpublishedAction().getName() != null) {
+                        parentPage = pageNameMap.get(newAction.getUnpublishedAction().getPageId());
+                        actionIdMap.put(newAction.getUnpublishedAction().getName() + parentPage.getId(), newAction.getId());
+                        newAction.getUnpublishedAction().setPageId(parentPage.getId());
+                        sanitizeDatasourceInActionDTO(newAction.getUnpublishedAction(), datasourceMap, pluginMap, organizationId);
+                    }
+                    
+                    if (newAction.getPublishedAction() != null && newAction.getPublishedAction().getName() != null) {
+                        parentPage = pageNameMap.get(newAction.getPublishedAction().getPageId());
+                        actionIdMap.put(newAction.getPublishedAction().getName() + parentPage.getId(), newAction.getId());
+                        newAction.getPublishedAction().setPageId(parentPage.getId());
+                        sanitizeDatasourceInActionDTO(newAction.getPublishedAction(), datasourceMap, pluginMap, organizationId);
+                    }
+                    
+                    examplesOrganizationCloner.makePristine(newAction);
+                    newAction.setOrganizationId(organizationId);
+                    newAction.setApplicationId(importedApplication.getId());
+                    newAction.setPluginId(pluginMap.get(newAction.getPluginId()));
+                    newActionService.generateAndSetActionPolicies(parentPage, newAction);
+                });
+                return newActionService.saveAll(importedNewActionList)
+                    .map(newAction -> {
+                        
+                        if (newAction.getUnpublishedAction() != null) {
+                            ActionDTO unpublishedAction = newAction.getUnpublishedAction();
+                            actionIdMap.put(
+                                actionIdMap.get(unpublishedAction.getName() + unpublishedAction.getPageId()),
+                                newAction.getId()
+                            );
+                        }
+    
+                        if (newAction.getPublishedAction() != null) {
+                            ActionDTO publishedAction = newAction.getPublishedAction();
+                            actionIdMap.put(
+                                actionIdMap.get(publishedAction.getName() + publishedAction.getPageId()),
+                                newAction.getId()
+                            );
+                        }
+                        
+                        return newAction;
+                    })
+                    .then(Mono.just(importedApplication));
+            })
+            .flatMap(ignored -> {
+                //Map layoutOnLoadActions ids with relevant actions
+                importedNewPageList.forEach(page -> mapActionIdWithPageLayout(page, actionIdMap));
+                return Flux.fromIterable(importedNewPageList)
+                    .flatMap(newPageService::save)
+                    .then(applicationService.update(importedApplication.getId(), importedApplication));
+            });
+    }
+
+    private Mono<String> getUniqueSuffixForDuplicateNameEntity(BaseDomain sourceEntity, String orgId) {
+        if (sourceEntity != null) {
+            return sequenceService
+                .getNextAsSuffix(sourceEntity.getClass(), " for organization with _id : " + orgId)
+                .flatMap(sequenceNumber -> Mono.just(" #" + sequenceNumber.trim()));
+        }
+        return Mono.just("");
+    }
+
+    private Flux<NewPage> importAndSavePages(List<NewPage> pages,
+                                             Application application,
+                                             Map<String, Set<String>> publishedMongoEscapedWidget,
+                                             Map<String, Set<String>> unpublishedMongoEscapedWidget
+    ) {
+
+        pages.forEach(newPage -> {
+            String layoutId = new ObjectId().toString();
+            newPage.setApplicationId(application.getId());
+            if (newPage.getUnpublishedPage() != null) {
+                applicationPageService.generateAndSetPagePolicies(application, newPage.getUnpublishedPage());
+                newPage.setPolicies(newPage.getUnpublishedPage().getPolicies());
+                if (unpublishedMongoEscapedWidget != null) {
+                    newPage.getUnpublishedPage().getLayouts().forEach(layout -> {
+                        layout.setMongoEscapedWidgetNames(unpublishedMongoEscapedWidget.get(layout.getId()));
+                        layout.setId(layoutId);
+                    });
+                }
+            }
+
+            if (newPage.getPublishedPage() != null) {
+                applicationPageService.generateAndSetPagePolicies(application, newPage.getPublishedPage());
+                if (publishedMongoEscapedWidget != null) {
+                    newPage.getPublishedPage().getLayouts().forEach(layout -> {
+                        layout.setMongoEscapedWidgetNames(publishedMongoEscapedWidget.get(layout.getId()));
+                        layout.setId(layoutId);
+                    });
+                }
+            }
+        });
+
+        return Flux.fromIterable(pages)
+                .flatMap(newPageService::save);
+    }
+
+    private String sanitizeDatasourceInActionDTO(ActionDTO actionDTO, Map<String, String> datasourceMap, Map<String, String> pluginMap, String organizationId) {
+        
+        if (actionDTO != null && actionDTO.getDatasource() != null) {
+
+            Datasource ds = actionDTO.getDatasource();
+            if (ds.getId() != null) {
+                //Mapping ds name in id field
+                ds.setId(datasourceMap.get(ds.getId()));
+                ds.setOrganizationId(null);
+                ds.setPluginId(null);
+                return ds.getId();
+            } else {
+                // This means we don't have regular datasource it can be simple REST_API
+                ds.setOrganizationId(organizationId);
+                ds.setPluginId(pluginMap.get(ds.getPluginId()));
+                return "";
+            }
+        }
+
+        return "";
+    }
+
+    private void mapActionIdWithPageLayout(NewPage page, Map<String, String> actionIdMap) {
+        if (page.getUnpublishedPage().getLayouts() != null) {
+
+            page.getUnpublishedPage().getLayouts().forEach(layout -> {
+                if (layout.getLayoutOnLoadActions() != null) {
+                    layout.getLayoutOnLoadActions().forEach(onLoadAction -> onLoadAction
+                            .forEach(actionDTO -> actionDTO.setId(actionIdMap.get(actionDTO.getId()))));
+                }
+            });
+        }
+
+        if (page.getPublishedPage() != null && page.getPublishedPage().getLayouts() != null) {
+
+            page.getPublishedPage().getLayouts().forEach(layout -> {
+                if (layout.getLayoutOnLoadActions() != null) {
+                    layout.getLayoutOnLoadActions().forEach(onLoadAction -> onLoadAction
+                        .forEach(actionDTO -> actionDTO.setId(actionIdMap.get(actionDTO.getId()))));
+                }
+            });
+        }
+    }
+
+    private Mono<Datasource> createUniqueDatasourceIfNotPresent(Flux<Datasource> existingDatasourceFlux,
+                                                                Datasource datasource,
+                                                                String toOrgId) {
+
+        final DatasourceConfiguration datasourceConfig = datasource.getDatasourceConfiguration();
+        AuthenticationResponse authResponse = new AuthenticationResponse();
+        if (datasourceConfig != null && datasourceConfig.getAuthentication() != null) {
+            BeanCopyUtils.copyNestedNonNullProperties(
+                datasourceConfig.getAuthentication().getAuthenticationResponse(), authResponse);
+            datasourceConfig.getAuthentication().setAuthenticationResponse(null);
+            datasourceConfig.getAuthentication().setAuthenticationType(null);
+        }
+        
+        return existingDatasourceFlux
+                .map(ds -> {
+                    final DatasourceConfiguration dsAuthConfig = ds.getDatasourceConfiguration();
+                    if (dsAuthConfig != null && dsAuthConfig.getAuthentication() != null) {
+                        dsAuthConfig.getAuthentication().setAuthenticationResponse(null);
+                        dsAuthConfig.getAuthentication().setAuthenticationType(null);
+                    }
+                    return ds;
+                })
+                .filter(ds -> ds.softEquals(datasource))
+                .next()  // Get the first matching datasource, we don't need more than one here.
+                .switchIfEmpty(Mono.defer(() -> {
+                    if (datasourceConfig != null && datasourceConfig.getAuthentication() != null) {
+                        datasourceConfig.getAuthentication().setAuthenticationResponse(authResponse);
+                    }
+                    // No matching existing datasource found, so create a new one.
+                    return datasourceService
+                        .findByNameAndOrganizationId(datasource.getName(), toOrgId, AclPermission.MANAGE_DATASOURCES)
+                        .flatMap(duplicateNameDatasource ->
+                            getUniqueSuffixForDuplicateNameEntity(duplicateNameDatasource, toOrgId)
+                        )
+                        .map(suffix -> {
+                            datasource.setName(datasource.getName() + suffix);
+                            return datasource;
+                        })
+                        .then(datasourceService.create(datasource));
+                }));
+    }
+
+    private Datasource updateAuthenticationDTO(Datasource datasource, DecryptedSensitiveFields decryptedFields) {
+
+        final DatasourceConfiguration dsConfig = datasource.getDatasourceConfiguration();
+        String authType = decryptedFields.getAuthType();
+        if (dsConfig == null || authType == null) {
+            return datasource;
+        }
+
+        if (StringUtils.equals(authType, DBAuth.class.getName())) {
+            final DBAuth dbAuth = decryptedFields.getDbAuth();
+            dbAuth.setPassword(decryptedFields.getPassword());
+            datasource.getDatasourceConfiguration().setAuthentication(dbAuth);
+        } else if (StringUtils.equals(authType, BasicAuth.class.getName())) {
+            final BasicAuth basicAuth = decryptedFields.getBasicAuth();
+            basicAuth.setPassword(decryptedFields.getPassword());
+            datasource.getDatasourceConfiguration().setAuthentication(basicAuth);
+        } else if (StringUtils.equals(authType, OAuth2.class.getName())) {
+            OAuth2 auth2 = decryptedFields.getOpenAuth2();
+            AuthenticationResponse authResponse = new AuthenticationResponse();
+            auth2.setClientSecret(decryptedFields.getPassword());
+            authResponse.setToken(decryptedFields.getToken());
+            authResponse.setRefreshToken(decryptedFields.getRefreshToken());
+            authResponse.setTokenResponse(decryptedFields.getTokenResponse());
+            authResponse.setExpiresAt(Instant.now());
+            auth2.setAuthenticationResponse(authResponse);
+            datasource.getDatasourceConfiguration().setAuthentication(auth2);
+        }
+        return datasource;
+    }
+
+    private DecryptedSensitiveFields getDecryptedFields(Datasource datasource) {
+        final AuthenticationDTO authentication = datasource.getDatasourceConfiguration() == null
+                ? null : datasource.getDatasourceConfiguration().getAuthentication();
+
+        if (authentication != null) {
+            DecryptedSensitiveFields dsDecryptedFields =
+                    authentication.getAuthenticationResponse() == null
+                        ? new DecryptedSensitiveFields()
+                        : new DecryptedSensitiveFields(authentication.getAuthenticationResponse());
+
+            if (authentication instanceof DBAuth) {
+                DBAuth auth = (DBAuth) authentication;
+                dsDecryptedFields.setPassword(auth.getPassword());
+                dsDecryptedFields.setDbAuth(auth);
+            } else if (authentication instanceof OAuth2) {
+                OAuth2 auth = (OAuth2) authentication;
+                dsDecryptedFields.setPassword(auth.getClientSecret());
+                dsDecryptedFields.setOpenAuth2(auth);
+            } else if (authentication instanceof BasicAuth) {
+                BasicAuth auth = (BasicAuth) authentication;
+                dsDecryptedFields.setPassword(auth.getPassword());
+                dsDecryptedFields.setBasicAuth(auth);
+            }
+            dsDecryptedFields.setAuthType(authentication.getClass().getName());
+            return dsDecryptedFields;
+        }
+        return null;
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ReleaseNotesService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ReleaseNotesService.java
index ef887b5bde..202935e5e1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ReleaseNotesService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ReleaseNotesService.java
@@ -82,6 +82,8 @@ public class ReleaseNotesService {
                 .flatMap(instanceId -> WebClient
                         .create(
                                 baseUrl + "/api/v1/releases?instanceId=" + instanceId +
+                                        // isCloudHosted should be true only for our cloud instance,
+                                        // For docker images that burn the segment key with the image, the CE key will be present
                                         "&isSourceInstall=" + (isCloudHosted || StringUtils.isEmpty(segmentConfig.getCeKey())) +
                                         (StringUtils.isEmpty(repo) ? "" : ("&repo=" + repo))
                         )
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandler.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandler.java
new file mode 100644
index 0000000000..31432fbb9c
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandler.java
@@ -0,0 +1,64 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.server.domains.User;
+import com.appsmith.server.events.UserChangedEvent;
+import com.appsmith.server.repositories.CommentRepository;
+import com.appsmith.server.repositories.OrganizationRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class UserChangedHandler {
+
+    private final ApplicationEventPublisher applicationEventPublisher;
+    private final CommentRepository commentRepository;
+    private final OrganizationRepository organizationRepository;
+
+    public User publish(User user) {
+        applicationEventPublisher.publishEvent(new UserChangedEvent(user));
+        return user;
+    }
+
+    @Async
+    @EventListener
+    public void handle(UserChangedEvent event) {
+        // The `user` object is expected to contain the NEW name.
+        final User user = event.getUser();
+        log.debug("Handling user document changes {}", user);
+        updateNameInComments(user)
+                .subscribeOn(Schedulers.elastic())
+                .subscribe();
+
+        updateNameInUserRoles(user)
+                .subscribeOn(Schedulers.elastic())
+                .subscribe();
+    }
+
+    private Mono<Void> updateNameInComments(User user) {
+        if (user.getId() == null) {
+            log.warn("Attempt to update name in comments for user with null ID.");
+            return Mono.empty();
+        }
+
+        log.debug("Updating name in comments for user {}", user.getId());
+        return commentRepository.updateAuthorNames(user.getId(), user.getName());
+    }
+
+    private Mono<Void> updateNameInUserRoles(User user) {
+        if (user.getId() == null) {
+            log.warn("Attempt to update name in userRoles of organization for user with null ID.");
+            return Mono.empty();
+        }
+
+        log.debug("Updating name in userRoles of organization for user {}", user.getId());
+        return organizationRepository.updateUserRoleNames(user.getId(), user.getName());
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserSignup.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserSignup.java
index 2ba4981499..ab352a4f93 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserSignup.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserSignup.java
@@ -77,7 +77,7 @@ public class UserSignup {
 
                     final WebFilterExchange webFilterExchange = new WebFilterExchange(exchange, EMPTY_WEB_FILTER_CHAIN);
                     return authenticationSuccessHandler
-                            .onAuthenticationSuccess(webFilterExchange, authentication)
+                            .onAuthenticationSuccess(webFilterExchange, authentication, true)
                             .thenReturn(savedUser);
                 });
     }
diff --git a/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json b/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json
new file mode 100644
index 0000000000..c481e7d184
--- /dev/null
+++ b/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json
@@ -0,0 +1 @@
+{"unpublishedDefaultPageName":"SQL","datasourceList":[{"new":true,"invalids":[],"pluginId":"amazons3-plugin","isValid":true,"name":"AmazonS3","userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"sshProxyEnabled":false,"endpoints":[{"host":""}],"properties":[{"value":"ap-south-1"},{"value":"amazon-s3","key":"s3Provider"},{"value":"","key":"customRegion"}]},"structure":{}},{"new":true,"invalids":[],"pluginId":"postgres-plugin","isValid":true,"name":"Internal DB","userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"sshProxyEnabled":false,"endpoints":[{"port":5432,"host":"fake-api.cvuydmurdlas.us-east-1.rds.amazonaws.com"}],"connection":{"mode":"READ_WRITE","ssl":{"authType":"DEFAULT"}}},"structure":{"tables":[{"schema":"public","columns":[{"defaultValue":"nextval('active_app_report_id_seq'::regclass)","name":"id","type":"int4"},{"name":"active_app","type":"text"},{"name":"num_api_calls","type":"int8"},{"name":"date","type":"text"},{"name":"report_type","type":"text"},{"name":"app_id","type":"text"}],"keys":[{"columnNames":["id"],"name":"active_app_report_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"active_app_report\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"active_app_report\" (\"active_app\", \"num_api_calls\", \"date\", \"report_type\", \"app_id\")\n  VALUES ('', 1, '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"active_app_report\" SET\n    \"active_app\" = ''\n    \"num_api_calls\" = 1\n    \"date\" = ''\n    \"report_type\" = ''\n    \"app_id\" = ''\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"active_app_report\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.active_app_report","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('audit_logs_id_seq'::regclass)","name":"id","type":"int4"},{"name":"date","type":"timestamptz"},{"name":"appId","type":"text"},{"name":"appName","type":"text"},{"name":"orgId","type":"text"},{"name":"actionName","type":"text"},{"name":"userId","type":"text"},{"name":"pageId","type":"text"},{"name":"insert_id","type":"text"},{"name":"pageName","type":"text"},{"name":"req","type":"json"}],"keys":[{"columnNames":["id"],"name":"audit_logs_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"audit_logs\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"audit_logs\" (\"date\", \"appId\", \"appName\", \"orgId\", \"actionName\", \"userId\", \"pageId\", \"insert_id\", \"pageName\", \"req\")\n  VALUES (TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '', '', '', '', '', '', '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"audit_logs\" SET\n    \"date\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET'\n    \"appId\" = ''\n    \"appName\" = ''\n    \"orgId\" = ''\n    \"actionName\" = ''\n    \"userId\" = ''\n    \"pageId\" = ''\n    \"insert_id\" = ''\n    \"pageName\" = ''\n    \"req\" = ''\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"audit_logs\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.audit_logs","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('discord_messages_id_seq'::regclass)","name":"id","type":"int4"},{"name":"msg_id","type":"text"},{"name":"created_at","type":"date"},{"name":"author","type":"text"}],"keys":[{"columnNames":["id"],"name":"discord_messages_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"discord_messages\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"discord_messages\" (\"msg_id\", \"created_at\", \"author\")\n  VALUES ('', '2019-07-01', '');"},{"title":"UPDATE","body":"UPDATE public.\"discord_messages\" SET\n    \"msg_id\" = ''\n    \"created_at\" = '2019-07-01'\n    \"author\" = ''\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"discord_messages\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.discord_messages","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('email_issues_id_seq'::regclass)","name":"id","type":"int4"},{"name":"from","type":"text"},{"name":"body","type":"text"},{"name":"created_at","type":"timestamptz"},{"name":"subject","type":"text"},{"name":"is_tagged","type":"bool"},{"name":"assignee","type":"text"}],"keys":[{"columnNames":["id"],"name":"email_issues_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"email_issues\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"email_issues\" (\"from\", \"body\", \"created_at\", \"subject\", \"is_tagged\", \"assignee\")\n  VALUES ('', '', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"email_issues\" SET\n    \"from\" = ''\n    \"body\" = ''\n    \"created_at\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET'\n    \"subject\" = ''\n    \"is_tagged\" = ''\n    \"assignee\" = ''\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"email_issues\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.email_issues","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('github_issues_id_seq'::regclass)","name":"id","type":"int4"},{"name":"issue_id","type":"text"},{"name":"order","type":"int4"}],"keys":[{"columnNames":["id"],"name":"github_issues_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"github_issues\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"github_issues\" (\"issue_id\", \"order\")\n  VALUES ('', 1);"},{"title":"UPDATE","body":"UPDATE public.\"github_issues\" SET\n    \"issue_id\" = ''\n    \"order\" = 1\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"github_issues\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.github_issues","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('github_projects_id_seq'::regclass)","name":"id","type":"int4"},{"name":"github_id","type":"text"},{"name":"due_date","type":"timestamptz"},{"name":"tag","type":"text"}],"keys":[{"columnNames":["id"],"name":"github_projects_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"github_projects\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"github_projects\" (\"github_id\", \"due_date\", \"tag\")\n  VALUES ('', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '');"},{"title":"UPDATE","body":"UPDATE public.\"github_projects\" SET\n    \"github_id\" = ''\n    \"due_date\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET'\n    \"tag\" = ''\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"github_projects\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.github_projects","type":"TABLE"},{"schema":"public","columns":[{"name":"id","type":"text"},{"name":"assignee","type":"text"},{"name":"state","type":"text"}],"keys":[{"columnNames":["id"],"name":"support_email_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"support_email\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"support_email\" (\"id\", \"assignee\", \"state\")\n  VALUES ('', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"support_email\" SET\n    \"id\" = ''\n    \"assignee\" = ''\n    \"state\" = ''\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"support_email\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.support_email","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('support_tickets_id_seq'::regclass)","name":"id","type":"int4"},{"name":"description","type":"varchar"},{"name":"created_at","type":"timestamptz"},{"name":"author","type":"text"},{"name":"user","type":"text"},{"name":"comments","type":"text"}],"keys":[{"columnNames":["id"],"name":"support_tickets_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"support_tickets\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"support_tickets\" (\"description\", \"created_at\", \"author\", \"user\", \"comments\")\n  VALUES ('', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"support_tickets\" SET\n    \"description\" = ''\n    \"created_at\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET'\n    \"author\" = ''\n    \"user\" = ''\n    \"comments\" = ''\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"support_tickets\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.support_tickets","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('template_table_col1_seq'::regclass)","name":"col1","type":"int4"},{"name":"col2","type":"date"},{"name":"col3","type":"text"},{"name":"col4","type":"int4"},{"name":"col5","type":"bool"}],"keys":[{"columnNames":["col1"],"name":"template_table_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"template_table\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"template_table\" (\"col2\", \"col3\", \"col4\", \"col5\")\n  VALUES ('2019-07-01', '', 1, '');"},{"title":"UPDATE","body":"UPDATE public.\"template_table\" SET\n    \"col2\" = '2019-07-01'\n    \"col3\" = ''\n    \"col4\" = 1\n    \"col5\" = ''\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"template_table\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.template_table","type":"TABLE"},{"schema":"public","columns":[{"name":"age","type":"int4"},{"name":"username","type":"varchar"},{"name":"password","type":"varchar"},{"name":"email","type":"varchar"},{"name":"created_on","type":"timestamp"},{"name":"last_login","type":"timestamp"}],"keys":[],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"testuser\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"testuser\" (\"age\", \"username\", \"password\", \"email\", \"created_on\", \"last_login\")\n  VALUES (1, '', '', '', TIMESTAMP '2019-07-01 10:00:00', TIMESTAMP '2019-07-01 10:00:00');"},{"title":"UPDATE","body":"UPDATE public.\"testuser\" SET\n    \"age\" = 1\n    \"username\" = ''\n    \"password\" = ''\n    \"email\" = ''\n    \"created_on\" = TIMESTAMP '2019-07-01 10:00:00'\n    \"last_login\" = TIMESTAMP '2019-07-01 10:00:00'\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"testuser\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.testuser","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('ticket_tags_id_seq'::regclass)","name":"id","type":"int4"},{"name":"ticket_id","type":"int4"},{"name":"github_tag_id","type":"text"}],"keys":[{"columnNames":["id"],"name":"ticket_tags_pkey","type":"primary key"},{"fromColumns":["ticket_id"],"name":"ticket_id_fk","toColumns":["support_tickets.id"],"type":"foreign key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"ticket_tags\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"ticket_tags\" (\"ticket_id\", \"github_tag_id\")\n  VALUES (1, '');"},{"title":"UPDATE","body":"UPDATE public.\"ticket_tags\" SET\n    \"ticket_id\" = 1\n    \"github_tag_id\" = ''\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"ticket_tags\"\n  WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.ticket_tags","type":"TABLE"}]}},{"new":true,"invalids":[],"pluginId":"mongo-plugin","isValid":true,"name":"Mock Mongo","userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"sshProxyEnabled":false,"endpoints":[],"connection":{"mode":"READ_WRITE","type":"DIRECT","ssl":{"authType":"DEFAULT"}},"properties":[{"value":"Yes","key":"Use Mongo Connection String URI"},{"value":"mongodb+srv://mockdb-admin:****@mockdb.swrsq.mongodb.net/admin_db?retryWrites=true&w=majority","key":"Connection String URI"}]},"structure":{"tables":[{"columns":[{"name":"_id","type":"ObjectId"},{"name":"col1","type":"String"},{"name":"col2","type":"String"},{"name":"col3","type":"String"},{"name":"col4","type":"String"}],"keys":[],"templates":[{"title":"Find","body":"{\n  \"find\": \"template_table\",\n  \"filter\": {\n    \"col1\": \"test\"\n  },\n  \"sort\": {\n    \"_id\": 1\n  },\n  \"limit\": 10\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"FIND"},{"value":"{ \"col1\": \"test\"}"},{"value":"{\"_id\": 1}"},{},{"value":"10"},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"template_table"},{},{}]},{"title":"Find by ID","body":"{\n  \"find\": \"template_table\",\n  \"filter\": {\n    \"_id\": ObjectId(\"id_to_query_with\")\n  }\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"FIND"},{"value":"{\"_id\": ObjectId(\"id_to_query_with\")}"},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"template_table"},{},{}]},{"title":"Insert","body":"{\n  \"insert\": \"template_table\",\n  \"documents\": [\n    {\n      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n      \"col1\": \"new value\",\n      \"col2\": \"new value\",\n      \"col3\": \"new value\",\n      \"col4\": \"new value\",\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"INSERT"},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"[{      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n      \"col1\": \"new value\",\n      \"col2\": \"new value\",\n      \"col3\": \"new value\",\n      \"col4\": \"new value\",\n}]"},{"value":"template_table"},{},{}]},{"title":"Update","body":"{\n  \"update\": \"template_table\",\n  \"updates\": [\n    {\n      \"q\": {\n        \"_id\": ObjectId(\"id_of_document_to_update\")\n      },\n      \"u\": { \"$set\": { \"col1\": \"new value\" } }\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"UPDATE"},{},{},{},{},{},{},{},{},{"value":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }"},{"value":"{ \"$set\": { \"col1\": \"new value\" } }"},{},{},{},{},{},{},{"value":"template_table"},{},{"value":"ALL"}]},{"title":"Delete","body":"{\n  \"delete\": \"template_table\",\n  \"deletes\": [\n    {\n      \"q\": {\n        \"_id\": \"id_of_document_to_delete\"\n      },\n      \"limit\": 1\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"DELETE"},{},{},{},{},{},{},{},{},{},{},{"value":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }"},{},{},{},{},{},{"value":"template_table"},{"value":"SINGLE"},{}]}],"name":"template_table","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId"},{"name":"createdAt","type":"Date"},{"name":"email","type":"String"},{"name":"name","type":"String"},{"name":"role","type":"String"},{"name":"status","type":"Object"}],"keys":[],"templates":[{"title":"Find","body":"{\n  \"find\": \"users\",\n  \"filter\": {\n    \"email\": \"Fae14@hotmail.com\"\n  },\n  \"sort\": {\n    \"_id\": 1\n  },\n  \"limit\": 10\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"FIND"},{"value":"{ \"email\": \"Fae14@hotmail.com\"}"},{"value":"{\"_id\": 1}"},{},{"value":"10"},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"users"},{},{}]},{"title":"Find by ID","body":"{\n  \"find\": \"users\",\n  \"filter\": {\n    \"_id\": ObjectId(\"id_to_query_with\")\n  }\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"FIND"},{"value":"{\"_id\": ObjectId(\"id_to_query_with\")}"},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"users"},{},{}]},{"title":"Insert","body":"{\n  \"insert\": \"users\",\n  \"documents\": [\n    {\n      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n      \"createdAt\": new Date(\"2019-07-01\"),\n      \"email\": \"new value\",\n      \"name\": \"new value\",\n      \"role\": \"new value\",\n      \"status\": {},\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"INSERT"},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"[{      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n      \"createdAt\": new Date(\"2019-07-01\"),\n      \"email\": \"new value\",\n      \"name\": \"new value\",\n      \"role\": \"new value\",\n      \"status\": {},\n}]"},{"value":"users"},{},{}]},{"title":"Update","body":"{\n  \"update\": \"users\",\n  \"updates\": [\n    {\n      \"q\": {\n        \"_id\": ObjectId(\"id_of_document_to_update\")\n      },\n      \"u\": { \"$set\": { \"email\": \"new value\" } }\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"UPDATE"},{},{},{},{},{},{},{},{},{"value":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }"},{"value":"{ \"$set\": { \"email\": \"new value\" } }"},{},{},{},{},{},{},{"value":"users"},{},{"value":"ALL"}]},{"title":"Delete","body":"{\n  \"delete\": \"users\",\n  \"deletes\": [\n    {\n      \"q\": {\n        \"_id\": \"id_of_document_to_delete\"\n      },\n      \"limit\": 1\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"DELETE"},{},{},{},{},{},{},{},{},{},{},{"value":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }"},{},{},{},{},{},{"value":"users"},{"value":"SINGLE"},{}]}],"name":"users","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId"},{"name":"createdAt","type":"Date"},{"name":"currentLimit","type":"Integer"},{"name":"featureName","type":"String"},{"name":"key","type":"Integer"},{"name":"limit","type":"Integer"},{"name":"subscriptionId","type":"ObjectId"}],"keys":[],"templates":[{"title":"Find","body":"{\n  \"find\": \"orgs\",\n  \"filter\": {\n    \"featureName\": \"Okuneva Inc\"\n  },\n  \"sort\": {\n    \"_id\": 1\n  },\n  \"limit\": 10\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"FIND"},{"value":"{ \"featureName\": \"Okuneva Inc\"}"},{"value":"{\"_id\": 1}"},{},{"value":"10"},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"orgs"},{},{}]},{"title":"Find by ID","body":"{\n  \"find\": \"orgs\",\n  \"filter\": {\n    \"_id\": ObjectId(\"id_to_query_with\")\n  }\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"FIND"},{"value":"{\"_id\": ObjectId(\"id_to_query_with\")}"},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"orgs"},{},{}]},{"title":"Insert","body":"{\n  \"insert\": \"orgs\",\n  \"documents\": [\n    {\n      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n      \"createdAt\": new Date(\"2019-07-01\"),\n      \"currentLimit\": 1,\n      \"featureName\": \"new value\",\n      \"key\": 1,\n      \"limit\": 1,\n      \"subscriptionId\": ObjectId(\"a_valid_object_id_hex\"),\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"INSERT"},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"[{      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n      \"createdAt\": new Date(\"2019-07-01\"),\n      \"currentLimit\": 1,\n      \"featureName\": \"new value\",\n      \"key\": 1,\n      \"limit\": 1,\n      \"subscriptionId\": ObjectId(\"a_valid_object_id_hex\"),\n}]"},{"value":"orgs"},{},{}]},{"title":"Update","body":"{\n  \"update\": \"orgs\",\n  \"updates\": [\n    {\n      \"q\": {\n        \"_id\": ObjectId(\"id_of_document_to_update\")\n      },\n      \"u\": { \"$set\": { \"featureName\": \"new value\" } }\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"UPDATE"},{},{},{},{},{},{},{},{},{"value":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }"},{"value":"{ \"$set\": { \"featureName\": \"new value\" } }"},{},{},{},{},{},{},{"value":"orgs"},{},{"value":"ALL"}]},{"title":"Delete","body":"{\n  \"delete\": \"orgs\",\n  \"deletes\": [\n    {\n      \"q\": {\n        \"_id\": \"id_of_document_to_delete\"\n      },\n      \"limit\": 1\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"DELETE"},{},{},{},{},{},{},{},{},{},{},{"value":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }"},{},{},{},{},{},{"value":"orgs"},{"value":"SINGLE"},{}]}],"name":"orgs","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId"},{"name":"createdAt","type":"Date"},{"name":"createdBy","type":"ObjectId"},{"name":"domain","type":"String"},{"name":"name","type":"String"},{"name":"numUsers","type":"Integer"},{"name":"orgId","type":"ObjectId"}],"keys":[],"templates":[{"title":"Find","body":"{\n  \"find\": \"apps\",\n  \"filter\": {\n    \"domain\": \"adolph.biz\"\n  },\n  \"sort\": {\n    \"_id\": 1\n  },\n  \"limit\": 10\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"FIND"},{"value":"{ \"domain\": \"adolph.biz\"}"},{"value":"{\"_id\": 1}"},{},{"value":"10"},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"apps"},{},{}]},{"title":"Find by ID","body":"{\n  \"find\": \"apps\",\n  \"filter\": {\n    \"_id\": ObjectId(\"id_to_query_with\")\n  }\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"FIND"},{"value":"{\"_id\": ObjectId(\"id_to_query_with\")}"},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"apps"},{},{}]},{"title":"Insert","body":"{\n  \"insert\": \"apps\",\n  \"documents\": [\n    {\n      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n      \"createdAt\": new Date(\"2019-07-01\"),\n      \"createdBy\": ObjectId(\"a_valid_object_id_hex\"),\n      \"domain\": \"new value\",\n      \"name\": \"new value\",\n      \"numUsers\": 1,\n      \"orgId\": ObjectId(\"a_valid_object_id_hex\"),\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"INSERT"},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"[{      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n      \"createdAt\": new Date(\"2019-07-01\"),\n      \"createdBy\": ObjectId(\"a_valid_object_id_hex\"),\n      \"domain\": \"new value\",\n      \"name\": \"new value\",\n      \"numUsers\": 1,\n      \"orgId\": ObjectId(\"a_valid_object_id_hex\"),\n}]"},{"value":"apps"},{},{}]},{"title":"Update","body":"{\n  \"update\": \"apps\",\n  \"updates\": [\n    {\n      \"q\": {\n        \"_id\": ObjectId(\"id_of_document_to_update\")\n      },\n      \"u\": { \"$set\": { \"domain\": \"new value\" } }\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"UPDATE"},{},{},{},{},{},{},{},{},{"value":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }"},{"value":"{ \"$set\": { \"domain\": \"new value\" } }"},{},{},{},{},{},{},{"value":"apps"},{},{"value":"ALL"}]},{"title":"Delete","body":"{\n  \"delete\": \"apps\",\n  \"deletes\": [\n    {\n      \"q\": {\n        \"_id\": \"id_of_document_to_delete\"\n      },\n      \"limit\": 1\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"DELETE"},{},{},{},{},{},{},{},{},{},{},{"value":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }"},{},{},{},{},{},{"value":"apps"},{"value":"SINGLE"},{}]}],"name":"apps","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId"},{"name":"createdAt","type":"Date"},{"name":"currency","type":"String"},{"name":"mrr","type":"String"},{"name":"name","type":"String"},{"name":"renewalDate","type":"Date"},{"name":"status","type":"String"},{"name":"statusOfApp","type":"Object"}],"keys":[],"templates":[{"title":"Find","body":"{\n  \"find\": \"subscriptions\",\n  \"filter\": {\n    \"currency\": \"RUB\"\n  },\n  \"sort\": {\n    \"_id\": 1\n  },\n  \"limit\": 10\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"FIND"},{"value":"{ \"currency\": \"RUB\"}"},{"value":"{\"_id\": 1}"},{},{"value":"10"},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"subscriptions"},{},{}]},{"title":"Find by ID","body":"{\n  \"find\": \"subscriptions\",\n  \"filter\": {\n    \"_id\": ObjectId(\"id_to_query_with\")\n  }\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"FIND"},{"value":"{\"_id\": ObjectId(\"id_to_query_with\")}"},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"subscriptions"},{},{}]},{"title":"Insert","body":"{\n  \"insert\": \"subscriptions\",\n  \"documents\": [\n    {\n      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n      \"createdAt\": new Date(\"2019-07-01\"),\n      \"currency\": \"new value\",\n      \"mrr\": \"new value\",\n      \"name\": \"new value\",\n      \"renewalDate\": new Date(\"2019-07-01\"),\n      \"status\": \"new value\",\n      \"statusOfApp\": {},\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"INSERT"},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{"value":"[{      \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n      \"createdAt\": new Date(\"2019-07-01\"),\n      \"currency\": \"new value\",\n      \"mrr\": \"new value\",\n      \"name\": \"new value\",\n      \"renewalDate\": new Date(\"2019-07-01\"),\n      \"status\": \"new value\",\n      \"statusOfApp\": {},\n}]"},{"value":"subscriptions"},{},{}]},{"title":"Update","body":"{\n  \"update\": \"subscriptions\",\n  \"updates\": [\n    {\n      \"q\": {\n        \"_id\": ObjectId(\"id_of_document_to_update\")\n      },\n      \"u\": { \"$set\": { \"currency\": \"new value\" } }\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"UPDATE"},{},{},{},{},{},{},{},{},{"value":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }"},{"value":"{ \"$set\": { \"currency\": \"new value\" } }"},{},{},{},{},{},{},{"value":"subscriptions"},{},{"value":"ALL"}]},{"title":"Delete","body":"{\n  \"delete\": \"subscriptions\",\n  \"deletes\": [\n    {\n      \"q\": {\n        \"_id\": \"id_of_document_to_delete\"\n      },\n      \"limit\": 1\n    }\n  ]\n}\n","pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"DELETE"},{},{},{},{},{},{},{},{},{},{},{"value":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }"},{},{},{},{},{},{"value":"subscriptions"},{"value":"SINGLE"},{}]}],"name":"subscriptions","type":"COLLECTION"}]}}],"actionList":[{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["order_select.selectedOptionLabel","(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize"],"datasource":{"new":false,"isValid":true,"id":"Internal DB","userPermissions":[]},"executeOnLoad":true,"isValid":true,"name":"SelectQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"SELECT * FROM public.template_table\nWHERE \"col3\" ilike '%{{Table1.searchText || \"\"}}%'\nORDER BY \"{{col_select.selectedOptionValue}}\" {{order_select.selectedOptionLabel}}\nOFFSET {{(Table1.pageNo - 1) * Table1.pageSize}} \nLIMIT {{Table1.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"SQL"},"pluginId":"postgres-plugin","id":"60d4559cee9aa1792c5bec40","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["order_select.selectedOptionLabel","(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize"],"datasource":{"new":false,"isValid":true,"id":"Internal DB","userPermissions":[]},"executeOnLoad":true,"isValid":true,"name":"SelectQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"SELECT * FROM public.template_table\nWHERE \"col3\" ilike '%{{Table1.searchText || \"\"}}%'\nORDER BY \"{{col_select.selectedOptionValue}}\" {{order_select.selectedOptionLabel}}\nOFFSET {{(Table1.pageNo - 1) * Table1.pageSize}} \nLIMIT {{Table1.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"SQL"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["Table1.selectedRow.col1"],"datasource":{"new":false,"isValid":true,"id":"Internal DB","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"DeleteQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"DELETE FROM public.template_table\n  WHERE \"col1\" = {{Table1.selectedRow.col1}};"},"userPermissions":[],"pageId":"SQL"},"pluginId":"postgres-plugin","id":"60d4559cee9aa1792c5bec41","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["Table1.selectedRow.col1"],"datasource":{"new":false,"isValid":true,"id":"Internal DB","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"DeleteQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"DELETE FROM public.template_table\n  WHERE \"col1\" = {{Table1.selectedRow.col1}};"},"userPermissions":[],"pageId":"SQL"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","Table1.selectedRow.col1","update_col_2.text","update_col_4.text"],"datasource":{"new":false,"isValid":true,"id":"Internal DB","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"UpdateQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"UPDATE public.template_table SET\n\t\t\"col2\" = '{{update_col_2.text}}',\n    \"col3\" = '{{update_col_3.text}}',\n    \"col4\" = '{{update_col_4.text}}'\n  WHERE \"col1\" = {{Table1.selectedRow.col1}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"SQL"},"pluginId":"postgres-plugin","id":"60d4559cee9aa1792c5bec42","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","Table1.selectedRow.col1","update_col_2.text","update_col_4.text"],"datasource":{"new":false,"isValid":true,"id":"Internal DB","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"UpdateQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"UPDATE public.template_table SET\n\t\t\"col2\" = '{{update_col_2.text}}',\n    \"col3\" = '{{update_col_3.text}}',\n    \"col4\" = '{{update_col_4.text}}'\n  WHERE \"col1\" = {{Table1.selectedRow.col1}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"SQL"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"isValid":true,"id":"Internal DB","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"InsertQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"INSERT INTO public.template_table (\n\t\"col1\",\n\t\"col2\", \n\t\"col3\",\n\t\"col4\", \n\t\"col5\"\n)\nVALUES (\n\t\t\t\t{{insert_col_input1.text}}, \n\t\t\t\t{{insert_col_input2.text}}, \n\t\t\t\t{{insert_col_input3.text}}, \n\t\t\t\t{{insert_col_input4.text}}, \n\t\t\t\t{{insert_col_input5.text}}\n);","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL"},"pluginId":"postgres-plugin","id":"60d4559cee9aa1792c5bec43","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"isValid":true,"id":"Internal DB","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"InsertQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"INSERT INTO public.template_table (\n\t\"col1\",\n\t\"col2\", \n\t\"col3\",\n\t\"col4\", \n\t\"col5\"\n)\nVALUES (\n\t\t\t\t{{insert_col_input1.text}}, \n\t\t\t\t{{insert_col_input2.text}}, \n\t\t\t\t{{insert_col_input3.text}}, \n\t\t\t\t{{insert_col_input4.text}}, \n\t\t\t\t{{insert_col_input5.text}}\n);","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL"}},{"new":false,"pluginType":"SAAS","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[6].value"},{"key":"pluginSpecifiedTemplates[8].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"60910df653a4d211ac7dd678","isValid":true,"id":"60c744d93535574772b64363","userPermissions":[]},"executeOnLoad":true,"isValid":true,"name":"SelectQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"GET","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"}]},"userPermissions":[],"pageId":"GSheets"},"pluginId":"google-sheets-plugin","id":"60d468c1ee9aa1792c5bec95","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[6].value"},{"key":"pluginSpecifiedTemplates[8].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"60910df653a4d211ac7dd678","isValid":true,"id":"60c744d93535574772b64363","userPermissions":[]},"executeOnLoad":true,"isValid":true,"name":"SelectQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"GET","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"}]},"userPermissions":[],"pageId":"GSheets"}},{"new":false,"pluginType":"SAAS","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[6].value"},{"key":"pluginSpecifiedTemplates[8].value"},{"key":"pluginSpecifiedTemplates[11].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow.rowIndex","data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"60910df653a4d211ac7dd678","isValid":true,"id":"60c744d93535574772b64363","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"DeleteQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"DELETE_ROW","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"{{data_table.selectedRow.rowIndex}}","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"}]},"userPermissions":[],"pageId":"GSheets"},"pluginId":"google-sheets-plugin","id":"60d46a38ee9aa1792c5bec99","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[6].value"},{"key":"pluginSpecifiedTemplates[8].value"},{"key":"pluginSpecifiedTemplates[11].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow.rowIndex","data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"60910df653a4d211ac7dd678","isValid":true,"id":"60c744d93535574772b64363","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"DeleteQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"DELETE_ROW","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"{{data_table.selectedRow.rowIndex}}","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"}]},"userPermissions":[],"pageId":"GSheets"}},{"new":false,"pluginType":"SAAS","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["colInput1.text","colInput4.text","data_table.selectedRow.rowIndex","colInput2.text","colInput3.text"],"datasource":{"new":false,"pluginId":"60910df653a4d211ac7dd678","isValid":true,"id":"60c744d93535574772b64363","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"UpdateQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"UPDATE","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{\n\t  \"rowIndex\": {{data_table.selectedRow.rowIndex}}, \n\t\t\"col1\": \"{{colInput1.text}}\", \n\t\t\"col2\": \"{{colInput2.text}}\", \n\t\t\"col3\": \"{{colInput3.text}}\", \n\t\t\"col4\": \"{{colInput4.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"}]},"userPermissions":[],"pageId":"GSheets"},"pluginId":"google-sheets-plugin","id":"60d47052ee9aa1792c5becbe","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["colInput1.text","colInput4.text","data_table.selectedRow.rowIndex","colInput2.text","colInput3.text"],"datasource":{"new":false,"pluginId":"60910df653a4d211ac7dd678","isValid":true,"id":"60c744d93535574772b64363","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"UpdateQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"UPDATE","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{\n\t  \"rowIndex\": {{data_table.selectedRow.rowIndex}}, \n\t\t\"col1\": \"{{colInput1.text}}\", \n\t\t\"col2\": \"{{colInput2.text}}\", \n\t\t\"col3\": \"{{colInput3.text}}\", \n\t\t\"col4\": \"{{colInput4.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"}]},"userPermissions":[],"pageId":"GSheets"}},{"new":false,"pluginType":"SAAS","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"60910df653a4d211ac7dd678","isValid":true,"id":"60c744d93535574772b64363","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"InsertQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"APPEND","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{ \n\t\t\"col1\": \"{{insert_col_input1.text}}\", \n\t\t\"col2\": \"{{insert_col_input2.text}}\", \n\t\t\"col3\": \"{{insert_col_input3.text}}\", \n\t\t\"col4\": \"{{insert_col_input4.text}}\",\n\t\t\"col5\": \"{{insert_col_input5.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"}]},"userPermissions":[],"pageId":"GSheets"},"pluginId":"google-sheets-plugin","id":"60d47363ee9aa1792c5becc3","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"60910df653a4d211ac7dd678","isValid":true,"id":"60c744d93535574772b64363","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"InsertQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"APPEND","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{ \n\t\t\"col1\": \"{{insert_col_input1.text}}\", \n\t\t\"col2\": \"{{insert_col_input2.text}}\", \n\t\t\"col3\": \"{{insert_col_input3.text}}\", \n\t\t\"col4\": \"{{insert_col_input4.text}}\",\n\t\t\"col5\": \"{{insert_col_input5.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"}]},"userPermissions":[],"pageId":"GSheets"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["FilePicker.files[this.params.fileIndex].data","folder_name.text","this.params.name"],"datasource":{"new":false,"isValid":true,"id":"AmazonS3","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"CreateFile","actionConfiguration":{"path":"{{folder_name.text}}/{{this.params.name}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{{FilePicker.files[this.params.fileIndex].data}}","pluginSpecifiedTemplates":[{"value":"UPLOAD_FILE_FROM_BODY"},{"value":"assets-test.appsmith.com"},{"value":"NO"},{"value":"5"},{"value":""},{"value":"YES"},{"value":"YES"},{"value":"5"}]},"userPermissions":[],"pageId":"S3Assets"},"pluginId":"amazons3-plugin","id":"60da6d3fee9aa1792c5bf5e8","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["FilePicker.files[this.params.fileIndex].data","folder_name.text","this.params.name"],"datasource":{"new":false,"isValid":true,"id":"AmazonS3","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"CreateFile","actionConfiguration":{"path":"{{folder_name.text}}/{{this.params.name}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{{FilePicker.files[this.params.fileIndex].data}}","pluginSpecifiedTemplates":[{"value":"UPLOAD_FILE_FROM_BODY"},{"value":"assets-test.appsmith.com"},{"value":"NO"},{"value":"5"},{"value":""},{"value":"YES"},{"value":"YES"},{"value":"5"}]},"userPermissions":[],"pageId":"S3Assets"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[4].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["(list_files_folder.text ? (list_files_folder.text + \"/\"): \"\") + search_input.text"],"datasource":{"new":false,"isValid":true,"id":"AmazonS3","userPermissions":[]},"executeOnLoad":true,"isValid":true,"name":"ListFiles","actionConfiguration":{"path":"","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","pluginSpecifiedTemplates":[{"value":"LIST"},{"value":"assets-test.appsmith.com"},{"value":"YES"},{"value":"5"},{"value":"{{(list_files_folder.text ? (list_files_folder.text + \"/\"): \"\") + search_input.text}}"},{"value":"YES"},{"value":"YES"},{"value":"5"}]},"userPermissions":[],"pageId":"S3Assets"},"pluginId":"amazons3-plugin","id":"60da700cee9aa1792c5bf5e9","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[4].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["(list_files_folder.text ? (list_files_folder.text + \"/\"): \"\") + search_input.text"],"datasource":{"new":false,"isValid":true,"id":"AmazonS3","userPermissions":[]},"executeOnLoad":true,"isValid":true,"name":"ListFiles","actionConfiguration":{"path":"","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","pluginSpecifiedTemplates":[{"value":"LIST"},{"value":"assets-test.appsmith.com"},{"value":"YES"},{"value":"5"},{"value":"{{(list_files_folder.text ? (list_files_folder.text + \"/\"): \"\") + search_input.text}}"},{"value":"YES"},{"value":"YES"},{"value":"5"}]},"userPermissions":[],"pageId":"S3Assets"}},{"new":false,"pluginType":"API","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":true,"jsonPathKeys":["{...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } )  }","branch_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://hook.integromat.com"}},"executeOnLoad":false,"isValid":true,"name":"update_template","actionConfiguration":{"path":"/uepsj7o6a0hmiodonjr7xrcqj9pixe0s","headers":[{"value":"application/json","key":"content-type"},{"value":"","key":""}],"paginationType":"NONE","queryParameters":[{"value":"","key":""},{"value":"","key":""}],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n\t\"app\": {{ {...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } )  } }},\n\t\"branch\": \"{{branch_input.text}}\"\n}","httpMethod":"POST","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin"},"pluginId":"restapi-plugin","id":"60daba3aee9aa1792c5bf647","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":true,"jsonPathKeys":["{...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } )  }","branch_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://hook.integromat.com"}},"executeOnLoad":false,"isValid":true,"name":"update_template","actionConfiguration":{"path":"/uepsj7o6a0hmiodonjr7xrcqj9pixe0s","headers":[{"value":"application/json","key":"content-type"},{"value":"","key":""}],"paginationType":"NONE","queryParameters":[{"value":"","key":""},{"value":"","key":""}],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n\t\"app\": {{ {...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } )  } }},\n\t\"branch\": {{ branch_input.text }}\n}","httpMethod":"POST","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin"}},{"new":false,"pluginType":"API","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://app.appsmith.com"}},"executeOnLoad":false,"isValid":true,"name":"get_exported_app","actionConfiguration":{"path":"/api/v1/applications/export/60d4559cee9aa1792c5bec3d","headers":[{"value":"_hjIncludedInSample=1; _hjSessionTooLarge=1; _ga=GA1.2.572027528.1599035590; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; ajs_user_id=%22nikhil%40appsmith.com%22; ajs_anonymous_id=%2213c846f6-970b-41e1-925f-f8f4a92ea315%22; SL_C_23361dd035530_SID=laR0iYdLzA-; SL_C_23361dd035530_VID=EDGoRechnrX; _hjTLDTest=1; _hjid=da2ef5e3-4ea5-42dc-b892-7962b7564098; _gid=GA1.2.1967506876.1624858414; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjU5ZjhhZTJlLTgzYjQtNDY5My1hZjA4LTM2ZGRkZjBjNGJiYlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYyNDg3MjEyMTYyMCwibGFzdEV2ZW50VGltZSI6MTYyNDg3MjEyMTYyMCwiZXZlbnRJZCI6MywiaWRlbnRpZnlJZCI6MSwic2VxdWVuY2VOdW1iZXIiOjR9; ajs_anonymous_id=%2213c846f6-970b-41e1-925f-f8f4a92ea315%22; SESSION=4be29d3c-4b26-429d-8041-a861834ab1fd; ajs_user_id=%22nikhil%40appsmith.com%22; _hjAbsoluteSessionInProgress=1; _hjIncludedInPageviewSample=1; _gat_UA-145062826-1=1; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24device_id%22%3A%20%221787d3b4aab392-0b46f81f3f91ff-1633685c-1aeaa0-1787d3b4aac48d%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nikhil%40appsmith.com%22%2C%22userId%22%3A%20%22nikhil%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24email%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nikhil%22%2C%22%24last_name%22%3A%20%22N%22%2C%22%24name%22%3A%20%22Nikhil%20N%22%2C%22utm_source%22%3A%20%22ActiveCampaign%22%2C%22utm_medium%22%3A%20%22email%22%2C%22utm_campaign%22%3A%20%22Day%201%20Nudge%20after%20Sign%20up%22%2C%22utm_content%22%3A%20%22Does%20appsmith%20use%20appsmith%3F%20%F0%9F%A4%94%22%7D; intercom-session-y10e7138=cnJXRUNyU3NodWttRU55N0RiclVKVG03bFFlSFo4ZnFzekpEVmZpdHpvS0dJQVQzZGxBM09aVkRGRGpsUlMzQS0tYnZSWkx0VmFJNjAvRXQ2RTMrMjBOQT09--f794a45be0881b4fb1585c70686826590610c159","key":"Cookie"},{"value":"","key":""}],"paginationType":"NONE","queryParameters":[{"value":"","key":""},{"value":"","key":""}],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin"},"pluginId":"restapi-plugin","id":"60dabb35ee9aa1792c5bf648","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://app.appsmith.com"}},"executeOnLoad":false,"isValid":true,"name":"get_exported_app","actionConfiguration":{"path":"/api/v1/applications/export/60d4559cee9aa1792c5bec3d","headers":[{"value":"_hjIncludedInSample=1; _hjSessionTooLarge=1; _ga=GA1.2.572027528.1599035590; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; ajs_user_id=%22nikhil%40appsmith.com%22; ajs_anonymous_id=%2213c846f6-970b-41e1-925f-f8f4a92ea315%22; SL_C_23361dd035530_SID=laR0iYdLzA-; SL_C_23361dd035530_VID=EDGoRechnrX; _hjTLDTest=1; _hjid=da2ef5e3-4ea5-42dc-b892-7962b7564098; _gid=GA1.2.1967506876.1624858414; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjU5ZjhhZTJlLTgzYjQtNDY5My1hZjA4LTM2ZGRkZjBjNGJiYlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYyNDg3MjEyMTYyMCwibGFzdEV2ZW50VGltZSI6MTYyNDg3MjEyMTYyMCwiZXZlbnRJZCI6MywiaWRlbnRpZnlJZCI6MSwic2VxdWVuY2VOdW1iZXIiOjR9; ajs_anonymous_id=%2213c846f6-970b-41e1-925f-f8f4a92ea315%22; SESSION=4be29d3c-4b26-429d-8041-a861834ab1fd; ajs_user_id=%22nikhil%40appsmith.com%22; _hjAbsoluteSessionInProgress=1; _hjIncludedInPageviewSample=1; _gat_UA-145062826-1=1; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24device_id%22%3A%20%221787d3b4aab392-0b46f81f3f91ff-1633685c-1aeaa0-1787d3b4aac48d%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nikhil%40appsmith.com%22%2C%22userId%22%3A%20%22nikhil%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24email%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nikhil%22%2C%22%24last_name%22%3A%20%22N%22%2C%22%24name%22%3A%20%22Nikhil%20N%22%2C%22utm_source%22%3A%20%22ActiveCampaign%22%2C%22utm_medium%22%3A%20%22email%22%2C%22utm_campaign%22%3A%20%22Day%201%20Nudge%20after%20Sign%20up%22%2C%22utm_content%22%3A%20%22Does%20appsmith%20use%20appsmith%3F%20%F0%9F%A4%94%22%7D; intercom-session-y10e7138=cnJXRUNyU3NodWttRU55N0RiclVKVG03bFFlSFo4ZnFzekpEVmZpdHpvS0dJQVQzZGxBM09aVkRGRGpsUlMzQS0tYnZSWkx0VmFJNjAvRXQ2RTMrMjBOQT09--f794a45be0881b4fb1585c70686826590610c159","key":"Cookie"},{"value":"","key":""}],"paginationType":"NONE","queryParameters":[{"value":"","key":""},{"value":"","key":""}],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin"}},{"new":false,"pluginType":"API","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":["this.params.id"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://app.appsmith.com"}},"executeOnLoad":false,"isValid":true,"name":"get_datasource_structure","actionConfiguration":{"path":"/api/v1/datasources/{{this.params.id}}/structure","headers":[{"value":"_hjIncludedInSample=1; _hjSessionTooLarge=1; _ga=GA1.2.572027528.1599035590; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; ajs_user_id=%22nikhil%40appsmith.com%22; ajs_anonymous_id=%2213c846f6-970b-41e1-925f-f8f4a92ea315%22; SL_C_23361dd035530_SID=laR0iYdLzA-; SL_C_23361dd035530_VID=EDGoRechnrX; _hjTLDTest=1; _hjid=da2ef5e3-4ea5-42dc-b892-7962b7564098; _gid=GA1.2.1967506876.1624858414; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjU5ZjhhZTJlLTgzYjQtNDY5My1hZjA4LTM2ZGRkZjBjNGJiYlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYyNDg3MjEyMTYyMCwibGFzdEV2ZW50VGltZSI6MTYyNDg3MjEyMTYyMCwiZXZlbnRJZCI6MywiaWRlbnRpZnlJZCI6MSwic2VxdWVuY2VOdW1iZXIiOjR9; ajs_anonymous_id=%2213c846f6-970b-41e1-925f-f8f4a92ea315%22; SESSION=4be29d3c-4b26-429d-8041-a861834ab1fd; ajs_user_id=%22nikhil%40appsmith.com%22; _hjAbsoluteSessionInProgress=1; _hjIncludedInPageviewSample=1; _gat_UA-145062826-1=1; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24device_id%22%3A%20%221787d3b4aab392-0b46f81f3f91ff-1633685c-1aeaa0-1787d3b4aac48d%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nikhil%40appsmith.com%22%2C%22userId%22%3A%20%22nikhil%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24email%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nikhil%22%2C%22%24last_name%22%3A%20%22N%22%2C%22%24name%22%3A%20%22Nikhil%20N%22%2C%22utm_source%22%3A%20%22ActiveCampaign%22%2C%22utm_medium%22%3A%20%22email%22%2C%22utm_campaign%22%3A%20%22Day%201%20Nudge%20after%20Sign%20up%22%2C%22utm_content%22%3A%20%22Does%20appsmith%20use%20appsmith%3F%20%F0%9F%A4%94%22%7D; intercom-session-y10e7138=cnJXRUNyU3NodWttRU55N0RiclVKVG03bFFlSFo4ZnFzekpEVmZpdHpvS0dJQVQzZGxBM09aVkRGRGpsUlMzQS0tYnZSWkx0VmFJNjAvRXQ2RTMrMjBOQT09--f794a45be0881b4fb1585c70686826590610c159","key":"Cookie"},{"value":"","key":""}],"paginationType":"NONE","queryParameters":[{"value":"","key":""},{"value":"","key":""}],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin"},"pluginId":"restapi-plugin","id":"60dabca0ee9aa1792c5bf649","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":["this.params.id"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://app.appsmith.com"}},"executeOnLoad":false,"isValid":true,"name":"get_datasource_structure","actionConfiguration":{"path":"/api/v1/datasources/{{this.params.id}}/structure","headers":[{"value":"_hjIncludedInSample=1; _hjSessionTooLarge=1; _ga=GA1.2.572027528.1599035590; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; ajs_user_id=%22nikhil%40appsmith.com%22; ajs_anonymous_id=%2213c846f6-970b-41e1-925f-f8f4a92ea315%22; SL_C_23361dd035530_SID=laR0iYdLzA-; SL_C_23361dd035530_VID=EDGoRechnrX; _hjTLDTest=1; _hjid=da2ef5e3-4ea5-42dc-b892-7962b7564098; _gid=GA1.2.1967506876.1624858414; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjU5ZjhhZTJlLTgzYjQtNDY5My1hZjA4LTM2ZGRkZjBjNGJiYlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYyNDg3MjEyMTYyMCwibGFzdEV2ZW50VGltZSI6MTYyNDg3MjEyMTYyMCwiZXZlbnRJZCI6MywiaWRlbnRpZnlJZCI6MSwic2VxdWVuY2VOdW1iZXIiOjR9; ajs_anonymous_id=%2213c846f6-970b-41e1-925f-f8f4a92ea315%22; SESSION=4be29d3c-4b26-429d-8041-a861834ab1fd; ajs_user_id=%22nikhil%40appsmith.com%22; _hjAbsoluteSessionInProgress=1; _hjIncludedInPageviewSample=1; _gat_UA-145062826-1=1; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24device_id%22%3A%20%221787d3b4aab392-0b46f81f3f91ff-1633685c-1aeaa0-1787d3b4aac48d%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nikhil%40appsmith.com%22%2C%22userId%22%3A%20%22nikhil%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24email%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nikhil%22%2C%22%24last_name%22%3A%20%22N%22%2C%22%24name%22%3A%20%22Nikhil%20N%22%2C%22utm_source%22%3A%20%22ActiveCampaign%22%2C%22utm_medium%22%3A%20%22email%22%2C%22utm_campaign%22%3A%20%22Day%201%20Nudge%20after%20Sign%20up%22%2C%22utm_content%22%3A%20%22Does%20appsmith%20use%20appsmith%3F%20%F0%9F%A4%94%22%7D; intercom-session-y10e7138=cnJXRUNyU3NodWttRU55N0RiclVKVG03bFFlSFo4ZnFzekpEVmZpdHpvS0dJQVQzZGxBM09aVkRGRGpsUlMzQS0tYnZSWkx0VmFJNjAvRXQ2RTMrMjBOQT09--f794a45be0881b4fb1585c70686826590610c159","key":"Cookie"},{"value":"","key":""}],"paginationType":"NONE","queryParameters":[{"value":"","key":""},{"value":"","key":""}],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin"}},{"new":false,"pluginType":"API","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["select_cols_input.text","datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]","datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","search_col_input.text","tableName_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"executeOnLoad":false,"isValid":true,"name":"generate_sql_app","actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n    \"tableName\": \"{{tableName_input.text}}\",\n    \"datasourceId\": \"{{datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n    \"applicationId\" : \"{{datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\": \"{{search_col_input.text}}\",\n\t\t\"columns\": \"{{select_cols_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator"},"pluginId":"restapi-plugin","id":"60dadb5aee9aa1792c5bf6bc","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["select_cols_input.text","datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]","datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","search_col_input.text","tableName_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"executeOnLoad":false,"isValid":true,"name":"generate_sql_app","actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n    \"tableName\": \"{{tableName_input.text}}\",\n    \"datasourceId\": \"{{datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n    \"applicationId\" : \"{{datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\": \"{{search_col_input.text}}\",\n\t\t\"columns\": \"{{select_cols_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[4].value"},{"key":"pluginSpecifiedTemplates[3].value"},{"key":"pluginSpecifiedTemplates[7].value"},{"key":"pluginSpecifiedTemplates[6].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","order_select.selectedOptionValue","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"isValid":true,"id":"Mock Mongo","userPermissions":[]},"executeOnLoad":true,"isValid":true,"name":"FindQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":false},{"value":"FORM"},{"value":"FIND"},{"value":"{ col3: /{{data_table.searchText||\"\"}}i/ }"},{"value":"{ \n{{key_select.selectedOptionValue}}: {{order_select.selectedOptionValue}} \n}"},null,{"value":"{{data_table.pageSize}}"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}"},null,null,null,null,null,null,null,null,null,null,null,{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Mongo"},"pluginId":"mongo-plugin","id":"60db015aee9aa1792c5bf778","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[4].value"},{"key":"pluginSpecifiedTemplates[3].value"},{"key":"pluginSpecifiedTemplates[7].value"},{"key":"pluginSpecifiedTemplates[6].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","order_select.selectedOptionValue","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"isValid":true,"id":"Mock Mongo","userPermissions":[]},"executeOnLoad":true,"isValid":true,"name":"FindQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":false},{"value":"FORM"},{"value":"FIND"},{"value":"{ col3: /{{data_table.searchText||\"\"}}i/ }"},{"value":"{ \n{{key_select.selectedOptionValue}}: {{order_select.selectedOptionValue}} \n}"},null,{"value":"{{data_table.pageSize}}"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}"},null,null,null,null,null,null,null,null,null,null,null,{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Mongo"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[13].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow._id"],"datasource":{"new":false,"isValid":true,"id":"Mock Mongo","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"DeleteQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"DELETE"},null,null,null,null,null,null,null,null,null,null,{"value":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }"},null,null,null,null,null,{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Mongo"},"pluginId":"mongo-plugin","id":"60db0325ee9aa1792c5bf77e","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[13].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow._id"],"datasource":{"new":false,"isValid":true,"id":"Mock Mongo","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"DeleteQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"DELETE"},null,null,null,null,null,null,null,null,null,null,{"value":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }"},null,null,null,null,null,{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Mongo"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[11].value"},{"key":"pluginSpecifiedTemplates[12].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","update_col_2.text","data_table.selectedRow._id","update_col_1.text","update_col_4.text"],"datasource":{"new":false,"isValid":true,"id":"Mock Mongo","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"UpdateQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"UPDATE"},null,null,null,null,null,null,null,null,{"value":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }"},{"value":"{\n  \"col1\" : {{update_col_1.text}},\n\t\"col2\" : {{update_col_2.text}},\n  \"col3\" : {{update_col_3.text}},\n  \"col4\" : {{update_col_4.text}}\n}"},null,null,null,null,null,null,{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Mongo"},"pluginId":"mongo-plugin","id":"60db034dee9aa1792c5bf77f","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[11].value"},{"key":"pluginSpecifiedTemplates[12].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","update_col_2.text","data_table.selectedRow._id","update_col_1.text","update_col_4.text"],"datasource":{"new":false,"isValid":true,"id":"Mock Mongo","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"UpdateQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"UPDATE"},null,null,null,null,null,null,null,null,{"value":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }"},{"value":"{\n  \"col1\" : {{update_col_1.text}},\n\t\"col2\" : {{update_col_2.text}},\n  \"col3\" : {{update_col_3.text}},\n  \"col4\" : {{update_col_4.text}}\n}"},null,null,null,null,null,null,{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Mongo"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[18].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"isValid":true,"id":"Mock Mongo","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"InsertQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"INSERT"},null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,{"value":"{\n \"col1\": {{insert_col_input1.text}}, \n \"col2\": {{insert_col_input2.text}}, \n \"col3\": {{insert_col_input3.text}}, \n \"col4\": {{insert_col_input4.text}}\n}"},{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Mongo"},"pluginId":"mongo-plugin","id":"60db03dcee9aa1792c5bf781","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[18].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"isValid":true,"id":"Mock Mongo","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"InsertQuery","actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":true},{"value":"FORM"},{"value":"INSERT"},null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,{"value":"{\n \"col1\": {{insert_col_input1.text}}, \n \"col2\": {{insert_col_input2.text}}, \n \"col3\": {{insert_col_input3.text}}, \n \"col4\": {{insert_col_input4.text}}\n}"},{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Mongo"}},{"new":false,"pluginType":"API","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","collection_input.text","search_keys_input.text","mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"executeOnLoad":false,"isValid":true,"name":"generate_mongo_app","actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n    \"tableName\": \"{{collection_input.text}}\",\n    \"datasourceId\": \"{{mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n    \"applicationId\" : \"{{mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\" : \"{{search_keys_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator"},"pluginId":"restapi-plugin","id":"60dc1a0aee9aa1792c5bf9a5","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","collection_input.text","search_keys_input.text","mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"executeOnLoad":false,"isValid":true,"name":"generate_mongo_app","actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n    \"tableName\": \"{{collection_input.text}}\",\n    \"datasourceId\": \"{{mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n    \"applicationId\" : \"{{mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\" : \"{{search_keys_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator"}},{"new":false,"pluginType":"API","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]","gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]","collection_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"executeOnLoad":false,"isValid":true,"name":"generate_gsheet_app","actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n    \"tableName\": \"{{collection_input.text}}\",\n    \"datasourceId\": \"{{gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]}}\",\n    \"applicationId\" : \"{{gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator"},"pluginId":"restapi-plugin","id":"60dc1a22ee9aa1792c5bf9a8","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]","gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]","collection_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"executeOnLoad":false,"isValid":true,"name":"generate_gsheet_app","actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n    \"tableName\": \"{{collection_input.text}}\",\n    \"datasourceId\": \"{{gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]}}\",\n    \"applicationId\" : \"{{gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"isValid":true,"id":"AmazonS3","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"DeleteFile","actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"DELETE_FILE"},{"value":"assets-test.appsmith.com"}]},"userPermissions":[],"pageId":"S3Assets"},"pluginId":"amazons3-plugin","id":"60e6cb8c646724139a549885","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"isValid":true,"id":"AmazonS3","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"DeleteFile","actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"DELETE_FILE"},{"value":"assets-test.appsmith.com"}]},"userPermissions":[],"pageId":"S3Assets"}},{"new":false,"pluginType":"DB","unpublishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"isValid":true,"id":"AmazonS3","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"ReadFile","actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","pluginSpecifiedTemplates":[{"value":"READ_FILE"},{"value":"assets-test.appsmith.com"},{"value":"NO"},{"value":"5"},{"value":""},{"value":"YES"},{"value":"YES"},{"value":"5"}]},"userPermissions":[],"pageId":"S3Assets"},"pluginId":"amazons3-plugin","id":"60e6d7c3646724139a5498c4","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"isValid":true,"id":"AmazonS3","userPermissions":[]},"executeOnLoad":false,"isValid":true,"name":"ReadFile","actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","pluginSpecifiedTemplates":[{"value":"READ_FILE"},{"value":"assets-test.appsmith.com"},{"value":"NO"},{"value":"5"},{"value":""},{"value":"YES"},{"value":"YES"},{"value":"5"}]},"userPermissions":[],"pageId":"S3Assets"}}],"unpublishedLayoutmongoEscapedWidgets":{"60dafddaee9aa1792c5bf76d":["data_table"]},"pageList":[{"publishedPage":{"name":"SQL","userPermissions":[],"layouts":[{"new":false,"id":"60d4559cee9aa1792c5bec3e","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["order_select.selectedOptionLabel","(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"60d4559cee9aa1792c5bec40"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":840,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":880,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Table1","columnOrder":["col1","col2","col3","col4","col5","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.col4})}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.col5})}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.col2})}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.col3})}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","fontStyle":"","textColor":"","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.col1})}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":1,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"widgetName":"new_row_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"widgetId":"aiy9e38won","buttonStyle":"PRIMARY_BUTTON","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Row","isDisabled":false},{"isRequired":false,"widgetName":"col_select","rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","selectionType":"SINGLE_SELECT","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"ASC","selectionType":"SINGLE_SELECT","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n  {\n    \"label\": \"ASC\",\n    \"value\": \"ASC\"\n  },\n  {\n    \"label\": \"DESC\",\n    \"value\": \"DESC\"\n  }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{SelectQuery.run()}}","isDefaultClickDisabled":true,"widgetId":"qykn04gnsw","buttonStyle":"SECONDARY_BUTTON","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"size":"MODAL_SMALL","leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"lryg8kw537","buttonStyle":"PRIMARY_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"qq02lh7ust","buttonStyle":"DANGER_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}]},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"size":"MODAL_LARGE","leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"h8vxf3oh4s","buttonStyle":"PRIMARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"widgetId":"o23gs26wm5","buttonStyle":"SECONDARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"9t3vdjd5xj","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"5rfqxgj0vm","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","isDisabled":false},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}]},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{Table1.selectedRow.col1}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"4gnygu5jew","buttonStyle":"PRIMARY_BUTTON","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"twwgpz5wfu","buttonStyle":"SECONDARY_BUTTON","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col2}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col3}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col4}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col5}}","isDisabled":false},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row: {{Table1.selectedRow.col1}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2 :"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3 :"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4 :"},{"widgetName":"Text20","rightColumn":19,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5 :"}]}]}]}}],"isHidden":false},"new":true,"unpublishedPage":{"name":"SQL","userPermissions":[],"layouts":[{"new":false,"id":"60d4559cee9aa1792c5bec3e","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["order_select.selectedOptionLabel","(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"60d4559cee9aa1792c5bec40"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":840,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":880,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Table1","columnOrder":["col1","col2","col3","col4","col5","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.col4})}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.col5})}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.col2})}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.col3})}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","fontStyle":"","textColor":"","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.col1})}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":1,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"widgetName":"new_row_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"widgetId":"aiy9e38won","buttonStyle":"PRIMARY_BUTTON","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Row","isDisabled":false},{"isRequired":false,"widgetName":"col_select","rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","selectionType":"SINGLE_SELECT","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"ASC","selectionType":"SINGLE_SELECT","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n  {\n    \"label\": \"ASC\",\n    \"value\": \"ASC\"\n  },\n  {\n    \"label\": \"DESC\",\n    \"value\": \"DESC\"\n  }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{SelectQuery.run()}}","isDefaultClickDisabled":true,"widgetId":"qykn04gnsw","buttonStyle":"SECONDARY_BUTTON","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"size":"MODAL_SMALL","leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"lryg8kw537","buttonStyle":"PRIMARY_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"qq02lh7ust","buttonStyle":"DANGER_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}]},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"size":"MODAL_LARGE","leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"h8vxf3oh4s","buttonStyle":"PRIMARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"widgetId":"o23gs26wm5","buttonStyle":"SECONDARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"9t3vdjd5xj","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"5rfqxgj0vm","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","isDisabled":false},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}]},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{Table1.selectedRow.col1}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"4gnygu5jew","buttonStyle":"PRIMARY_BUTTON","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"twwgpz5wfu","buttonStyle":"SECONDARY_BUTTON","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col2}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col3}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col4}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col5}}","isDisabled":false},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row: {{Table1.selectedRow.col1}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2 :"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3 :"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4 :"},{"widgetName":"Text20","rightColumn":19,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5 :"}]}]}]}}],"isHidden":false},"userPermissions":["read:pages","manage:pages"]},{"publishedPage":{"name":"GSheets","userPermissions":[],"layouts":[{"new":false,"id":"60d45c59ee9aa1792c5bec5a","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"SAAS","jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"60d468c1ee9aa1792c5bec95"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":720,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["col1","col2","col3","col4","rowIndex","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":6,"bottomRow":84,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.rowIndex.computedValue"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"rowIndex":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.rowIndex})}}","textSize":"PARAGRAPH","index":4,"isVisible":false,"label":"rowIndex","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"rowIndex","verticalAlignment":"CENTER"},"col4":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col4})}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col2})}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col3})}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col1})}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{deleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":1,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"step":62,"status":75,"col1":140}},{"widgetName":"new_row_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"widgetId":"aiy9e38won","buttonStyle":"PRIMARY_BUTTON","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Row","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{SelectQuery.run()}}","isDefaultClickDisabled":true,"widgetId":"qykn04gnsw","buttonStyle":"SECONDARY_BUTTON","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":41,"dynamicBindingPathList":[],"text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":39,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":18.8828125,"size":"MODAL_SMALL","leftColumn":21,"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text11","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Alert"},{"widgetName":"Button1","rightColumn":48,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"lryg8kw537","buttonStyle":"PRIMARY_BUTTON","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"delete_button","rightColumn":64,"onClick":"{{(function () {\nDeleteQuery.run(() => showAlert('Row successfully deleted!','success'), () => showAlert('Something went wrong! Please check debugger for more info.','error'));\ncloseModal('Delete_Modal');\nSelectQuery.run();\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"qq02lh7ust","buttonStyle":"DANGER_BUTTON","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}]},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"size":"MODAL_LARGE","leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":60,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"hqtpvn9ut2","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"ipc9o3ksyi","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hqtpvn9ut2","minHeight":520,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{(function () {\nInsertQuery.run(() =>{ \t\tshowAlert('Item successfully inserted!','success');\ncloseModal('Insert_Modal');\nSelectQuery.run();\n}, (error) => showAlert(error,'error'));\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"s2jtkzz2ub","buttonStyle":"PRIMARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"FormButton2","rightColumn":45,"isDefaultClickDisabled":true,"widgetId":"396envygmb","buttonStyle":"SECONDARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"disabledWhenInvalid":false,"leftColumn":29,"text":"Reset"},{"widgetName":"Text21","rightColumn":18,"textAlign":"RIGHT","widgetId":"vwgogtczul","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"cbz2r2wizv","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col1}}","isDisabled":false},{"widgetName":"Text22","rightColumn":18,"textAlign":"RIGHT","widgetId":"t2a63abehn","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"tjrktjwn9c","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","defaultText":"","placeholderText":"{{data_table.tableData[0].col2}}","isDisabled":false},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"0xqhj661rj","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"et0p9va1yw","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col3}}","defaultText":"","isDisabled":false},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"mxztke60bg","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"wp3nuhaz7m","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col4}}","defaultText":"","isDisabled":false},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"2xn45kukrz","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"lqhw4zvrts","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col5}}","isDisabled":false},{"widgetName":"Text13","rightColumn":35,"textAlign":"LEFT","widgetId":"iuydklwdo3","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}]},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow.col1.length > 0}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":60,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"4gnygu5jew","buttonStyle":"PRIMARY_BUTTON","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":39,"dynamicBindingPathList":[],"text":"Update"},{"isRequired":false,"widgetName":"colInput1","rightColumn":60,"widgetId":"in8e51pg3y","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false},{"isRequired":false,"widgetName":"colInput2","rightColumn":60,"widgetId":"mlhvfasf31","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false},{"isRequired":false,"widgetName":"colInput3","rightColumn":60,"widgetId":"0lz9vhcnr0","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false},{"isRequired":false,"widgetName":"colInput4","rightColumn":60,"widgetId":"m4esf7fww5","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row Index: {{data_table.selectedRow.rowIndex}}"},{"widgetName":"col_text_1","rightColumn":18,"textAlign":"LEFT","widgetId":"afzzc7q8af","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"widgetName":"col_text_2","rightColumn":19,"textAlign":"LEFT","widgetId":"xqcsd2e5dj","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"col_text_3","rightColumn":19,"textAlign":"LEFT","widgetId":"l109ilp3vq","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"col_text_4","rightColumn":19,"textAlign":"LEFT","widgetId":"gqpwf0yng6","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"}]}]}]}}],"isHidden":false},"new":true,"unpublishedPage":{"name":"GSheets","userPermissions":[],"layouts":[{"new":false,"id":"60d45c59ee9aa1792c5bec5a","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"SAAS","jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"60d468c1ee9aa1792c5bec95"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":840,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":720,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["col1","col2","col3","col4","rowIndex","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":6,"bottomRow":84,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.rowIndex.computedValue"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"rowIndex":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.rowIndex})}}","textSize":"PARAGRAPH","index":4,"isVisible":false,"label":"rowIndex","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"rowIndex","verticalAlignment":"CENTER"},"col4":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col4})}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col2})}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col3})}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col1})}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{deleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":1,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"step":62,"status":75,"col1":140}},{"widgetName":"new_row_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"widgetId":"aiy9e38won","buttonStyle":"PRIMARY_BUTTON","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Row","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{SelectQuery.run()}}","isDefaultClickDisabled":true,"widgetId":"qykn04gnsw","buttonStyle":"SECONDARY_BUTTON","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":41,"dynamicBindingPathList":[],"text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":39,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":18.8828125,"size":"MODAL_SMALL","leftColumn":21,"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text11","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Alert"},{"widgetName":"Button1","rightColumn":48,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"lryg8kw537","buttonStyle":"PRIMARY_BUTTON","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"delete_button","rightColumn":64,"onClick":"{{(function () {\nDeleteQuery.run(() => showAlert('Row successfully deleted!','success'), () => showAlert('Something went wrong! Please check debugger for more info.','error'));\ncloseModal('Delete_Modal');\nSelectQuery.run();\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"qq02lh7ust","buttonStyle":"DANGER_BUTTON","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}]},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"size":"MODAL_LARGE","leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":60,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"hqtpvn9ut2","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"ipc9o3ksyi","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hqtpvn9ut2","minHeight":520,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{(function () {\nInsertQuery.run(() =>{ \t\tshowAlert('Item successfully inserted!','success');\ncloseModal('Insert_Modal');\nSelectQuery.run();\n}, (error) => showAlert(error,'error'));\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"s2jtkzz2ub","buttonStyle":"PRIMARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"FormButton2","rightColumn":45,"isDefaultClickDisabled":true,"widgetId":"396envygmb","buttonStyle":"SECONDARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"disabledWhenInvalid":false,"leftColumn":29,"text":"Reset"},{"widgetName":"Text21","rightColumn":18,"textAlign":"RIGHT","widgetId":"vwgogtczul","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"cbz2r2wizv","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col1}}","isDisabled":false},{"widgetName":"Text22","rightColumn":18,"textAlign":"RIGHT","widgetId":"t2a63abehn","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"tjrktjwn9c","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","defaultText":"","placeholderText":"{{data_table.tableData[0].col2}}","isDisabled":false},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"0xqhj661rj","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"et0p9va1yw","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col3}}","defaultText":"","isDisabled":false},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"mxztke60bg","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"wp3nuhaz7m","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col4}}","defaultText":"","isDisabled":false},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"2xn45kukrz","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"lqhw4zvrts","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col5}}","isDisabled":false},{"widgetName":"Text13","rightColumn":35,"textAlign":"LEFT","widgetId":"iuydklwdo3","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}]},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow.col1.length > 0}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":60,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"4gnygu5jew","buttonStyle":"PRIMARY_BUTTON","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":39,"dynamicBindingPathList":[],"text":"Update"},{"isRequired":false,"widgetName":"colInput1","rightColumn":60,"widgetId":"in8e51pg3y","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false},{"isRequired":false,"widgetName":"colInput2","rightColumn":60,"widgetId":"mlhvfasf31","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false},{"isRequired":false,"widgetName":"colInput3","rightColumn":60,"widgetId":"0lz9vhcnr0","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false},{"isRequired":false,"widgetName":"colInput4","rightColumn":60,"widgetId":"m4esf7fww5","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row Index: {{data_table.selectedRow.rowIndex}}"},{"widgetName":"col_text_1","rightColumn":18,"textAlign":"LEFT","widgetId":"afzzc7q8af","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"widgetName":"col_text_2","rightColumn":19,"textAlign":"LEFT","widgetId":"xqcsd2e5dj","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"col_text_3","rightColumn":19,"textAlign":"LEFT","widgetId":"l109ilp3vq","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"col_text_4","rightColumn":19,"textAlign":"LEFT","widgetId":"gqpwf0yng6","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"}]}]}]}}],"isHidden":false},"userPermissions":["read:pages","manage:pages"]},{"publishedPage":{"name":"S3Assets","userPermissions":[],"layouts":[{"new":false,"id":"60da6c7aee9aa1792c5bf5e4","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["(list_files_folder.text ? (list_files_folder.text + \"/\"): \"\") + search_input.text"],"name":"ListFiles","timeoutInMillisecond":10000,"id":"60da700cee9aa1792c5bf5e9"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":1960,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":1700,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container3","rightColumn":64,"widgetId":"th4d9oxy8z","containerStyle":"card","topRow":5,"bottomRow":105,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"leftColumn":0,"children":[{"widgetName":"Canvas4","rightColumn":634,"detachFromLayout":true,"widgetId":"6tz2s7ivi5","containerStyle":"none","topRow":0,"bottomRow":950,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"th4d9oxy8z","minHeight":1000,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"template":{"delete_button":{"widgetName":"delete_button","rightColumn":64,"onClick":"{{showModal('delete_modal')}}","isDefaultClickDisabled":true,"widgetId":"ge7ws9hdfv","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"DANGER_BUTTON","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"leftColumn":56,"text":"Delete","isDisabled":false},"Button5":{"widgetName":"Button5","rightColumn":64,"onClick":"{{copyToClipboard(File_List.selectedItem.signedUrl)}}","isDefaultClickDisabled":true,"widgetId":"47abcy9ml3","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"SECONDARY_BUTTON","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"leftColumn":56,"text":"Copy URL","isDisabled":false},"Image1":{"image":"{{File_List.listData.map((currentItem) => {\n              return (function(){\n                return  currentItem.signedUrl;\n              })();\n            })}}","widgetName":"Image1","rightColumn":16,"onClick":"{{showModal('Modal1')}}","objectFit":"cover","widgetId":"0gdl5jza7u","topRow":0,"bottomRow":12,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"maxZoomLevel":1,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","dynamicBindingPathList":[{"key":"image"}],"leftColumn":0,"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"},"Text3":{"widgetName":"Text3","rightColumn":40,"textAlign":"LEFT","widgetId":"kkh6qolefs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"i1nxa4i2e0","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"HEADING3","text":"{{File_List.listData.map((currentItem) => {\n              return (function(){\n                return  currentItem.fileName;\n              })();\n            })}}","textStyle":"HEADING"},"download_button":{"widgetName":"download_button","rightColumn":24,"onClick":"{{ReadFile.run(() => download(ReadFile.data.fileData,File_List.selectedItem.fileName), () => {})}}","isDefaultClickDisabled":true,"widgetId":"wqenprx82s","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"PRIMARY_BUTTON","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"leftColumn":16,"text":"Download","isDisabled":false}},"widgetName":"File_List","listData":"{{ListFiles.data.reverse()}}","dynamicPropertyPathList":[],"topRow":5,"bottomRow":98,"parentRowSpace":10,"type":"LIST_WIDGET","gridGap":"","parentColumnSpace":19.8125,"dynamicTriggerPathList":[{"key":"onListItemClick"},{"key":"template.Button5.onClick"},{"key":"template.Button4.onClick"},{"key":"template.delete_button.onClick"},{"key":"template.download_button.onClick"},{"key":"template.Button12Copy.onClick"},{"key":"template.Image1.onClick"}],"leftColumn":0,"dynamicBindingPathList":[{"key":"listData"},{"key":"template.Text3.text"},{"key":"template.Image1.image"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas2","rightColumn":634,"detachFromLayout":true,"widgetId":"reeuqthmiz","containerStyle":"none","topRow":0,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"hastz111oe","openParentPropertyPane":true,"minHeight":930,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"backgroundColor":"white","widgetName":"Container2","rightColumn":64,"disallowCopy":true,"widgetId":"lv7hdxocpn","containerStyle":"card","topRow":0,"bottomRow":17,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"reeuqthmiz","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"shouldScrollContents":true,"leftColumn":0,"children":[{"widgetName":"Canvas3","detachFromLayout":true,"widgetId":"i1nxa4i2e0","containerStyle":"none","topRow":0,"bottomRow":190,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"lv7hdxocpn","isLoading":false,"minHeight":170,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"image":"{{currentItem.signedUrl}}","widgetName":"Image1","rightColumn":16,"onClick":"{{showModal('Modal1')}}","objectFit":"cover","widgetId":"0gdl5jza7u","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"imageShape":true,"dynamicBindingPathList":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":15,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"maxZoomLevel":1,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","dynamicBindingPathList":[{"key":"image"}],"leftColumn":0,"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"},{"widgetName":"Text3","rightColumn":47,"textAlign":"LEFT","widgetId":"kkh6qolefs","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"i1nxa4i2e0","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"HEADING3","text":"{{currentItem.fileName}}","textStyle":"HEADING"},{"widgetName":"Button5","rightColumn":33,"onClick":"{{copyToClipboard(File_List.selectedItem.signedUrl)}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"47abcy9ml3","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"SECONDARY_BUTTON","topRow":11,"bottomRow":15,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":25,"dynamicBindingPathList":[],"text":"Copy URL","isDisabled":false},{"widgetName":"delete_button","rightColumn":64,"onClick":"{{showModal('delete_modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"ge7ws9hdfv","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"DANGER_BUTTON","topRow":11,"bottomRow":15,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":56,"dynamicBindingPathList":[],"text":"Delete","isDisabled":false},{"widgetName":"download_button","rightColumn":25,"onClick":"{{ReadFile.run(() => download(ReadFile.data.fileData,File_List.selectedItem.fileName), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"wqenprx82s","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"PRIMARY_BUTTON","topRow":11,"bottomRow":15,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":17,"dynamicBindingPathList":[],"text":"Download","isDisabled":false}]}],"disablePropertyPane":true}]}],"childAutoComplete":{"currentItem":{"fileName":"","urlExpiryDate":"","signedUrl":""}},"backgroundColor":"","rightColumn":64,"onListItemClick":"","itemBackgroundColor":"","widgetId":"hastz111oe","isVisible":true,"parentId":"6tz2s7ivi5","isLoading":false},{"isRequired":false,"onTextChanged":"{{ListFiles.run()}}","widgetName":"search_input","rightColumn":19,"widgetId":"0llmlojupa","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6tz2s7ivi5","isLoading":false,"parentColumnSpace":19.5,"dynamicTriggerPathList":[{"key":"onTextChanged"}],"resetOnSubmit":true,"leftColumn":0,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Search File Prefix","defaultText":"","isDisabled":false},{"widgetName":"Text11","rightColumn":50,"textAlign":"RIGHT","widgetId":"tze9zj2hky","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"6tz2s7ivi5","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":46,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Folder"},{"isRequired":false,"onTextChanged":"{{ListFiles.run()}}","widgetName":"list_files_folder","rightColumn":64,"widgetId":"s7jrm9uybg","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6tz2s7ivi5","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[{"key":"onTextChanged"}],"resetOnSubmit":true,"leftColumn":50,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"folder/subfolder","isDisabled":false}]}]},{"widgetName":"Text6","rightColumn":13,"backgroundColor":"","textAlign":"LEFT","widgetId":"t54ituq472","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#2E3D49","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Browse S3 Bucket"},{"widgetName":"Upload_Files_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"1fxorj7v97","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"size":"MODAL_LARGE","leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":0,"detachFromLayout":true,"widgetId":"d8io5ijwj4","topRow":0,"bottomRow":620,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"1fxorj7v97","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"FilePicker","dynamicPropertyPathList":[],"topRow":11,"bottomRow":15,"parentRowSpace":10,"allowedFileTypes":["*","image/*","video/*","audio/*","text/*",".doc","image/jpeg",".png"],"type":"FILE_PICKER_WIDGET","parentColumnSpace":19.5,"dynamicTriggerPathList":[{"key":"onFilesSelected"}],"leftColumn":17,"dynamicBindingPathList":[],"isDisabled":false,"onFilesSelected":"","isRequired":true,"rightColumn":63,"isDefaultClickDisabled":true,"widgetId":"322pwxcdcp","defaultSelectedFiles":[],"isVisible":true,"label":"Select Files","maxFileSize":"10","version":1,"fileDataType":"Base64","parentId":"d8io5ijwj4","selectedFiles":[],"isLoading":false,"files":[],"maxNumFiles":"5"},{"widgetName":"Icon1","rightColumn":64,"onClick":"{{closeModal('Upload_Files_Modal')}}","color":"#040627","iconName":"cross","widgetId":"qoq5qcqwn3","topRow":0,"bottomRow":4,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"d8io5ijwj4","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text7","rightColumn":40,"textAlign":"LEFT","widgetId":"caavmyb2hq","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"d8io5ijwj4","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Upload Files"},{"widgetName":"Button8","rightColumn":42,"onClick":"{{closeModal('Upload_Files_Modal')}}","isDefaultClickDisabled":true,"widgetId":"ha7jsexyny","buttonStyle":"SECONDARY_BUTTON","topRow":54,"bottomRow":58,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"d8io5ijwj4","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":30,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"upload_button","rightColumn":64,"onClick":"{{\nFilePicker.files.forEach((file, index) => {\n\tCreateFile.run((response, params)=>   { showAlert('File Uploaded','success'); \nif (params.isLastFile) {\n\tListFiles.run(() => closeModal('Upload_Files_Modal'))\t\n}\n}\n\t, () => showAlert('File Upload Failed','error')\t\n\t, {fileIndex: index, name: selected_files.items[index].file_name.text, isLastFile: index == (FilePicker.files.length - 1), });\n\treturn true;\n})\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"hk4wlj8lqk","buttonStyle":"PRIMARY_BUTTON","topRow":54,"bottomRow":58,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"d8io5ijwj4","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":42,"dynamicBindingPathList":[],"text":"Upload","isDisabled":false},{"widgetName":"Text9","rightColumn":16,"textAlign":"RIGHT","widgetId":"5rnwbi4l7l","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"d8io5ijwj4","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Upload Folder"},{"isRequired":false,"widgetName":"folder_name","rightColumn":63,"widgetId":"xy36b926b7","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"d8io5ijwj4","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":17,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"folder/sub-folder","isDisabled":false},{"template":{"file_name":{"isRequired":false,"widgetName":"file_name","rightColumn":52,"widgetId":"a2tpi1lssb","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"parentColumnSpace":7.3125,"resetOnSubmit":true,"leftColumn":32,"inputType":"TEXT","defaultText":"{{selected_files.listData.map((currentItem) => {\n              return (function(){\n                return  currentItem.name;\n              })();\n            })}}","isDisabled":false},"Image2":{"image":"{{selected_files.listData.map((currentItem) => {\n              return (function(){\n                return  currentItem.base64;\n              })();\n            })}}","widgetName":"Image2","rightColumn":17,"objectFit":"cover","widgetId":"fqtm26urc8","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":5,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"imageShape":"RECTANGLE","leftColumn":1,"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"},"Text14":{"widgetName":"Text14","rightColumn":40,"textAlign":"RIGHT","widgetId":"5o9832t0pg","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"}},"childAutoComplete":{"currentItem":{"data":"","base64":"","name":"","raw":"","id":"","text":"","type":""}},"widgetName":"selected_files","backgroundColor":"","rightColumn":64,"listData":"{{FilePicker.files}}","dynamicPropertyPathList":[{"key":"isVisible"}],"itemBackgroundColor":"#FFFFFF","widgetId":"8j571uwl0l","topRow":18,"bottomRow":44,"parentRowSpace":10,"isVisible":"{{FilePicker.files.length > 0}}","type":"LIST_WIDGET","parentId":"d8io5ijwj4","gridGap":0,"isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[{"key":"listData"},{"key":"template.file_name.defaultText"},{"key":"isVisible"},{"key":"template.Image2.image"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas7","rightColumn":256,"detachFromLayout":true,"widgetId":"2b0x8h3zyv","containerStyle":"none","topRow":0,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"8j571uwl0l","openParentPropertyPane":true,"minHeight":260,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"backgroundColor":"white","widgetName":"Container4","rightColumn":64,"disallowCopy":true,"widgetId":"60y08tm87w","containerStyle":"card","topRow":0,"bottomRow":8,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"2b0x8h3zyv","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"leftColumn":0,"children":[{"widgetName":"Canvas8","detachFromLayout":true,"widgetId":"h6xtuzmqwr","containerStyle":"none","topRow":0,"bottomRow":180,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"60y08tm87w","minHeight":80,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text14","rightColumn":23,"textAlign":"RIGHT","widgetId":"5o9832t0pg","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":11,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"},{"isRequired":false,"widgetName":"file_name","rightColumn":63,"widgetId":"a2tpi1lssb","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":23,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{currentItem.name}}","isDisabled":false},{"image":"{{currentItem.base64}}","widgetName":"Image2","rightColumn":10,"objectFit":"cover","widgetId":"fqtm26urc8","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":0,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"}]}],"disablePropertyPane":true}]}]}],"isDisabled":false}]},{"widgetName":"delete_modal","rightColumn":0,"detachFromLayout":true,"widgetId":"9g0cw9adf8","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"size":"MODAL_SMALL","leftColumn":0,"children":[{"widgetName":"Canvas6","rightColumn":0,"detachFromLayout":true,"widgetId":"ozvpoudxz2","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"9g0cw9adf8","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon2","rightColumn":64,"onClick":"{{closeModal('delete_modal')}}","color":"#040627","iconName":"cross","widgetId":"xkyh49z71e","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text12","rightColumn":41,"textAlign":"LEFT","widgetId":"s1y44xm547","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete File"},{"widgetName":"Button10","rightColumn":48,"onClick":"{{closeModal('delete_modal')}}","isDefaultClickDisabled":true,"widgetId":"pi0t67rnwh","buttonStyle":"SECONDARY_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Button11","rightColumn":64,"onClick":"{{DeleteFile.run(() => ListFiles.run(() => closeModal('delete_modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"hp22uj3dra","buttonStyle":"PRIMARY_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text13","rightColumn":64,"textAlign":"LEFT","widgetId":"oypa9ad1tg","topRow":5,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete the file?\n\n{{File_List.selectedItem.fileName}}"}],"isDisabled":false}]},{"widgetName":"add_files_button","rightColumn":64,"onClick":"{{showModal('Upload_Files_Modal')}}","isDefaultClickDisabled":true,"widgetId":"o8of2mic83","buttonStyle":"PRIMARY_BUTTON","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":56,"dynamicBindingPathList":[],"text":"Add Files","isDisabled":false},{"widgetName":"Modal1","rightColumn":0,"detachFromLayout":true,"widgetId":"p4buulj86a","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"size":"MODAL_LARGE","leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas9","rightColumn":0,"detachFromLayout":true,"widgetId":"p3cxdtb4wp","topRow":0,"bottomRow":590,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"p4buulj86a","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon3","rightColumn":64,"onClick":"{{closeModal('Modal1')}}","color":"#040627","iconName":"cross","widgetId":"b49lgvj9yy","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"p3cxdtb4wp","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text15","rightColumn":41,"textAlign":"LEFT","widgetId":"cy38v3de8z","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"p3cxdtb4wp","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Zoom Image"},{"widgetName":"Button13","rightColumn":63,"onClick":"{{closeModal('Modal1')}}","isDefaultClickDisabled":true,"widgetId":"ftst3w9m8m","buttonStyle":"PRIMARY_BUTTON","topRow":53,"bottomRow":57,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"p3cxdtb4wp","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":47,"dynamicBindingPathList":[],"text":"Close","isDisabled":false},{"image":"{{File_List.selectedItem.signedUrl}}","widgetName":"Image3","rightColumn":64,"objectFit":"cover","widgetId":"a5gy0pdfzn","topRow":6,"bottomRow":51,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"p3cxdtb4wp","isLoading":false,"maxZoomLevel":8,"parentColumnSpace":8,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"}],"isDisabled":false}]}]}}],"isHidden":false},"new":true,"unpublishedPage":{"name":"S3Assets","userPermissions":[],"layouts":[{"new":false,"id":"60da6c7aee9aa1792c5bf5e4","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["(list_files_folder.text ? (list_files_folder.text + \"/\"): \"\") + search_input.text"],"name":"ListFiles","timeoutInMillisecond":10000,"id":"60da700cee9aa1792c5bf5e9"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":1960,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":1700,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container3","rightColumn":64,"widgetId":"th4d9oxy8z","containerStyle":"card","topRow":5,"bottomRow":105,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"leftColumn":0,"children":[{"widgetName":"Canvas4","rightColumn":634,"detachFromLayout":true,"widgetId":"6tz2s7ivi5","containerStyle":"none","topRow":0,"bottomRow":950,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"th4d9oxy8z","minHeight":1000,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"template":{"delete_button":{"widgetName":"delete_button","rightColumn":64,"onClick":"{{showModal('delete_modal')}}","isDefaultClickDisabled":true,"widgetId":"ge7ws9hdfv","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"DANGER_BUTTON","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"leftColumn":56,"text":"Delete","isDisabled":false},"Button5":{"widgetName":"Button5","rightColumn":64,"onClick":"{{copyToClipboard(File_List.selectedItem.signedUrl)}}","isDefaultClickDisabled":true,"widgetId":"47abcy9ml3","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"SECONDARY_BUTTON","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"leftColumn":56,"text":"Copy URL","isDisabled":false},"Image1":{"image":"{{File_List.listData.map((currentItem) => {\n              return (function(){\n                return  currentItem.signedUrl;\n              })();\n            })}}","widgetName":"Image1","rightColumn":16,"onClick":"{{showModal('Modal1')}}","objectFit":"cover","widgetId":"0gdl5jza7u","topRow":0,"bottomRow":12,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"maxZoomLevel":1,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","dynamicBindingPathList":[{"key":"image"}],"leftColumn":0,"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"},"Text3":{"widgetName":"Text3","rightColumn":40,"textAlign":"LEFT","widgetId":"kkh6qolefs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"i1nxa4i2e0","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"HEADING3","text":"{{File_List.listData.map((currentItem) => {\n              return (function(){\n                return  currentItem.fileName;\n              })();\n            })}}","textStyle":"HEADING"},"download_button":{"widgetName":"download_button","rightColumn":24,"onClick":"{{ReadFile.run(() => download(ReadFile.data.fileData,File_List.selectedItem.fileName), () => {})}}","isDefaultClickDisabled":true,"widgetId":"wqenprx82s","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"PRIMARY_BUTTON","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"leftColumn":16,"text":"Download","isDisabled":false}},"widgetName":"File_List","listData":"{{ListFiles.data.reverse()}}","dynamicPropertyPathList":[],"topRow":5,"bottomRow":98,"parentRowSpace":10,"type":"LIST_WIDGET","gridGap":"","parentColumnSpace":19.8125,"dynamicTriggerPathList":[{"key":"onListItemClick"},{"key":"template.Button5.onClick"},{"key":"template.Button4.onClick"},{"key":"template.delete_button.onClick"},{"key":"template.download_button.onClick"},{"key":"template.Button12Copy.onClick"},{"key":"template.Image1.onClick"}],"leftColumn":0,"dynamicBindingPathList":[{"key":"listData"},{"key":"template.Text3.text"},{"key":"template.Image1.image"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas2","rightColumn":634,"detachFromLayout":true,"widgetId":"reeuqthmiz","containerStyle":"none","topRow":0,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"hastz111oe","openParentPropertyPane":true,"minHeight":930,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"backgroundColor":"white","widgetName":"Container2","rightColumn":64,"disallowCopy":true,"widgetId":"lv7hdxocpn","containerStyle":"card","topRow":0,"bottomRow":17,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"reeuqthmiz","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"shouldScrollContents":true,"leftColumn":0,"children":[{"widgetName":"Canvas3","detachFromLayout":true,"widgetId":"i1nxa4i2e0","containerStyle":"none","topRow":0,"bottomRow":190,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"lv7hdxocpn","isLoading":false,"minHeight":170,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"image":"{{currentItem.signedUrl}}","widgetName":"Image1","rightColumn":16,"onClick":"{{showModal('Modal1')}}","objectFit":"cover","widgetId":"0gdl5jza7u","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"imageShape":true,"dynamicBindingPathList":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":15,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"maxZoomLevel":1,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","dynamicBindingPathList":[{"key":"image"}],"leftColumn":0,"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"},{"widgetName":"Text3","rightColumn":47,"textAlign":"LEFT","widgetId":"kkh6qolefs","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"i1nxa4i2e0","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"HEADING3","text":"{{currentItem.fileName}}","textStyle":"HEADING"},{"widgetName":"Button5","rightColumn":33,"onClick":"{{copyToClipboard(File_List.selectedItem.signedUrl)}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"47abcy9ml3","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"SECONDARY_BUTTON","topRow":11,"bottomRow":15,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":25,"dynamicBindingPathList":[],"text":"Copy URL","isDisabled":false},{"widgetName":"delete_button","rightColumn":64,"onClick":"{{showModal('delete_modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"ge7ws9hdfv","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"DANGER_BUTTON","topRow":11,"bottomRow":15,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":56,"dynamicBindingPathList":[],"text":"Delete","isDisabled":false},{"widgetName":"download_button","rightColumn":25,"onClick":"{{ReadFile.run(() => download(ReadFile.data.fileData,File_List.selectedItem.fileName), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"wqenprx82s","logBlackList":{"widgetName":true,"rightColumn":true,"isDefaultClickDisabled":true,"widgetId":true,"buttonStyle":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"text":true,"isDisabled":true},"buttonStyle":"PRIMARY_BUTTON","topRow":11,"bottomRow":15,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"i1nxa4i2e0","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":17,"dynamicBindingPathList":[],"text":"Download","isDisabled":false}]}],"disablePropertyPane":true}]}],"childAutoComplete":{"currentItem":{"fileName":"","urlExpiryDate":"","signedUrl":""}},"backgroundColor":"","rightColumn":64,"onListItemClick":"","itemBackgroundColor":"","widgetId":"hastz111oe","isVisible":true,"parentId":"6tz2s7ivi5","isLoading":false},{"isRequired":false,"onTextChanged":"{{ListFiles.run()}}","widgetName":"search_input","rightColumn":19,"widgetId":"0llmlojupa","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6tz2s7ivi5","isLoading":false,"parentColumnSpace":19.5,"dynamicTriggerPathList":[{"key":"onTextChanged"}],"resetOnSubmit":true,"leftColumn":0,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Search File Prefix","defaultText":"","isDisabled":false},{"widgetName":"Text11","rightColumn":50,"textAlign":"RIGHT","widgetId":"tze9zj2hky","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"6tz2s7ivi5","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":46,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Folder"},{"isRequired":false,"onTextChanged":"{{ListFiles.run()}}","widgetName":"list_files_folder","rightColumn":64,"widgetId":"s7jrm9uybg","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6tz2s7ivi5","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[{"key":"onTextChanged"}],"resetOnSubmit":true,"leftColumn":50,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"folder/subfolder","isDisabled":false}]}]},{"widgetName":"Text6","rightColumn":13,"backgroundColor":"","textAlign":"LEFT","widgetId":"t54ituq472","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#2E3D49","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Browse S3 Bucket"},{"widgetName":"Upload_Files_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"1fxorj7v97","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"size":"MODAL_LARGE","leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":0,"detachFromLayout":true,"widgetId":"d8io5ijwj4","topRow":0,"bottomRow":620,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"1fxorj7v97","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"FilePicker","dynamicPropertyPathList":[],"topRow":11,"bottomRow":15,"parentRowSpace":10,"allowedFileTypes":["*","image/*","video/*","audio/*","text/*",".doc","image/jpeg",".png"],"type":"FILE_PICKER_WIDGET","parentColumnSpace":19.5,"dynamicTriggerPathList":[{"key":"onFilesSelected"}],"leftColumn":17,"dynamicBindingPathList":[],"isDisabled":false,"onFilesSelected":"","isRequired":true,"rightColumn":63,"isDefaultClickDisabled":true,"widgetId":"322pwxcdcp","defaultSelectedFiles":[],"isVisible":true,"label":"Select Files","maxFileSize":"10","version":1,"fileDataType":"Base64","parentId":"d8io5ijwj4","selectedFiles":[],"isLoading":false,"files":[],"maxNumFiles":"5"},{"widgetName":"Icon1","rightColumn":64,"onClick":"{{closeModal('Upload_Files_Modal')}}","color":"#040627","iconName":"cross","widgetId":"qoq5qcqwn3","topRow":0,"bottomRow":4,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"d8io5ijwj4","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text7","rightColumn":40,"textAlign":"LEFT","widgetId":"caavmyb2hq","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"d8io5ijwj4","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Upload Files"},{"widgetName":"Button8","rightColumn":42,"onClick":"{{closeModal('Upload_Files_Modal')}}","isDefaultClickDisabled":true,"widgetId":"ha7jsexyny","buttonStyle":"SECONDARY_BUTTON","topRow":54,"bottomRow":58,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"d8io5ijwj4","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":30,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"upload_button","rightColumn":64,"onClick":"{{\nFilePicker.files.forEach((file, index) => {\n\tCreateFile.run((response, params)=>   { showAlert('File Uploaded','success'); \nif (params.isLastFile) {\n\tListFiles.run(() => closeModal('Upload_Files_Modal'))\t\n}\n}\n\t, () => showAlert('File Upload Failed','error')\t\n\t, {fileIndex: index, name: selected_files.items[index].file_name.text, isLastFile: index == (FilePicker.files.length - 1), });\n\treturn true;\n})\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"hk4wlj8lqk","buttonStyle":"PRIMARY_BUTTON","topRow":54,"bottomRow":58,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"d8io5ijwj4","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":42,"dynamicBindingPathList":[],"text":"Upload","isDisabled":false},{"widgetName":"Text9","rightColumn":16,"textAlign":"RIGHT","widgetId":"5rnwbi4l7l","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"d8io5ijwj4","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Upload Folder"},{"isRequired":false,"widgetName":"folder_name","rightColumn":63,"widgetId":"xy36b926b7","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"d8io5ijwj4","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":17,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"folder/sub-folder","isDisabled":false},{"template":{"file_name":{"isRequired":false,"widgetName":"file_name","rightColumn":52,"widgetId":"a2tpi1lssb","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"parentColumnSpace":7.3125,"resetOnSubmit":true,"leftColumn":32,"inputType":"TEXT","defaultText":"{{selected_files.listData.map((currentItem) => {\n              return (function(){\n                return  currentItem.name;\n              })();\n            })}}","isDisabled":false},"Image2":{"image":"{{selected_files.listData.map((currentItem) => {\n              return (function(){\n                return  currentItem.base64;\n              })();\n            })}}","widgetName":"Image2","rightColumn":17,"objectFit":"cover","widgetId":"fqtm26urc8","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":5,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"imageShape":"RECTANGLE","leftColumn":1,"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"},"Text14":{"widgetName":"Text14","rightColumn":40,"textAlign":"RIGHT","widgetId":"5o9832t0pg","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"}},"childAutoComplete":{"currentItem":{"data":"","base64":"","name":"","raw":"","id":"","text":"","type":""}},"widgetName":"selected_files","backgroundColor":"","rightColumn":64,"listData":"{{FilePicker.files}}","dynamicPropertyPathList":[{"key":"isVisible"}],"itemBackgroundColor":"#FFFFFF","widgetId":"8j571uwl0l","topRow":18,"bottomRow":44,"parentRowSpace":10,"isVisible":"{{FilePicker.files.length > 0}}","type":"LIST_WIDGET","parentId":"d8io5ijwj4","gridGap":0,"isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[{"key":"listData"},{"key":"template.file_name.defaultText"},{"key":"isVisible"},{"key":"template.Image2.image"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas7","rightColumn":256,"detachFromLayout":true,"widgetId":"2b0x8h3zyv","containerStyle":"none","topRow":0,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"8j571uwl0l","openParentPropertyPane":true,"minHeight":260,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"backgroundColor":"white","widgetName":"Container4","rightColumn":64,"disallowCopy":true,"widgetId":"60y08tm87w","containerStyle":"card","topRow":0,"bottomRow":8,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"2b0x8h3zyv","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"leftColumn":0,"children":[{"widgetName":"Canvas8","detachFromLayout":true,"widgetId":"h6xtuzmqwr","containerStyle":"none","topRow":0,"bottomRow":180,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"60y08tm87w","minHeight":80,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text14","rightColumn":23,"textAlign":"RIGHT","widgetId":"5o9832t0pg","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":11,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"},{"isRequired":false,"widgetName":"file_name","rightColumn":63,"widgetId":"a2tpi1lssb","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":23,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{currentItem.name}}","isDisabled":false},{"image":"{{currentItem.base64}}","widgetName":"Image2","rightColumn":10,"objectFit":"cover","widgetId":"fqtm26urc8","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"h6xtuzmqwr","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":0,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"}]}],"disablePropertyPane":true}]}]}],"isDisabled":false}]},{"widgetName":"delete_modal","rightColumn":0,"detachFromLayout":true,"widgetId":"9g0cw9adf8","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"size":"MODAL_SMALL","leftColumn":0,"children":[{"widgetName":"Canvas6","rightColumn":0,"detachFromLayout":true,"widgetId":"ozvpoudxz2","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"9g0cw9adf8","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon2","rightColumn":64,"onClick":"{{closeModal('delete_modal')}}","color":"#040627","iconName":"cross","widgetId":"xkyh49z71e","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text12","rightColumn":41,"textAlign":"LEFT","widgetId":"s1y44xm547","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete File"},{"widgetName":"Button10","rightColumn":48,"onClick":"{{closeModal('delete_modal')}}","isDefaultClickDisabled":true,"widgetId":"pi0t67rnwh","buttonStyle":"SECONDARY_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Button11","rightColumn":64,"onClick":"{{DeleteFile.run(() => ListFiles.run(() => closeModal('delete_modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"hp22uj3dra","buttonStyle":"PRIMARY_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text13","rightColumn":64,"textAlign":"LEFT","widgetId":"oypa9ad1tg","topRow":5,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete the file?\n\n{{File_List.selectedItem.fileName}}"}],"isDisabled":false}]},{"widgetName":"add_files_button","rightColumn":64,"onClick":"{{showModal('Upload_Files_Modal')}}","isDefaultClickDisabled":true,"widgetId":"o8of2mic83","buttonStyle":"PRIMARY_BUTTON","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":56,"dynamicBindingPathList":[],"text":"Add Files","isDisabled":false},{"widgetName":"Modal1","rightColumn":0,"detachFromLayout":true,"widgetId":"p4buulj86a","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"size":"MODAL_LARGE","leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas9","rightColumn":0,"detachFromLayout":true,"widgetId":"p3cxdtb4wp","topRow":0,"bottomRow":590,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"p4buulj86a","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon3","rightColumn":64,"onClick":"{{closeModal('Modal1')}}","color":"#040627","iconName":"cross","widgetId":"b49lgvj9yy","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"p3cxdtb4wp","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text15","rightColumn":41,"textAlign":"LEFT","widgetId":"cy38v3de8z","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"p3cxdtb4wp","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Zoom Image"},{"widgetName":"Button13","rightColumn":63,"onClick":"{{closeModal('Modal1')}}","isDefaultClickDisabled":true,"widgetId":"ftst3w9m8m","buttonStyle":"PRIMARY_BUTTON","topRow":53,"bottomRow":57,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"p3cxdtb4wp","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":47,"dynamicBindingPathList":[],"text":"Close","isDisabled":false},{"image":"{{File_List.selectedItem.signedUrl}}","widgetName":"Image3","rightColumn":64,"objectFit":"cover","widgetId":"a5gy0pdfzn","topRow":6,"bottomRow":51,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"p3cxdtb4wp","isLoading":false,"maxZoomLevel":8,"parentColumnSpace":8,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"}],"isDisabled":false}]}]}}],"isHidden":false},"userPermissions":["read:pages","manage:pages"]},{"publishedPage":{"name":"Admin","userPermissions":[],"layouts":[{"new":false,"id":"60dab9efee9aa1792c5bf645","userPermissions":[],"layoutOnLoadActions":[],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":880,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Form1","backgroundColor":"#2E3D49","rightColumn":45,"widgetId":"hdpwx2szs0","topRow":5,"bottomRow":86,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas1","rightColumn":554.75,"detachFromLayout":true,"widgetId":"kwx6oz4fub","containerStyle":"none","topRow":0,"bottomRow":690,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hdpwx2szs0","minHeight":810,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text1","rightColumn":36,"textAlign":"LEFT","widgetId":"7fqtlu52np","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update App Template"},{"widgetName":"Text2","rightColumn":61,"textAlign":"LEFT","widgetId":"w2l08fshj2","topRow":10,"bottomRow":62,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"shouldScroll":true,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{\"<pre>\" + JSON.stringify(get_exported_app.data, null, 2) + \"</pre>\" || \"Fetch The App\"}}"},{"widgetName":"Button1","rightColumn":21,"onClick":"{{\n  get_exported_app.run(() => {\n  \tconst arr = JSON.parse(datasource_arr.text);\n\t\tarr.map((row) => { get_datasource_structure.run((res, params) => {\n   storeValue(params.name, res); \n      },undefined, row)\n    })\n  })\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"2vtg0qdlqv","buttonStyle":"PRIMARY_BUTTON","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":3,"dynamicBindingPathList":[],"text":"Fetch App","isDisabled":false},{"widgetName":"Button2","rightColumn":63,"onClick":"{{update_template.run(() => showAlert('Template Updated'), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"isDisabled"}],"widgetId":"jg23u09rwk","buttonStyle":"PRIMARY_BUTTON","topRow":72,"bottomRow":76,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":4,"dynamicBindingPathList":[{"key":"isDisabled"}],"text":"Deploy","isDisabled":"{{get_exported_app.data.exportedApplication === undefined}}"},{"isRequired":false,"widgetName":"branch_input","rightColumn":49,"widgetId":"d6shlon0z2","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":12,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Branch name","defaultText":"release","isDisabled":false},{"widgetName":"Text3","rightColumn":12,"textAlign":"LEFT","widgetId":"y57v1yp7vb","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"HEADING3","text":"Branch"}]}]},{"widgetName":"datasource_arr","rightColumn":16,"textAlign":"LEFT","widgetId":"znji9afu2q","topRow":1,"bottomRow":35,"parentRowSpace":10,"isVisible":false,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"[\n{ \"name\":\"mongo-plugin\",\n\"id\": \"60dafedaee9aa1792c5bf773\"\n},\n{ \"name\":\"postgres-plugin\",\n\"id\": \"5fcdd652b0e807468e3b493b\"\n}, {\n\"name\": \"GSheets\", \"id\": \"60c744d93535574772b64363\"\n}\n]"},{"widgetName":"Button3","rightColumn":59,"onClick":"{{navigateTo('SQL','{}','SAME_WINDOW')}}","isDefaultClickDisabled":true,"widgetId":"px9lsocedu","buttonStyle":"PRIMARY_BUTTON","topRow":2,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"Submit","isDisabled":false}]}}],"isHidden":false},"new":true,"unpublishedPage":{"name":"Admin","userPermissions":[],"layouts":[{"new":false,"id":"60dab9efee9aa1792c5bf645","userPermissions":[],"layoutOnLoadActions":[],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":880,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Form1","backgroundColor":"#2E3D49","rightColumn":45,"widgetId":"hdpwx2szs0","topRow":5,"bottomRow":86,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas1","rightColumn":554.75,"detachFromLayout":true,"widgetId":"kwx6oz4fub","containerStyle":"none","topRow":0,"bottomRow":690,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hdpwx2szs0","minHeight":810,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text1","rightColumn":36,"textAlign":"LEFT","widgetId":"7fqtlu52np","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update App Template"},{"widgetName":"Text2","rightColumn":61,"textAlign":"LEFT","widgetId":"w2l08fshj2","topRow":10,"bottomRow":62,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"shouldScroll":true,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{\"<pre>\" + JSON.stringify(get_exported_app.data, null, 2) + \"</pre>\" || \"Fetch The App\"}}"},{"widgetName":"Button1","rightColumn":21,"onClick":"{{\n  get_exported_app.run(() => {\n  \tconst arr = JSON.parse(datasource_arr.text);\n\t\tarr.map((row) => { get_datasource_structure.run((res, params) => {\n   storeValue(params.name, res); \n      },undefined, row)\n    })\n  })\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"2vtg0qdlqv","buttonStyle":"PRIMARY_BUTTON","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":3,"dynamicBindingPathList":[],"text":"Fetch App","isDisabled":false},{"widgetName":"Button2","rightColumn":63,"onClick":"{{update_template.run(() => showAlert('Template Updated'), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"isDisabled"}],"widgetId":"jg23u09rwk","buttonStyle":"PRIMARY_BUTTON","topRow":72,"bottomRow":76,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":4,"dynamicBindingPathList":[{"key":"isDisabled"}],"text":"Deploy","isDisabled":"{{get_exported_app.data.exportedApplication === undefined}}"},{"isRequired":false,"widgetName":"branch_input","rightColumn":49,"widgetId":"d6shlon0z2","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":12,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Branch name","defaultText":"release","isDisabled":false},{"widgetName":"Text3","rightColumn":12,"textAlign":"LEFT","widgetId":"y57v1yp7vb","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"HEADING3","text":"Branch"},{"isRequired":false,"widgetName":"release_input","rightColumn":49,"widgetId":"615dq7nzxz","topRow":67,"bottomRow":71,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":12,"inputType":"TEXT","isDisabled":false}]}]},{"widgetName":"datasource_arr","rightColumn":16,"textAlign":"LEFT","widgetId":"znji9afu2q","topRow":1,"bottomRow":35,"parentRowSpace":10,"isVisible":false,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"[\n{ \"name\":\"mongo-plugin\",\n\"id\": \"60dafedaee9aa1792c5bf773\"\n},\n{ \"name\":\"postgres-plugin\",\n\"id\": \"5fcdd652b0e807468e3b493b\"\n}, {\n\"name\": \"GSheets\", \"id\": \"60c744d93535574772b64363\"\n}\n]"},{"widgetName":"Button3","rightColumn":59,"onClick":"{{navigateTo('SQL','{}','SAME_WINDOW')}}","isDefaultClickDisabled":true,"widgetId":"px9lsocedu","buttonStyle":"PRIMARY_BUTTON","topRow":2,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"Submit","isDisabled":false}]}}],"isHidden":false},"userPermissions":["read:pages","manage:pages"]},{"publishedPage":{"name":"Page Generator","userPermissions":[],"layouts":[{"new":false,"id":"60dadae5ee9aa1792c5bf6b8","userPermissions":[],"layoutOnLoadActions":[],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":880,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Tabs1","rightColumn":44,"widgetId":"jalvzswyyk","defaultTab":"SQL","topRow":13,"bottomRow":54,"shouldShowTabs":true,"parentRowSpace":10,"tabsObj":{"tab1":{"widgetId":"nyka98xqpv","index":0,"label":"SQL","id":"tab1","isVisible":true},"tab2":{"widgetId":"neexe4fljs","index":1,"label":"GSheet","id":"tab2","isVisible":true},"tab7qxuerb9p7":{"widgetId":"4yqoh4fjmv","id":"tab7qxuerb9p7","label":"Mongo","isVisible":true}},"isVisible":true,"type":"TABS_WIDGET","version":3,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":15,"dynamicBindingPathList":[],"children":[{"tabId":"tab1","tabName":"SQL","rightColumn":634,"widgetName":"Canvas2","detachFromLayout":true,"widgetId":"nyka98xqpv","topRow":0,"bottomRow":430,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":false,"widgetName":"tableName_input","rightColumn":63,"widgetId":"f8k5jt9mjm","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false},{"isRequired":false,"widgetName":"datasource_input","rightColumn":63,"widgetId":"4j1xd4hih9","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text2","rightColumn":14,"textAlign":"RIGHT","widgetId":"957c72jpan","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"widgetName":"Text4","rightColumn":14,"textAlign":"RIGHT","widgetId":"nz74xi3ae3","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Name"},{"widgetName":"Text6","rightColumn":14,"textAlign":"RIGHT","widgetId":"s1i89k31f5","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Columns to Select"},{"isRequired":false,"widgetName":"select_cols_input","rightColumn":63,"widgetId":"pwt5ybili3","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text7","rightColumn":14,"textAlign":"RIGHT","widgetId":"rbacxz6brz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Column to Search"},{"isRequired":false,"widgetName":"search_col_input","rightColumn":63,"widgetId":"bnro1si5sz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false},{"resetFormOnClick":false,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{generate_sql_app.run(() => showAlert('Page Created!','success'), () => {})}}","isDefaultClickDisabled":true,"widgetId":"n6220hgzzs","buttonStyle":"PRIMARY_BUTTON","topRow":31,"bottomRow":35,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Generate"}]},{"tabId":"tab2","tabName":"GSheet","rightColumn":634,"widgetName":"Canvas3","detachFromLayout":true,"widgetId":"neexe4fljs","topRow":0,"bottomRow":400,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text8","rightColumn":16,"textAlign":"RIGHT","widgetId":"3ghywz6tk6","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"DataSource URL"},{"isRequired":false,"widgetName":"gsheet_ds_input","rightColumn":62,"widgetId":"a8kpjqdp59","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text9","rightColumn":16,"textAlign":"RIGHT","widgetId":"r6o12im1qd","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"SpreadSheet URL"},{"isRequired":false,"widgetName":"spreadsheet_input","rightColumn":62,"widgetId":"80kk95t99i","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text10","rightColumn":16,"textAlign":"RIGHT","widgetId":"k0ul3uaoph","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Sheet Name"},{"isRequired":false,"widgetName":"sheet_input","rightColumn":62,"widgetId":"a35cwuivq7","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text11","rightColumn":16,"textAlign":"RIGHT","widgetId":"l1r1tfbx6y","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Header Index"},{"isRequired":false,"widgetName":"header_input","rightColumn":62,"widgetId":"jrhp3pwzll","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false},{"widgetName":"Button1","rightColumn":62,"onClick":"{{generate_gsheet_app.run()}}","isDefaultClickDisabled":true,"widgetId":"zzsh2d5rns","buttonStyle":"PRIMARY_BUTTON","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Generate","isDisabled":false}]},{"tabId":"tab7qxuerb9p7","widgetName":"Canvas4","tabName":"Mongo","rightColumn":574.5625,"detachFromLayout":true,"widgetId":"4yqoh4fjmv","containerStyle":"none","topRow":1,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"jalvzswyyk","minHeight":410,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text12","rightColumn":17,"textAlign":"RIGHT","widgetId":"4l1uqhf2au","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"isRequired":false,"widgetName":"mongo_ds_url","rightColumn":61,"widgetId":"r8yvmt103v","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text13","rightColumn":17,"textAlign":"RIGHT","widgetId":"0y3rz6ufib","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Collection Name"},{"isRequired":false,"widgetName":"collection_input","rightColumn":61,"widgetId":"sbe7jfnafu","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text14","rightColumn":17,"textAlign":"RIGHT","widgetId":"s1fhjft9to","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Keys to Fetch"},{"isRequired":false,"widgetName":"fetch_keys_input","rightColumn":61,"widgetId":"74tjl0q7x3","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text15","rightColumn":17,"textAlign":"RIGHT","widgetId":"rwi67ouhe1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Key to Search"},{"isRequired":false,"widgetName":"search_keys_input","rightColumn":61,"widgetId":"ie4mp16js1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false},{"widgetName":"Button2","rightColumn":62,"onClick":"{{generate_mongo_app.run()}}","isDefaultClickDisabled":true,"widgetId":"6ui5kmqebf","buttonStyle":"PRIMARY_BUTTON","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Generate","isDisabled":false}]}]}]}}],"isHidden":false},"new":true,"unpublishedPage":{"name":"Page Generator","userPermissions":[],"layouts":[{"new":false,"id":"60dadae5ee9aa1792c5bf6b8","userPermissions":[],"layoutOnLoadActions":[],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":880,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Tabs1","rightColumn":44,"widgetId":"jalvzswyyk","defaultTab":"SQL","topRow":13,"bottomRow":54,"shouldShowTabs":true,"parentRowSpace":10,"tabsObj":{"tab1":{"widgetId":"nyka98xqpv","index":0,"label":"SQL","id":"tab1","isVisible":true},"tab2":{"widgetId":"neexe4fljs","index":1,"label":"GSheet","id":"tab2","isVisible":true},"tab7qxuerb9p7":{"widgetId":"4yqoh4fjmv","id":"tab7qxuerb9p7","label":"Mongo","isVisible":true}},"isVisible":true,"type":"TABS_WIDGET","version":3,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":15,"dynamicBindingPathList":[],"children":[{"tabId":"tab1","tabName":"SQL","rightColumn":634,"widgetName":"Canvas2","detachFromLayout":true,"widgetId":"nyka98xqpv","topRow":0,"bottomRow":430,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":false,"widgetName":"tableName_input","rightColumn":63,"widgetId":"f8k5jt9mjm","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false},{"isRequired":false,"widgetName":"datasource_input","rightColumn":63,"widgetId":"4j1xd4hih9","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text2","rightColumn":14,"textAlign":"RIGHT","widgetId":"957c72jpan","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"widgetName":"Text4","rightColumn":14,"textAlign":"RIGHT","widgetId":"nz74xi3ae3","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Name"},{"widgetName":"Text6","rightColumn":14,"textAlign":"RIGHT","widgetId":"s1i89k31f5","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Columns to Select"},{"isRequired":false,"widgetName":"select_cols_input","rightColumn":63,"widgetId":"pwt5ybili3","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text7","rightColumn":14,"textAlign":"RIGHT","widgetId":"rbacxz6brz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Column to Search"},{"isRequired":false,"widgetName":"search_col_input","rightColumn":63,"widgetId":"bnro1si5sz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false},{"resetFormOnClick":false,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{generate_sql_app.run(() => showAlert('Page Created!','success'), () => {})}}","isDefaultClickDisabled":true,"widgetId":"n6220hgzzs","buttonStyle":"PRIMARY_BUTTON","topRow":31,"bottomRow":35,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Generate"}]},{"tabId":"tab2","tabName":"GSheet","rightColumn":634,"widgetName":"Canvas3","detachFromLayout":true,"widgetId":"neexe4fljs","topRow":0,"bottomRow":400,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text8","rightColumn":16,"textAlign":"RIGHT","widgetId":"3ghywz6tk6","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"DataSource URL"},{"isRequired":false,"widgetName":"gsheet_ds_input","rightColumn":62,"widgetId":"a8kpjqdp59","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text9","rightColumn":16,"textAlign":"RIGHT","widgetId":"r6o12im1qd","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"SpreadSheet URL"},{"isRequired":false,"widgetName":"spreadsheet_input","rightColumn":62,"widgetId":"80kk95t99i","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text10","rightColumn":16,"textAlign":"RIGHT","widgetId":"k0ul3uaoph","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Sheet Name"},{"isRequired":false,"widgetName":"sheet_input","rightColumn":62,"widgetId":"a35cwuivq7","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text11","rightColumn":16,"textAlign":"RIGHT","widgetId":"l1r1tfbx6y","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Header Index"},{"isRequired":false,"widgetName":"header_input","rightColumn":62,"widgetId":"jrhp3pwzll","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false},{"widgetName":"Button1","rightColumn":62,"onClick":"{{generate_gsheet_app.run()}}","isDefaultClickDisabled":true,"widgetId":"zzsh2d5rns","buttonStyle":"PRIMARY_BUTTON","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Generate","isDisabled":false}]},{"tabId":"tab7qxuerb9p7","widgetName":"Canvas4","tabName":"Mongo","rightColumn":574.5625,"detachFromLayout":true,"widgetId":"4yqoh4fjmv","containerStyle":"none","topRow":1,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"jalvzswyyk","minHeight":410,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text12","rightColumn":17,"textAlign":"RIGHT","widgetId":"4l1uqhf2au","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"isRequired":false,"widgetName":"mongo_ds_url","rightColumn":61,"widgetId":"r8yvmt103v","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text13","rightColumn":17,"textAlign":"RIGHT","widgetId":"0y3rz6ufib","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Collection Name"},{"isRequired":false,"widgetName":"collection_input","rightColumn":61,"widgetId":"sbe7jfnafu","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text14","rightColumn":17,"textAlign":"RIGHT","widgetId":"s1fhjft9to","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Keys to Fetch"},{"isRequired":false,"widgetName":"fetch_keys_input","rightColumn":61,"widgetId":"74tjl0q7x3","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false},{"widgetName":"Text15","rightColumn":17,"textAlign":"RIGHT","widgetId":"rwi67ouhe1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Key to Search"},{"isRequired":false,"widgetName":"search_keys_input","rightColumn":61,"widgetId":"ie4mp16js1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false},{"widgetName":"Button2","rightColumn":62,"onClick":"{{generate_mongo_app.run()}}","isDefaultClickDisabled":true,"widgetId":"6ui5kmqebf","buttonStyle":"PRIMARY_BUTTON","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Generate","isDisabled":false}]}]}]}}],"isHidden":false},"userPermissions":["read:pages","manage:pages"]},{"publishedPage":{"name":"Mongo","userPermissions":[],"layouts":[{"new":false,"id":"60dafddaee9aa1792c5bf76d","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","order_select.selectedOptionValue","(data_table.pageNo - 1) * data_table.pageSize"],"name":"FindQuery","timeoutInMillisecond":10000,"id":"60db015aee9aa1792c5bf778"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":720,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["_id","col4","col2","col3","col1","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{FindQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns._id.computedValue"}],"leftColumn":0,"primaryColumns":{"appsmith_mongo_escape_id":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow._id})}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"_id","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_id","verticalAlignment":"CENTER"},"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col4})}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col2})}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col3})}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col1})}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{FindQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":1,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{FindQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"widgetName":"new_row_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"widgetId":"aiy9e38won","buttonStyle":"PRIMARY_BUTTON","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Row","isDisabled":false},{"isRequired":false,"widgetName":"key_select","rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","selectionType":"SINGLE_SELECT","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t}\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"1","selectionType":"SINGLE_SELECT","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n  {\n    \"label\": \"ASC\",\n    \"value\": \"1\"\n  },\n  {\n    \"label\": \"DESC\",\n    \"value\": \"-1\"\n  }\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{FindQuery.run()}}","isDefaultClickDisabled":true,"widgetId":"qykn04gnsw","buttonStyle":"SECONDARY_BUTTON","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"size":"MODAL_SMALL","leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"lryg8kw537","buttonStyle":"PRIMARY_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => FindQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"qq02lh7ust","buttonStyle":"DANGER_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}]},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"size":"MODAL_LARGE","leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":520,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => FindQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"h8vxf3oh4s","buttonStyle":"PRIMARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"widgetId":"o23gs26wm5","buttonStyle":"SECONDARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}]},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow._id}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => FindQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"4gnygu5jew","buttonStyle":"PRIMARY_BUTTON","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"twwgpz5wfu","buttonStyle":"SECONDARY_BUTTON","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row ID: {{data_table.selectedRow._id}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1 :"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2 :"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3 :"},{"widgetName":"Text20","rightColumn":19,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4 :"}]}]}]}}],"isHidden":false},"new":true,"unpublishedPage":{"name":"Mongo","userPermissions":[],"layouts":[{"new":false,"id":"60dafddaee9aa1792c5bf76d","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","order_select.selectedOptionValue","(data_table.pageNo - 1) * data_table.pageSize"],"name":"FindQuery","timeoutInMillisecond":10000,"id":"60db015aee9aa1792c5bf778"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":26,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":720,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["_id","col4","col2","col3","col1","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{FindQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns._id.computedValue"}],"leftColumn":0,"primaryColumns":{"appsmith_mongo_escape_id":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow._id})}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"_id","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_id","verticalAlignment":"CENTER"},"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col4})}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col2})}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col3})}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => { return currentRow.col1})}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{FindQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":1,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{FindQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"widgetName":"new_row_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"widgetId":"aiy9e38won","buttonStyle":"PRIMARY_BUTTON","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Row","isDisabled":false},{"isRequired":false,"widgetName":"key_select","rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","selectionType":"SINGLE_SELECT","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t}\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"1","selectionType":"SINGLE_SELECT","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n  {\n    \"label\": \"ASC\",\n    \"value\": \"1\"\n  },\n  {\n    \"label\": \"DESC\",\n    \"value\": \"-1\"\n  }\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{FindQuery.run()}}","isDefaultClickDisabled":true,"widgetId":"qykn04gnsw","buttonStyle":"SECONDARY_BUTTON","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"size":"MODAL_SMALL","leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"lryg8kw537","buttonStyle":"PRIMARY_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => FindQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"qq02lh7ust","buttonStyle":"DANGER_BUTTON","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}]},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":1,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"size":"MODAL_LARGE","leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":520,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => FindQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"widgetId":"h8vxf3oh4s","buttonStyle":"PRIMARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"widgetId":"o23gs26wm5","buttonStyle":"SECONDARY_BUTTON","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}]},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow._id}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => FindQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"4gnygu5jew","buttonStyle":"PRIMARY_BUTTON","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"widgetId":"twwgpz5wfu","buttonStyle":"SECONDARY_BUTTON","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row ID: {{data_table.selectedRow._id}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1 :"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2 :"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3 :"},{"widgetName":"Text20","rightColumn":19,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4 :"}]}]}]}}],"isHidden":false},"userPermissions":["read:pages","manage:pages"]}],"publishedLayoutmongoEscapedWidgets":{"60dafddaee9aa1792c5bf76d":["data_table"]},"exportedApplication":{"new":true,"color":"#6C9DD0","name":"CRUD App Templates","appIsExample":false,"icon":"bus","isPublic":false,"userPermissions":["canComment:applications","manage:applications","export:applications","read:applications","publish:applications","makePublic:applications"]},"publishedDefaultPageName":"SQL"}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/main/resources/email/commentAddedTemplate.html b/app/server/appsmith-server/src/main/resources/email/commentAddedTemplate.html
new file mode 100644
index 0000000000..d7703c3c5f
--- /dev/null
+++ b/app/server/appsmith-server/src/main/resources/email/commentAddedTemplate.html
@@ -0,0 +1,268 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html data-editor-version="2" class="sg-campaigns" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
+	<!--[if !mso]><!-->
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge">
+	<!--<![endif]-->
+	<!--[if (gte mso 9)|(IE)]>
+	<xml>
+		<o:OfficeDocumentSettings>
+			<o:AllowPNG/>
+			<o:PixelsPerInch>96</o:PixelsPerInch>
+		</o:OfficeDocumentSettings>
+	</xml>
+	<![endif]-->
+	<!--[if (gte mso 9)|(IE)]>
+	<style type="text/css">
+        body {
+            width: 600px;
+            margin: 0 auto;
+        }
+
+        table {
+            border-collapse: collapse;
+        }
+
+        table, td {
+            mso-table-lspace: 0pt;
+            mso-table-rspace: 0pt;
+        }
+
+        img {
+            -ms-interpolation-mode: bicubic;
+        }
+    </style>
+	<![endif]-->
+	<style type="text/css">
+        body, p, div {
+            font-family: arial, helvetica, sans-serif;
+            font-size: 14px;
+        }
+
+        body {
+            color: #000000;
+        }
+
+        body a {
+            color: #1188E6;
+            text-decoration: none;
+        }
+
+        p {
+            margin: 0;
+            padding: 0;
+        }
+
+        table.wrapper {
+            width: 100% !important;
+            table-layout: fixed;
+            -webkit-font-smoothing: antialiased;
+            -webkit-text-size-adjust: 100%;
+            -moz-text-size-adjust: 100%;
+            -ms-text-size-adjust: 100%;
+        }
+
+        img.max-width {
+            max-width: 100% !important;
+        }
+
+        .column.of-2 {
+            width: 50%;
+        }
+
+        .column.of-3 {
+            width: 33.333%;
+        }
+
+        .column.of-4 {
+            width: 25%;
+        }
+
+        @media screen and (max-width: 480px) {
+            .preheader .rightColumnContent,
+            .footer .rightColumnContent {
+                text-align: left !important;
+            }
+
+            .preheader .rightColumnContent div,
+            .preheader .rightColumnContent span,
+            .footer .rightColumnContent div,
+            .footer .rightColumnContent span {
+                text-align: left !important;
+            }
+
+            .preheader .rightColumnContent,
+            .preheader .leftColumnContent {
+                font-size: 80% !important;
+                padding: 5px 0;
+            }
+
+            table.wrapper-mobile {
+                width: 100% !important;
+                table-layout: fixed;
+            }
+
+            img.max-width {
+                height: auto !important;
+                max-width: 100% !important;
+            }
+
+            a.bulletproof-button {
+                display: block !important;
+                width: auto !important;
+                font-size: 80%;
+                padding-left: 0 !important;
+                padding-right: 0 !important;
+            }
+
+            .columns {
+                width: 100% !important;
+            }
+
+            .column {
+                display: block !important;
+                width: 100% !important;
+                padding-left: 0 !important;
+                padding-right: 0 !important;
+                margin-left: 0 !important;
+                margin-right: 0 !important;
+            }
+        }
+    </style>
+	<!--user entered Head Start--><!--End Head user entered-->
+</head>
+<body>
+<center class="wrapper" data-link-color="#1188E6"
+		data-body-style="font-size:14px; font-family:arial,helvetica,sans-serif; color:#000000; background-color:#FFFFFF;">
+	<div class="webkit">
+		<table cellpadding="0" cellspacing="0" border="0" width="100%" class="wrapper" bgcolor="#FFFFFF">
+			<tbody>
+			<tr>
+				<td valign="top" bgcolor="#FFFFFF" width="100%">
+					<table width="100%" role="content-container" class="outer" align="center" cellpadding="0"
+						   cellspacing="0" border="0">
+						<tbody>
+						<tr>
+							<td width="100%">
+								<table width="100%" cellpadding="0" cellspacing="0" border="0">
+									<tbody>
+									<tr>
+										<td>
+											<!--[if mso]>
+											<center>
+												<table>
+													<tr>
+														<td width="600">
+											<![endif]-->
+											<table width="100%" cellpadding="0" cellspacing="0" border="0"
+												   style="width:100%; max-width:600px;" align="center">
+												<tbody>
+												<tr>
+													<td role="modules-container"
+														style="padding:0px 0px 0px 0px; color:#000000; text-align:left;"
+														bgcolor="#ffffff" width="100%" align="left">
+														<table class="module preheader preheader-hide" role="module"
+															   data-type="preheader" border="0" cellpadding="0"
+															   cellspacing="0" width="100%"
+															   style="display: none !important; mso-hide: all; visibility: hidden; opacity: 0; color: transparent; height: 0; width: 0;">
+															<tbody>
+															<tr>
+																<td role="module-content">
+																	<p></p>
+																</td>
+															</tr>
+															</tbody>
+														</table>
+														<table class="wrapper" role="module" data-type="image"
+															   border="0" cellpadding="0" cellspacing="0" width="100%"
+															   style="table-layout: fixed;">
+															<tbody>
+															<tr>
+																<td style="font-size:6px; line-height:10px; padding-top:36px;"
+																	valign="top" align="center">
+																	<a href="https://www.appsmith.com/">
+																		<img width="50px" src="https://s3.us-east-2.amazonaws.com/assets.appsmith.com/email/appsmith_logo_20x20.png" />
+																	</a>
+																</td>
+															</tr>
+															</tbody>
+														</table>
+														<table class="module" role="module" data-type="text" border="0"
+															   cellpadding="0" cellspacing="0" width="100%"
+															   style="table-layout: fixed;">
+															<tbody>
+															<tr>
+																<td style="padding:0px 0px 18px 0px; line-height:22px; text-align:center; background-color:#ffffff;"
+																	height="100%" valign="top" bgcolor="#ffffff"
+																	role="module-content">
+																	<div style="margin-top:37px;font-size:25px;line-height: 35px;">
+																		<b>{{Commenter_Name}}</b>,
+																		{{#NewComment}} added {{/NewComment}}
+																		{{#Resolved}} resolved {{/Resolved}}
+																		{{#Replied}} replied to {{/Replied}}
+																		{{#Mentioned}} mentioned you in {{/Mentioned}}
+																		{{#Resolved}} a comment thread {{/Resolved}}
+																		{{^Resolved}} a comment on {{/Resolved}}
+																		<br><b>{{Organization_Name}}, {{Application_Name}}</b>:
+																	</div>
+																	{{#Comment_Body}}
+																	<div style="display:inline-block;padding:10px;margin-top: 40px; color: #5c5959;background-color:#F0F0F0">
+																		{{ . }}
+																	</div>
+																	{{/Comment_Body}}
+																	<div style="margin-top:40px">
+																		<a href="{{commentUrl}}"
+																		   style="background-color:#ff6d2d; border:1px solid #ff6d2d; border-color:#ff6d2d; border-width:1px; color:#ffffff; display:inline-block; font-weight:400; letter-spacing:0px; line-height:6px; padding:12px 18px 12px 18px; text-align:center; text-decoration:none; border-style:solid; font-family:tahoma,geneva,sans-serif; font-size:16px;"
+																		   target="_blank">VIEW THE COMMENT</a>
+																	</div>
+<!--																	<div style="margin-top:23px">You can answer by replying to this email.</div>-->
+																	<hr style="margin-top:40px;margin-bottom:40px;height:0px;border:0; border-top: 1px solid #E0DEDE;" />
+<!--																	<div><a href="unsubscribe_link_here" style="text-decoration:underline">Turn off comment notifications for this project</a></div>-->
+																	<div style="font-size:12px;line-height:19px;color:#A9A7A7;margin-top:17px">
+																		Appsmith is an open source framework to build admin panels, CRUD apps and workflows. Build everything you need, 10x faster.
+																	</div>
+																	<div style="margin-top:32px">
+																		<a href="https://www.youtube.com/appsmith" style="text-decoration:none">
+																			<img width="20px" src="https://s3.us-east-2.amazonaws.com/assets.appsmith.com/email/ic_youtube.png" /></a>
+																		<a href="https://twitter.com/theappsmith" style="margin-left:25px;margin-right:25px;text-decoration:none">
+																			<img width="20px" src="https://s3.us-east-2.amazonaws.com/assets.appsmith.com/email/ic_twitter.png" /></a>
+																		<a href="https://www.linkedin.com/company/appsmith" style="text-decoration:none">
+																			<img width="20px" src="https://s3.us-east-2.amazonaws.com/assets.appsmith.com/email/ic_linkedin.png" /></a>
+																	</div>
+																	<div style="font-size:12px;line-height:19px;color:#A9A7A7;margin-top:42px">
+																		2261 Market Street #4147, United States, San Francisco, California, 94114, US
+																	</div>
+																</td>
+															</tr>
+															</tbody>
+														</table>
+													</td>
+												</tr>
+												</tbody>
+											</table>
+											<!--[if mso]>
+											</td>
+											</tr>
+											</table>
+											</center>
+											<![endif]-->
+										</td>
+									</tr>
+									</tbody>
+								</table>
+							</td>
+						</tr>
+						</tbody>
+					</table>
+				</td>
+			</tr>
+			</tbody>
+		</table>
+	</div>
+</center>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/CollectionUtilsTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/CollectionUtilsTest.java
new file mode 100644
index 0000000000..e3c48b4f20
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/CollectionUtilsTest.java
@@ -0,0 +1,83 @@
+package com.appsmith.server.helpers;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CollectionUtilsTest {
+
+    @Test
+    public void testPutAtFirstWhenItemDoesNotExist() {
+        List<String> sampleList = new ArrayList<>(3);
+        sampleList.add("a");
+        sampleList.add("b");
+        sampleList.add("c");
+        CollectionUtils.putAtFirst(sampleList, "d");
+        Assert.assertEquals(4, sampleList.size());
+        Assert.assertArrayEquals(new String[]{ "d", "a", "b", "c" }, sampleList.toArray());
+    }
+
+    @Test
+    public void testPutAtFirstWhenItemAlreadyAtFirst() {
+        List<String> sampleList = new ArrayList<>(3);
+        sampleList.add("a");
+        sampleList.add("b");
+        sampleList.add("c");
+        CollectionUtils.putAtFirst(sampleList, "a");
+        Assert.assertEquals(3, sampleList.size());
+        Assert.assertArrayEquals(new String[]{ "a", "b", "c" }, sampleList.toArray());
+    }
+
+    @Test
+    public void testPutAtFirstWhenItemExistsButNotAtFirst() {
+        List<String> sampleList = new ArrayList<>(3);
+        sampleList.add("a");
+        sampleList.add("b");
+        sampleList.add("c");
+        CollectionUtils.putAtFirst(sampleList, "b");
+        Assert.assertEquals(3, sampleList.size());
+        Assert.assertArrayEquals(new String[]{ "b", "a", "c" }, sampleList.toArray());
+    }
+
+    @Test
+    public void testRemoveDuplicatesWhenThereAreDuplicates() {
+        List<String> sampleList = new ArrayList<>(4);
+        sampleList.add("a");
+        sampleList.add("b");
+        sampleList.add("c");
+        sampleList.add("c");
+
+        CollectionUtils.removeDuplicates(sampleList);
+        Assert.assertEquals(3, sampleList.size());
+        Assert.assertArrayEquals(new String[]{ "a", "b", "c" }, sampleList.toArray());
+    }
+
+    @Test
+    public void testRemoveDuplicatesWhenThereAreNoDuplicates() {
+        List<String> sampleList = new ArrayList<>(4);
+        sampleList.add("a");
+        sampleList.add("b");
+        sampleList.add("c");
+
+        CollectionUtils.removeDuplicates(sampleList);
+        Assert.assertEquals(3, sampleList.size());
+        Assert.assertArrayEquals(new String[]{ "a", "b", "c" }, sampleList.toArray());
+    }
+
+    @Test
+    public void testRemoveDuplicatesWhenThereAreMulipleDuplicates() {
+        List<String> sampleList = new ArrayList<>(5);
+        sampleList.add("a");
+        sampleList.add("b");
+        sampleList.add("c");
+        sampleList.add("c");
+        sampleList.add("b");
+
+        CollectionUtils.removeDuplicates(sampleList);
+        Assert.assertEquals(3, sampleList.size());
+        Assert.assertArrayEquals(new String[]{ "a", "b", "c" }, sampleList.toArray());
+    }
+
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/CommentUtilsTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/CommentUtilsTest.java
new file mode 100644
index 0000000000..42d89f99f8
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/CommentUtilsTest.java
@@ -0,0 +1,123 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.domains.Comment;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CommentUtilsTest {
+    @Test
+    void getCommentBody_WhenBodyIsNull_ReturnsEmptyList() {
+        Comment comment = new Comment();
+        Assert.assertEquals(0, CommentUtils.getCommentBody(comment).size());
+    }
+
+    @Test
+    void getCommentBody_WhenBodyHasMultipleBlocks_ReturnsValidBodies() {
+        Comment.Block commentBlock1 = new Comment.Block();
+        commentBlock1.setText("First line");
+        Comment.Block commentBlock2 = new Comment.Block();
+        commentBlock1.setText("Second line");
+
+        Comment.Body commentBody = new Comment.Body();
+        commentBody.setBlocks(List.of(commentBlock1, commentBlock2));
+
+        Comment comment = new Comment();
+        comment.setBody(commentBody);
+
+        assertThat(CommentUtils.getCommentBody(comment).size()).isEqualTo(2);
+        assertThat(CommentUtils.getCommentBody(comment).get(0)).isEqualTo(commentBlock1.getText());
+        assertThat(CommentUtils.getCommentBody(comment).get(1)).isEqualTo(commentBlock2.getText());
+    }
+
+    @Test
+    public void isUserMentioned_WhenBodyIsNull_ReturnsFalse() {
+        Comment comment = new Comment();
+        Assert.assertFalse(CommentUtils.isUserMentioned(comment, "user@abc.com"));
+    }
+
+    @Test
+    public void isUserMentioned_WhenBodyHasNoMention_ReturnsFalse() {
+        Comment.Body body = new Comment.Body();
+        Comment comment = new Comment();
+        comment.setBody(body);
+        Assert.assertFalse(CommentUtils.isUserMentioned(comment, "user@abc.com"));
+
+        Comment.Entity entity = new Comment.Entity();
+        Map<String, Comment.Entity> entityMap = new HashMap<>();
+        entityMap.put("abc", entity);
+        body.setEntityMap(entityMap);
+        comment.setBody(body);
+        Assert.assertFalse(CommentUtils.isUserMentioned(comment, "user@abc.com"));
+    }
+
+    private Map<String, Comment.Entity> createEntityMapForUsers(List<String> mentionedUserNames) {
+        Map<String, Comment.Entity> entityMap = new HashMap<>();
+        for (String username: mentionedUserNames) {
+            Comment.EntityData.EntityUser entityUser = new Comment.EntityData.EntityUser();
+            entityUser.setUsername(username);
+            Comment.EntityData.Mention mention = new Comment.EntityData.Mention();
+            mention.setUser(entityUser);
+
+            Comment.EntityData entityData = new Comment.EntityData();
+            entityData.setMention(mention);
+
+            Comment.Entity entity = new Comment.Entity();
+            entity.setType("mention");
+            entity.setData(entityData);
+            entityMap.put(username, entity);
+        }
+        return entityMap;
+    }
+
+    @Test
+    public void isUserMentioned_WhenSomeoneIsMentioned_ReturnsCorrectValue() {
+        Map<String, Comment.Entity> entityMap = createEntityMapForUsers(
+                List.of("1", "2", "3")
+        );
+        Comment.Body body = new Comment.Body();
+        body.setEntityMap(entityMap);
+        Comment comment = new Comment();
+        comment.setBody(body);
+
+        Assert.assertTrue(CommentUtils.isUserMentioned(comment, "1"));
+        Assert.assertTrue(CommentUtils.isUserMentioned(comment, "2"));
+        Assert.assertTrue(CommentUtils.isUserMentioned(comment, "3"));
+        Assert.assertFalse(CommentUtils.isUserMentioned(comment, "4"));
+    }
+
+    @Test
+    public void getSubscriberUsernames_WhenNoMention_ContainsAuthorOnly() {
+        Comment comment = new Comment();
+        comment.setAuthorUsername("abc");
+
+        Set<String> subscriberUsernames = CommentUtils.getSubscriberUsernames(comment);
+        assertThat(subscriberUsernames.size()).isEqualTo(1);
+        assertThat(subscriberUsernames).contains("abc");
+    }
+
+    @Test
+    public void getSubscriberUsernames_WhenMentionExists_ContainsAuthorAndMentions() {
+        Map<String, Comment.Entity> entityMap = createEntityMapForUsers(
+                List.of("1", "2", "3")
+        );
+        Comment.Body body = new Comment.Body();
+        body.setEntityMap(entityMap);
+        Comment comment = new Comment();
+        comment.setBody(body);
+        comment.setAuthorUsername("abc");
+
+        Set<String> subscriberUsernames = CommentUtils.getSubscriberUsernames(comment);
+        assertThat(subscriberUsernames.size()).isEqualTo(4);
+        assertThat(subscriberUsernames).contains("abc");
+        assertThat(subscriberUsernames).contains("1");
+        assertThat(subscriberUsernames).contains("2");
+        assertThat(subscriberUsernames).contains("3");
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/NumberUtilsTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/NumberUtilsTest.java
new file mode 100644
index 0000000000..eb0f16ce54
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/NumberUtilsTest.java
@@ -0,0 +1,16 @@
+package com.appsmith.server.helpers;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class NumberUtilsTest {
+    @Test
+    public void parseInteger() {
+        Assert.assertEquals(2, NumberUtils.parseInteger("2", 0, 0));
+        Assert.assertEquals(2, NumberUtils.parseInteger("2", 2, 0));
+        Assert.assertEquals(10, NumberUtils.parseInteger("-2", 0, 10));
+        Assert.assertEquals(123, NumberUtils.parseInteger("abc", 0, 123));
+        Assert.assertEquals(123, NumberUtils.parseInteger("234.44", 0, 123));
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomNotificationRepositoryImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomNotificationRepositoryImplTest.java
new file mode 100644
index 0000000000..49890445ee
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomNotificationRepositoryImplTest.java
@@ -0,0 +1,164 @@
+package com.appsmith.server.repositories;
+
+import com.appsmith.server.domains.Notification;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuple3;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Slf4j
+public class CustomNotificationRepositoryImplTest {
+
+    @Autowired
+    private NotificationRepository notificationRepository;
+
+    @After
+    public void afterTest() {
+        notificationRepository.deleteAll();
+    }
+
+    private Notification createNotification(String forUsername, boolean isRead) {
+        Notification notification = new Notification();
+        notification.setForUsername(forUsername);
+        notification.setIsRead(isRead);
+        return notification;
+    }
+
+    @Test
+    public void updateIsReadByForUsernameAndIdList_WhenUsernameNotMatched_UpdatesNone() {
+        Mono<Notification> saveMono1 = notificationRepository.save(createNotification("abc", false));
+        Mono<Notification> saveMono2 = notificationRepository.save(createNotification("efg", false));
+
+        // create the notifications and then try to update them by different username
+        Mono<Tuple2<Notification, Notification>> tuple2Mono = Mono.zip(saveMono1, saveMono2).flatMap(objects -> {
+            Notification n1 = objects.getT1();
+            Notification n2 = objects.getT2();
+            return notificationRepository.updateIsReadByForUsernameAndIdList(
+                    "123", List.of(n1.getId(), n2.getId()), true
+            ).thenReturn(objects);
+        });
+
+        // now get the notifications we created
+        Mono<List<Notification>> listMono = tuple2Mono.flatMap(objects -> {
+            Notification n1 = objects.getT1();
+            Notification n2 = objects.getT2();
+            return notificationRepository.findAllById(List.of(n1.getId(), n2.getId())).collectList();
+        });
+
+        // check that fetched notifications have isRead=false
+        StepVerifier.create(listMono).assertNext(notifications -> {
+            Assert.assertEquals(2, notifications.size());
+            Assert.assertEquals(false, notifications.get(0).getIsRead());
+            Assert.assertEquals(false, notifications.get(1).getIsRead());
+        }).verifyComplete();
+    }
+
+    @Test
+    public void updateIsReadByForUsernameAndIdList_WhenUsernameMatched_Updated() {
+        Mono<Notification> saveMono1 = notificationRepository.save(createNotification("abc", false));
+        Mono<Notification> saveMono2 = notificationRepository.save(createNotification("abc", false));
+
+        // create the notifications and then try to update them by same username
+        Mono<Tuple2<Notification, Notification>> tuple2Mono = Mono.zip(saveMono1, saveMono2).flatMap(objects -> {
+            Notification n1 = objects.getT1();
+            Notification n2 = objects.getT2();
+            return notificationRepository.updateIsReadByForUsernameAndIdList(
+                    "abc", List.of(n1.getId(), n2.getId()), true
+            ).thenReturn(objects);
+        });
+
+        // now get the notifications we created
+        Mono<List<Notification>> listMono = tuple2Mono.flatMap(objects -> {
+            Notification n1 = objects.getT1();
+            Notification n2 = objects.getT2();
+            return notificationRepository.findAllById(List.of(n1.getId(), n2.getId())).collectList();
+        });
+
+        // check that fetched notifications have isRead=true
+        StepVerifier.create(listMono).assertNext(notifications -> {
+            Assert.assertEquals(2, notifications.size());
+            Assert.assertEquals(true, notifications.get(0).getIsRead());
+            Assert.assertEquals(true, notifications.get(1).getIsRead());
+        }).verifyComplete();
+    }
+
+    @Test
+    public void updateIsReadByForUsernameAndIdList_WhenIdNotMatched_UpdatesNone() {
+        Mono<Notification> saveMono1 = notificationRepository.save(createNotification("abc", false));
+        Mono<Notification> saveMono2 = notificationRepository.save(createNotification("abc", false));
+
+        // create the notifications and then try to update them by different username
+        Mono<Tuple2<Notification, Notification>> tuple2Mono = Mono.zip(saveMono1, saveMono2).flatMap(objects -> {
+            Notification n1 = objects.getT1();
+            Notification n2 = objects.getT2();
+            return notificationRepository.updateIsReadByForUsernameAndIdList(
+                    "abc", List.of("test-id-1", "test-id-2"), true
+            ).thenReturn(objects);
+        });
+
+        // now get the notifications we created
+        Mono<List<Notification>> listMono = tuple2Mono.flatMap(objects -> {
+            Notification n1 = objects.getT1();
+            Notification n2 = objects.getT2();
+            return notificationRepository.findAllById(List.of(n1.getId(), n2.getId())).collectList();
+        });
+
+        // check that fetched notifications have isRead=true
+        StepVerifier.create(listMono).assertNext(notifications -> {
+            Assert.assertEquals(2, notifications.size());
+            Assert.assertEquals(false, notifications.get(0).getIsRead());
+            Assert.assertEquals(false, notifications.get(1).getIsRead());
+        }).verifyComplete();
+    }
+
+    @Test
+    public void updateIsReadByForUsername_WhenForUsernameMatched_UpdatesMatchedOnes() {
+        Mono<Notification> saveMono1 = notificationRepository.save(createNotification("abc", false));
+        Mono<Notification> saveMono2 = notificationRepository.save(createNotification("abc", false));
+        Mono<Notification> saveMono3 = notificationRepository.save(createNotification("efg", false));
+
+        // create the notifications and then try to update them by same username
+        Mono<Tuple3<Notification, Notification, Notification>> tuple2Mono = Mono.zip(
+                saveMono1, saveMono2, saveMono3
+        ).flatMap(objects ->
+            notificationRepository.updateIsReadByForUsername("abc",true).thenReturn(objects)
+        );
+
+        // now get the notifications we created
+        Mono<Map<String, Collection<Notification>>> mapMono = tuple2Mono.flatMap(objects -> {
+            Notification n1 = objects.getT1();
+            Notification n2 = objects.getT2();
+            Notification n3 = objects.getT3();
+            return notificationRepository.findAllById(
+                    List.of(n1.getId(), n2.getId(), n3.getId())
+            ).collectMultimap(Notification::getForUsername);
+        });
+
+        // check that fetched notifications have isRead=true
+        StepVerifier.create(mapMono).assertNext(notificationCollectionMap -> {
+            Assert.assertEquals(2, notificationCollectionMap.size()); // should contain map of two keys
+
+            Notification forEfg = notificationCollectionMap.get("efg").iterator().next();
+            Assert.assertEquals(false, forEfg.getIsRead()); // this should be still unread
+
+            notificationCollectionMap.get("abc").iterator().forEachRemaining(notification -> {
+                Assert.assertEquals(true, notification.getIsRead());
+            });
+        }).verifyComplete();
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomUserDataRepositoryImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomUserDataRepositoryImplTest.java
new file mode 100644
index 0000000000..436218c94c
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomUserDataRepositoryImplTest.java
@@ -0,0 +1,81 @@
+package com.appsmith.server.repositories;
+
+import com.appsmith.server.domains.UserData;
+import com.mongodb.client.result.UpdateResult;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Slf4j
+class CustomUserDataRepositoryImplTest {
+
+    @Autowired
+    private UserDataRepository userDataRepository;
+
+    private Mono<UserData> createUser(String userId, List<String> orgIds) {
+        String sampleUserId = userId;
+        UserData sampleUserData = new UserData();
+        sampleUserData.setUserId(sampleUserId);
+        sampleUserData.setRecentlyUsedOrgIds(List.of("123", "234", "345"));
+        return userDataRepository.save(sampleUserData);
+    }
+
+    @Test
+    void removeOrgFromRecentlyUsedList_WhenOrgIdAlreadyExists_OrgIdRemoved() {
+        // create an user data with 3 org id in the recently used orgid list
+        String sampleUserId = "abcd";
+        Mono<UserData> createUserDataMono = createUser(sampleUserId, List.of("123", "234", "345"));
+
+        // remove the 345 org id from the recently used orgid list
+        Mono<UpdateResult> updateResultMono = createUserDataMono.flatMap(
+                userData -> userDataRepository.removeOrgFromRecentlyUsedList(userData.getUserId(), "345")
+        );
+
+        // read the userdata
+        Mono<UserData> readUserDataMono = userDataRepository.findByUserId(sampleUserId);
+
+        // add the read user data mono after the update mono
+        Mono<UserData> userDataAfterUpdateMono = updateResultMono.then(readUserDataMono);
+
+        StepVerifier.create(userDataAfterUpdateMono).assertNext(userData -> {
+            Assert.assertEquals(2, userData.getRecentlyUsedOrgIds().size());
+            Assert.assertArrayEquals(List.of("123", "234").toArray(), userData.getRecentlyUsedOrgIds().toArray());
+        }).verifyComplete();
+    }
+
+    @Test
+    void removeOrgFromRecentlyUsedList_WhenOrgIdDoesNotExist_NothingRemoved() {
+        // create an user data with 3 org id in the recently used orgid list
+        String sampleUserId = "efgh";
+        Mono<UserData> createUserDataMono = createUser(sampleUserId, List.of("123", "234", "345"));
+
+        // remove the 345 org id from the recently used orgid list
+        Mono<UpdateResult> updateResultMono = createUserDataMono.flatMap(
+                userData -> userDataRepository.removeOrgFromRecentlyUsedList(userData.getUserId(), "678")
+        );
+
+        // read the userdata
+        Mono<UserData> readUserDataMono = userDataRepository.findByUserId(sampleUserId);
+
+        // add the read user data mono after the update mono
+        Mono<UserData> userDataAfterUpdateMono = updateResultMono.then(readUserDataMono);
+
+        StepVerifier.create(userDataAfterUpdateMono).assertNext(userData -> {
+            Assert.assertEquals(3, userData.getRecentlyUsedOrgIds().size());
+            Assert.assertArrayEquals(List.of("123", "234", "345").toArray(), userData.getRecentlyUsedOrgIds().toArray());
+        }).verifyComplete();
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/OrganizationRepositoryTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/OrganizationRepositoryTest.java
new file mode 100644
index 0000000000..b36cb6edbd
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/OrganizationRepositoryTest.java
@@ -0,0 +1,83 @@
+package com.appsmith.server.repositories;
+
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.UserRole;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+import reactor.util.function.Tuple2;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Slf4j
+@DirtiesContext
+class OrganizationRepositoryTest {
+
+    @Autowired
+    private OrganizationRepository organizationRepository;
+
+    @Test
+    void updateUserRoleNames_WhenUserIdMatched_AllOrgsUpdated() {
+        String oldUserName = "Old name",
+                newUserName = "New name",
+                userId = "user1";
+        UserRole userRole = new UserRole();
+        userRole.setName(oldUserName);
+        userRole.setUserId(userId);
+
+        List<UserRole> userRoles = new ArrayList<>();
+        userRoles.add(userRole);
+
+        Organization org1 = new Organization();
+        org1.setId(UUID.randomUUID().toString());
+        org1.setSlug(org1.getId());
+        org1.setUserRoles(userRoles);
+
+        Organization org2 = new Organization();
+        org2.setId(UUID.randomUUID().toString());
+        org2.setSlug(org2.getId());
+        org2.setUserRoles(userRoles);
+
+        // create two orgs
+        Mono<Tuple2<Organization, Organization>> aveOrgsMonoZip = Mono.zip(
+                organizationRepository.save(org1), organizationRepository.save(org2)
+        );
+
+        Mono<Tuple2<Organization, Organization>> updatedOrgTupleMono = aveOrgsMonoZip.flatMap(objects -> {
+            // update the user names
+            return organizationRepository.updateUserRoleNames(userId, newUserName).thenReturn(objects);
+        }).flatMap(organizationTuple2 -> {
+            // fetch the two orgs again
+            Mono<Organization> updatedOrg1Mono = organizationRepository.findBySlug(org1.getId());
+            Mono<Organization> updatedOrg2Mono = organizationRepository.findBySlug(org2.getId());
+            return Mono.zip(updatedOrg1Mono, updatedOrg2Mono);
+        });
+
+        StepVerifier.create(updatedOrgTupleMono).assertNext(orgTuple -> {
+            Organization o1 = orgTuple.getT1();
+            Assert.assertEquals(1, o1.getUserRoles().size());
+            UserRole userRole1 = o1.getUserRoles().get(0);
+            Assert.assertEquals(userId, userRole1.getUserId());
+            Assert.assertEquals(newUserName, userRole1.getName());
+
+            Organization o2 = orgTuple.getT2();
+            Assert.assertEquals(1, o2.getUserRoles().size());
+            UserRole userRole2 = o2.getUserRoles().get(0);
+            Assert.assertEquals(userId, userRole2.getUserId());
+            Assert.assertEquals(newUserName, userRole2.getName());
+        }).verifyComplete();
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/UserRepositoryTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/UserRepositoryTest.java
new file mode 100644
index 0000000000..2647961214
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/UserRepositoryTest.java
@@ -0,0 +1,112 @@
+package com.appsmith.server.repositories;
+
+import com.appsmith.server.domains.User;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Slf4j
+@DirtiesContext
+class UserRepositoryTest {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    private List<User> savedUsers = new ArrayList<>();
+
+    @BeforeEach
+    public void setUp() {
+        this.savedUsers.clear();
+    }
+
+    @AfterEach
+    public void cleanUp() {
+        for(User savedUser : savedUsers) {
+            userRepository.deleteById(savedUser.getId()).block();
+        }
+    }
+
+    @Test
+    void findByCaseInsensitiveEmail_WhenCaseIsSame_ReturnsResult() {
+        User user = new User();
+        user.setEmail("rafiqnayan@gmail.com");
+        User savedUser = userRepository.save(user).block();
+        savedUsers.add(savedUser);
+
+        Mono<User> findUserMono = userRepository.findByCaseInsensitiveEmail("rafiqnayan@gmail.com");
+
+        StepVerifier.create(findUserMono).assertNext(u -> {
+            assertEquals(savedUser.getEmail(), u.getEmail());
+        }).verifyComplete();
+    }
+
+    @Test
+    void findByCaseInsensitiveEmail_WhenCaseIsDifferent_ReturnsResult() {
+        User user = new User();
+        user.setEmail("rafiqNAYAN@gmail.com");
+        User savedUser = userRepository.save(user).block();
+        savedUsers.add(savedUser);
+
+        Mono<User> findUserByEmailMono = userRepository.findByCaseInsensitiveEmail("rafiqnayan@gmail.com");
+
+        StepVerifier.create(findUserByEmailMono).assertNext(u -> {
+            assertEquals(savedUser.getEmail(), u.getEmail());
+        }).verifyComplete();
+    }
+
+    @Test
+    void findByCaseInsensitiveEmail_WhenMultipleMatches_ReturnsResult() {
+        User user1 = new User();
+        user1.setEmail("rafiqNAYAN@gmail.com");
+        User savedUser1 = userRepository.save(user1).block();
+        savedUsers.add(savedUser1);
+
+        User user2 = new User();
+        user2.setEmail("RAFIQNAYAN@gmail.com");
+        User savedUser2 = userRepository.save(user2).block();
+        savedUsers.add(savedUser2);
+
+        Mono<User> findUserByEmailMono = userRepository.findByCaseInsensitiveEmail("rafiqnayan@gmail.com");
+
+        StepVerifier.create(findUserByEmailMono).assertNext(u -> {
+            assertEquals(savedUser2.getEmail(), u.getEmail());
+        }).verifyComplete();
+    }
+
+    @Test
+    void findByCaseInsensitiveEmail_WhenNoMatch_ReturnsNone() {
+        User user = new User();
+        user.setEmail("rafiqnayan@gmail.com");
+        User savedUser = userRepository.save(user).block();
+        savedUsers.add(savedUser);
+
+        Mono<User> getByEmailMono = userRepository.findByCaseInsensitiveEmail("nayan@gmail.com");
+        StepVerifier.create(getByEmailMono).verifyComplete();
+
+        Mono<User> getByEmailMono2 = userRepository.findByCaseInsensitiveEmail("rafiqnayan@gmail.co");
+        StepVerifier.create(getByEmailMono2).verifyComplete();
+
+        Mono<User> getByEmailMono3 = userRepository.findByCaseInsensitiveEmail("rafiq.nayan@gmail.com");
+        StepVerifier.create(getByEmailMono3).verifyComplete();
+
+        Mono<User> getByEmailMono4 = userRepository.findByCaseInsensitiveEmail("rafiq.ayan@gmail.com");
+        StepVerifier.create(getByEmailMono4).verifyComplete();
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java
index 5b51d262b4..a8a03cb57e 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java
@@ -15,6 +15,7 @@ import com.appsmith.external.models.PaginationType;
 import com.appsmith.external.models.ParsedDataType;
 import com.appsmith.external.models.Policy;
 import com.appsmith.external.models.Property;
+import com.appsmith.external.models.WidgetType;
 import com.appsmith.external.plugins.PluginExecutor;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.constants.FieldName;
@@ -36,7 +37,10 @@ import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.repositories.OrganizationRepository;
 import com.appsmith.server.repositories.PluginRepository;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
@@ -439,6 +443,9 @@ public class ActionServiceTest {
         mockResult.setBody("response-body");
         mockResult.setStatusCode("200");
         mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.TEXT_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
 
         ActionDTO action = new ActionDTO();
         ActionConfiguration actionConfiguration = new ActionConfiguration();
@@ -468,6 +475,9 @@ public class ActionServiceTest {
         mockResult.setBody("response-body");
         mockResult.setStatusCode("200");
         mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.TEXT_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
 
         ActionDTO action = new ActionDTO();
         ActionConfiguration actionConfiguration = new ActionConfiguration();
@@ -494,6 +504,9 @@ public class ActionServiceTest {
         ActionExecutionResult mockResult = new ActionExecutionResult();
         mockResult.setIsExecutionSuccess(true);
         mockResult.setBody("response-body");
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.TEXT_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
 
         ActionDTO action = new ActionDTO();
         ActionConfiguration actionConfiguration = new ActionConfiguration();
@@ -785,6 +798,7 @@ public class ActionServiceTest {
     private void executeAndAssertAction(ExecuteActionDTO executeActionDTO, ActionConfiguration actionConfiguration,
                                         ActionExecutionResult mockResult, List<ParsedDataType> expectedReturnDataTypes) {
 
+        List<WidgetType> expectedWidget = mockResult.getSuggestedWidgets();
         Mono<ActionExecutionResult> actionExecutionResultMono = executeAction(executeActionDTO, actionConfiguration, mockResult);
 
         StepVerifier.create(actionExecutionResultMono)
@@ -792,6 +806,9 @@ public class ActionServiceTest {
                     assertThat(result).isNotNull();
                     assertThat(result.getBody()).isEqualTo(mockResult.getBody());
                     assertThat(result.getDataTypes().toString()).isEqualTo(expectedReturnDataTypes.toString());
+                    assertThat(result.getSuggestedWidgets().size()).isEqualTo(expectedWidget.size());
+                    assertThat(result.getSuggestedWidgets().containsAll(expectedWidget)).isTrue();
+                    assertThat(expectedWidget.containsAll(result.getSuggestedWidgets())).isTrue();
                 })
                 .verifyComplete();
     }
@@ -1212,6 +1229,9 @@ public class ActionServiceTest {
                 "]");
         mockResult.setStatusCode("200");
         mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.TEXT_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
 
         ActionDTO action = new ActionDTO();
         ActionConfiguration actionConfiguration = new ActionConfiguration();
@@ -1251,6 +1271,9 @@ public class ActionServiceTest {
                 " }");
         mockResult.setStatusCode("200");
         mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.TEXT_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
 
         ActionDTO action = new ActionDTO();
         ActionConfiguration actionConfiguration = new ActionConfiguration();
@@ -1290,6 +1313,9 @@ public class ActionServiceTest {
         mockResult.setStatusCode("200");
         mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
         mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.TEXT_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
 
         ActionDTO action = new ActionDTO();
         ActionConfiguration actionConfiguration = new ActionConfiguration();
@@ -1320,6 +1346,9 @@ public class ActionServiceTest {
         mockResult.setBody(null);
         mockResult.setStatusCode("200");
         mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.TEXT_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
 
         ActionDTO action = new ActionDTO();
         ActionConfiguration actionConfiguration = new ActionConfiguration();
@@ -1338,4 +1367,501 @@ public class ActionServiceTest {
 
         executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult, new ArrayList<>());
     }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testWidgetSuggestionAfterExecutionWithChartWidgetData() throws JsonProcessingException {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+        ActionExecutionResult mockResult = new ActionExecutionResult();
+        final String data = "{ \"data\": [\n" +
+                "  {\n" +
+                "    \"x\": \"Mon\",\n" +
+                "    \"y\": 10000\n" +
+                "  },\n" +
+                "  {\n" +
+                "    \"x\": \"Tue\",\n" +
+                "    \"y\": 12000\n" +
+                "  },\n" +
+                "  {\n" +
+                "    \"x\": \"Wed\",\n" +
+                "    \"y\": 32000\n" +
+                "  },\n" +
+                "  {\n" +
+                "    \"x\": \"Thu\",\n" +
+                "    \"y\": 28000\n" +
+                "  },\n" +
+                "  {\n" +
+                "    \"x\": \"Fri\",\n" +
+                "    \"y\": 14000\n" +
+                "  },\n" +
+                "  {\n" +
+                "    \"x\": \"Sat\",\n" +
+                "    \"y\": 19000\n" +
+                "  },\n" +
+                "  {\n" +
+                "    \"x\": \"Sun\",\n" +
+                "    \"y\": 36000\n" +
+                "  }\n" +
+                "]}";
+        final JsonNode arrNode = new ObjectMapper().readTree(data).get("data");;
+
+        mockResult.setIsExecutionSuccess(true);
+        mockResult.setBody(arrNode);
+        mockResult.setStatusCode("200");
+        mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.CHART_WIDGET);
+        widgetTypeList.add(WidgetType.LIST_WIDGET);
+        widgetTypeList.add(WidgetType.TABLE_WIDGET);
+        widgetTypeList.add(WidgetType.DROP_DOWN_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
+
+        ActionDTO action = new ActionDTO();
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setHttpMethod(HttpMethod.POST);
+        actionConfiguration.setBody("random-request-body");
+        actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+        action.setActionConfiguration(actionConfiguration);
+        action.setPageId(testPage.getId());
+        action.setName("testActionExecute");
+        action.setDatasource(datasource);
+        ActionDTO createdAction = layoutActionService.createAction(action).block();
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        executeActionDTO.setActionId(createdAction.getId());
+        executeActionDTO.setViewMode(false);
+
+        executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+                List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testWidgetSuggestionAfterExecutionWithTableWidgetData() throws JsonProcessingException {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+        ActionExecutionResult mockResult = new ActionExecutionResult();
+        final String data = "{ \"data\": [\n" +
+                "\t{\n" +
+                "\t\t\"id\": \"0001\",\n" +
+                "\t\t\"type\": \"donut\",\n" +
+                "\t\t\"name\": \"Cake\",\n" +
+                "\t\t\"ppu\": 0.55,\n" +
+                "\t\t\"batters\":\n" +
+                "\t\t\t{\n" +
+                "\t\t\t\t\"batter\":\n" +
+                "\t\t\t\t\t[\n" +
+                "\t\t\t\t\t\t{ \"id\": \"1001\", \"type\": \"Regular\" },\n" +
+                "\t\t\t\t\t\t{ \"id\": \"1002\", \"type\": \"Chocolate\" },\n" +
+                "\t\t\t\t\t\t{ \"id\": \"1003\", \"type\": \"Blueberry\" },\n" +
+                "\t\t\t\t\t\t{ \"id\": \"1004\", \"type\": \"Devil's Food\" }\n" +
+                "\t\t\t\t\t]\n" +
+                "\t\t\t},\n" +
+                "\t\t\"topping\":\n" +
+                "\t\t\t[\n" +
+                "\t\t\t\t{ \"id\": \"5001\", \"type\": \"None\" },\n" +
+                "\t\t\t\t{ \"id\": \"5002\", \"type\": \"Glazed\" },\n" +
+                "\t\t\t\t{ \"id\": \"5005\", \"type\": \"Sugar\" },\n" +
+                "\t\t\t\t{ \"id\": \"5007\", \"type\": \"Powdered Sugar\" },\n" +
+                "\t\t\t\t{ \"id\": \"5006\", \"type\": \"Chocolate with Sprinkles\" },\n" +
+                "\t\t\t\t{ \"id\": \"5003\", \"type\": \"Chocolate\" },\n" +
+                "\t\t\t\t{ \"id\": \"5004\", \"type\": \"Maple\" }\n" +
+                "\t\t\t]\n" +
+                "\t},\n" +
+                "\t{\n" +
+                "\t\t\"id\": \"0002\",\n" +
+                "\t\t\"type\": \"donut\",\n" +
+                "\t\t\"name\": \"Raised\",\n" +
+                "\t\t\"ppu\": 0.55,\n" +
+                "\t\t\"batters\":\n" +
+                "\t\t\t{\n" +
+                "\t\t\t\t\"batter\":\n" +
+                "\t\t\t\t\t[\n" +
+                "\t\t\t\t\t\t{ \"id\": \"1001\", \"type\": \"Regular\" }\n" +
+                "\t\t\t\t\t]\n" +
+                "\t\t\t},\n" +
+                "\t\t\"topping\":\n" +
+                "\t\t\t[\n" +
+                "\t\t\t\t{ \"id\": \"5001\", \"type\": \"None\" },\n" +
+                "\t\t\t\t{ \"id\": \"5002\", \"type\": \"Glazed\" },\n" +
+                "\t\t\t\t{ \"id\": \"5005\", \"type\": \"Sugar\" },\n" +
+                "\t\t\t\t{ \"id\": \"5003\", \"type\": \"Chocolate\" },\n" +
+                "\t\t\t\t{ \"id\": \"5004\", \"type\": \"Maple\" }\n" +
+                "\t\t\t]\n" +
+                "\t},\n" +
+                "\t{\n" +
+                "\t\t\"id\": \"0003\",\n" +
+                "\t\t\"type\": \"donut\",\n" +
+                "\t\t\"name\": \"Old Fashioned\",\n" +
+                "\t\t\"ppu\": 0.55,\n" +
+                "\t\t\"batters\":\n" +
+                "\t\t\t{\n" +
+                "\t\t\t\t\"batter\":\n" +
+                "\t\t\t\t\t[\n" +
+                "\t\t\t\t\t\t{ \"id\": \"1001\", \"type\": \"Regular\" },\n" +
+                "\t\t\t\t\t\t{ \"id\": \"1002\", \"type\": \"Chocolate\" }\n" +
+                "\t\t\t\t\t]\n" +
+                "\t\t\t},\n" +
+                "\t\t\"topping\":\n" +
+                "\t\t\t[\n" +
+                "\t\t\t\t{ \"id\": \"5001\", \"type\": \"None\" },\n" +
+                "\t\t\t\t{ \"id\": \"5002\", \"type\": \"Glazed\" },\n" +
+                "\t\t\t\t{ \"id\": \"5003\", \"type\": \"Chocolate\" },\n" +
+                "\t\t\t\t{ \"id\": \"5004\", \"type\": \"Maple\" }\n" +
+                "\t\t\t]\n" +
+                "\t}\n" +
+                "]}";
+        final JsonNode arrNode = new ObjectMapper().readTree(data).get("data");;
+
+        mockResult.setIsExecutionSuccess(true);
+        mockResult.setBody(arrNode);
+        mockResult.setStatusCode("200");
+        mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.CHART_WIDGET);
+        widgetTypeList.add(WidgetType.LIST_WIDGET);
+        widgetTypeList.add(WidgetType.TABLE_WIDGET);
+        widgetTypeList.add(WidgetType.DROP_DOWN_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
+
+        ActionDTO action = new ActionDTO();
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setHttpMethod(HttpMethod.POST);
+        actionConfiguration.setBody("random-request-body");
+        actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+        action.setActionConfiguration(actionConfiguration);
+        action.setPageId(testPage.getId());
+        action.setName("testActionExecute");
+        action.setDatasource(datasource);
+        ActionDTO createdAction = layoutActionService.createAction(action).block();
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        executeActionDTO.setActionId(createdAction.getId());
+        executeActionDTO.setViewMode(false);
+
+        executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+                List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testWidgetSuggestionAfterExecutionWithListWidgetData() throws JsonProcessingException {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+        ActionExecutionResult mockResult = new ActionExecutionResult();
+        final String data = "{ \"data\": [\n" +
+                "    {\n" +
+                "        \"url\": \"images/thumbnails/0001.jpg\",\n" +
+                "        \"width\": 32,\n" +
+                "        \"height\": 32\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0001.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0002.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0002.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0003.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0004.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0005.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0006.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0007.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0008.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0009.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"url\": \"images/0010.jpg\",\n" +
+                "        \"width\": 200,\n" +
+                "        \"height\": 200\n" +
+                "    }\n" +
+                "]}";
+        final JsonNode arrNode = new ObjectMapper().readTree(data).get("data");;
+
+        mockResult.setIsExecutionSuccess(true);
+        mockResult.setBody(arrNode);
+        mockResult.setStatusCode("200");
+        mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.LIST_WIDGET);
+        widgetTypeList.add(WidgetType.TABLE_WIDGET);
+        widgetTypeList.add(WidgetType.CHART_WIDGET);
+        widgetTypeList.add(WidgetType.DROP_DOWN_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
+
+        ActionDTO action = new ActionDTO();
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setHttpMethod(HttpMethod.POST);
+        actionConfiguration.setBody("random-request-body");
+        actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+        action.setActionConfiguration(actionConfiguration);
+        action.setPageId(testPage.getId());
+        action.setName("testActionExecute");
+        action.setDatasource(datasource);
+        ActionDTO createdAction = layoutActionService.createAction(action).block();
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        executeActionDTO.setActionId(createdAction.getId());
+        executeActionDTO.setViewMode(false);
+
+        executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+                List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testWidgetSuggestionAfterExecutionWithDropdownWidgetData() throws JsonProcessingException {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+        ActionExecutionResult mockResult = new ActionExecutionResult();
+        final String data = "{ \"data\": [\n" +
+                "    {\n" +
+                "     \"CarType\": \"BMW\",\n" +
+                "     \"carID\": \"bmw123\"\n" +
+                "     },\n" +
+                "      {\n" +
+                "     \"CarType\": \"mercedes\",\n" +
+                "     \"carID\": \"merc123\"\n" +
+                "      },\n" +
+                "      {\n" +
+                "     \"CarType\": \"volvo\",\n" +
+                "     \"carID\": \"vol123r\"\n" +
+                "       },\n" +
+                "       {\n" +
+                "     \"CarType\": \"ford\",\n" +
+                "     \"carID\": \"ford123\"\n" +
+                "       }\n" +
+                "  ]}";
+        final JsonNode arrNode = new ObjectMapper().readTree(data).get("data");;
+
+        mockResult.setIsExecutionSuccess(true);
+        mockResult.setBody(arrNode);
+        mockResult.setStatusCode("200");
+        mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.CHART_WIDGET);
+        widgetTypeList.add(WidgetType.LIST_WIDGET);
+        widgetTypeList.add(WidgetType.TABLE_WIDGET);
+        widgetTypeList.add(WidgetType.DROP_DOWN_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
+
+        ActionDTO action = new ActionDTO();
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setHttpMethod(HttpMethod.POST);
+        actionConfiguration.setBody("random-request-body");
+        actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+        action.setActionConfiguration(actionConfiguration);
+        action.setPageId(testPage.getId());
+        action.setName("testActionExecute");
+        action.setDatasource(datasource);
+        ActionDTO createdAction = layoutActionService.createAction(action).block();
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        executeActionDTO.setActionId(createdAction.getId());
+        executeActionDTO.setViewMode(false);
+
+        executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+                List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testWidgetSuggestionAfterExecutionWithArrayOfStringsDropDownWidget() throws JsonProcessingException {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+        ActionExecutionResult mockResult = new ActionExecutionResult();
+        final String data = "{ \"data\":[\"string1\", \"string2\", \"string3\", \"string4\"] }";
+        final JsonNode arrNode = new ObjectMapper().readTree(data).get("data");;
+
+        mockResult.setIsExecutionSuccess(true);
+        mockResult.setBody(arrNode);
+        mockResult.setStatusCode("200");
+        mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.DROP_DOWN_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
+
+        ActionDTO action = new ActionDTO();
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setHttpMethod(HttpMethod.POST);
+        actionConfiguration.setBody("random-request-body");
+        actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+        action.setActionConfiguration(actionConfiguration);
+        action.setPageId(testPage.getId());
+        action.setName("testActionExecute");
+        action.setDatasource(datasource);
+        ActionDTO createdAction = layoutActionService.createAction(action).block();
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        executeActionDTO.setActionId(createdAction.getId());
+        executeActionDTO.setViewMode(false);
+
+        executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+                List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testWidgetSuggestionAfterExecutionWithArrayOfArray() throws JsonProcessingException {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+        ActionExecutionResult mockResult = new ActionExecutionResult();
+        final String data = "{ \"data\":[[\"string1\", \"string2\", \"string3\", \"string4\"]," +
+                "[\"string5\", \"string6\", \"string7\", \"string8\"]," +
+                "[\"string9\", \"string10\", \"string11\", \"string12\"]] }";
+        final JsonNode arrNode = new ObjectMapper().readTree(data).get("data");;
+
+        mockResult.setIsExecutionSuccess(true);
+        mockResult.setBody(arrNode);
+        mockResult.setStatusCode("200");
+        mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.CHART_WIDGET);
+        widgetTypeList.add(WidgetType.LIST_WIDGET);
+        widgetTypeList.add(WidgetType.TABLE_WIDGET);
+        widgetTypeList.add(WidgetType.DROP_DOWN_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
+
+        ActionDTO action = new ActionDTO();
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setHttpMethod(HttpMethod.POST);
+        actionConfiguration.setBody("random-request-body");
+        actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+        action.setActionConfiguration(actionConfiguration);
+        action.setPageId(testPage.getId());
+        action.setName("testActionExecute");
+        action.setDatasource(datasource);
+        ActionDTO createdAction = layoutActionService.createAction(action).block();
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        executeActionDTO.setActionId(createdAction.getId());
+        executeActionDTO.setViewMode(false);
+
+        executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+                List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testWidgetSuggestionAfterExecutionWithEmptyData() throws JsonProcessingException {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+        ActionExecutionResult mockResult = new ActionExecutionResult();
+        final String data = "{ \"data\":[] }";
+        final JsonNode arrNode = new ObjectMapper().readTree(data).get("data");;
+
+        mockResult.setIsExecutionSuccess(true);
+        mockResult.setBody(arrNode);
+        mockResult.setStatusCode("200");
+        mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        mockResult.setSuggestedWidgets(widgetTypeList);
+
+        ActionDTO action = new ActionDTO();
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setHttpMethod(HttpMethod.POST);
+        actionConfiguration.setBody("random-request-body");
+        actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+        action.setActionConfiguration(actionConfiguration);
+        action.setPageId(testPage.getId());
+        action.setName("testActionExecute");
+        action.setDatasource(datasource);
+        ActionDTO createdAction = layoutActionService.createAction(action).block();
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        executeActionDTO.setActionId(createdAction.getId());
+        executeActionDTO.setViewMode(false);
+
+        executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+                List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testWidgetSuggestionAfterExecutionWithNumericData() throws JsonProcessingException {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+        ActionExecutionResult mockResult = new ActionExecutionResult();
+        final String data = "{ \"data\": [1] }";
+        final JsonNode arrNode = new ObjectMapper().readTree(data).get("data");
+
+        mockResult.setIsExecutionSuccess(true);
+        mockResult.setBody(arrNode);
+        mockResult.setStatusCode("200");
+        mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+        mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+        List<WidgetType> widgetTypeList = new ArrayList<>();
+        widgetTypeList.add(WidgetType.TEXT_WIDGET);
+        widgetTypeList.add(WidgetType.INPUT_WIDGET);
+        mockResult.setSuggestedWidgets(widgetTypeList);
+
+        ActionDTO action = new ActionDTO();
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setHttpMethod(HttpMethod.POST);
+        actionConfiguration.setBody("random-request-body");
+        actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+        action.setActionConfiguration(actionConfiguration);
+        action.setPageId(testPage.getId());
+        action.setName("testActionExecute");
+        action.setDatasource(datasource);
+        ActionDTO createdAction = layoutActionService.createAction(action).block();
+
+        ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+        executeActionDTO.setActionId(createdAction.getId());
+        executeActionDTO.setViewMode(false);
+
+        executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+                List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
index 4bcf8ebe5c..a2c7e31482 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
@@ -305,6 +305,33 @@ public class ApplicationServiceTest {
                 .verifyComplete();
     }
 
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void invalidUpdateApplication() {
+        Application testApp1 = new Application();
+        testApp1.setName("validApplication1");
+        Application testApp2 = new Application();
+        testApp2.setName("validApplication2");
+
+        Mono<List<Application>> createMultipleApplications = Mono.zip(
+            applicationPageService.createApplication(testApp1, orgId),
+            applicationPageService.createApplication(testApp2, orgId))
+            .map(tuple -> List.of(tuple.getT1(), tuple.getT2()));
+
+            Mono<Application> updateInvalidApplication = createMultipleApplications
+            .map(applicationList -> {
+                Application savedTestApp1 = applicationList.get(0);
+                Application savedTestApp2 = applicationList.get(1);
+                savedTestApp2.setName(savedTestApp1.getName());
+                return savedTestApp2;
+            })
+            .flatMap(t -> applicationService.update(t.getId(), t));
+
+        StepVerifier.create(updateInvalidApplication)
+            .expectErrorMatches(throwable -> throwable instanceof AppsmithException)
+            .verify();
+    }
+
     @Test
     @WithUserDetails(value = "api_user")
     public void reuseDeletedAppName() {
@@ -766,6 +793,7 @@ public class ApplicationServiceTest {
         ApplicationPage applicationPage = new ApplicationPage();
         applicationPage.setId(newPage.getId());
         applicationPage.setIsDefault(false);
+        applicationPage.setOrder(1);
 
         StepVerifier
                 .create(applicationService.findById(newPage.getApplicationId(), MANAGE_APPLICATIONS))
@@ -811,25 +839,37 @@ public class ApplicationServiceTest {
         Mono<Application> updatedDefaultPageApplicationMono = applicationMono
                 .flatMap(application -> applicationPageService.makePageDefault(application.getId(), newPage.getId()));
 
-        ApplicationPage unpublishedEditedPage = new ApplicationPage();
-        unpublishedEditedPage.setId(newPage.getId());
-        unpublishedEditedPage.setIsDefault(true);
-
         ApplicationPage publishedEditedPage = new ApplicationPage();
         publishedEditedPage.setId(newPage.getId());
         publishedEditedPage.setIsDefault(false);
 
+        ApplicationPage unpublishedEditedPage = new ApplicationPage();
+        unpublishedEditedPage.setId(newPage.getId());
+        unpublishedEditedPage.setIsDefault(true);
+
         StepVerifier
                 .create(updatedDefaultPageApplicationMono)
                 .assertNext(editedApplication -> {
 
                     List<ApplicationPage> publishedPages = editedApplication.getPublishedPages();
                     assertThat(publishedPages).size().isEqualTo(2);
-                    assertThat(publishedPages).containsAnyOf(publishedEditedPage);
+                    boolean isFound = false;
+                    for( ApplicationPage page: publishedPages) {
+                        if(page.getId().equals(publishedEditedPage.getId()) && page.getIsDefault().equals(publishedEditedPage.getIsDefault())) {
+                            isFound = true;
+                        }
+                    }
+                    assertThat(isFound).isTrue();
 
                     List<ApplicationPage> editedApplicationPages = editedApplication.getPages();
                     assertThat(editedApplicationPages.size()).isEqualTo(2);
-                    assertThat(editedApplicationPages).containsAnyOf(unpublishedEditedPage);
+                    isFound = false;
+                    for( ApplicationPage page: editedApplicationPages) {
+                        if(page.getId().equals(unpublishedEditedPage.getId()) && page.getIsDefault().equals(unpublishedEditedPage.getIsDefault())) {
+                            isFound = true;
+                        }
+                    }
+                    assertThat(isFound).isTrue();
                 })
                 .verifyComplete();
     }
@@ -873,7 +913,13 @@ public class ApplicationServiceTest {
                 .assertNext(viewApplication -> {
                     List<ApplicationPage> editedApplicationPages = viewApplication.getPages();
                     assertThat(editedApplicationPages.size()).isEqualTo(2);
-                    assertThat(editedApplicationPages).containsAnyOf(applicationPage);
+                    boolean isFound = false;
+                    for( ApplicationPage page: editedApplicationPages) {
+                        if(page.getId().equals(applicationPage.getId()) && page.getIsDefault().equals(applicationPage.getIsDefault())) {
+                            isFound = true;
+                        }
+                    }
+                    assertThat(isFound).isTrue();
                 })
                 .verifyComplete();
     }
@@ -1051,4 +1097,146 @@ public class ApplicationServiceTest {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void validChangeViewAccessCancelledMidWay() {
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+        Application testApplication = new Application();
+        String appName = "ApplicationServiceTest Public View Application Midway Cancellation";
+        testApplication.setName(appName);
+
+        Application originalApplication = applicationPageService.createApplication(testApplication, orgId)
+                .block();
+
+        String pageId = originalApplication.getPages().get(0).getId();
+
+        Plugin plugin = pluginService.findByName("Installed Plugin Name").block();
+        Datasource datasource = new Datasource();
+        datasource.setName("Public View App Test");
+        datasource.setPluginId(plugin.getId());
+        DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+        datasourceConfiguration.setUrl("http://test.com");
+        datasource.setDatasourceConfiguration(datasourceConfiguration);
+        datasource.setOrganizationId(orgId);
+
+        Datasource savedDatasource = datasourceService.create(datasource).block();
+
+        ActionDTO action1 = new ActionDTO();
+        action1.setName("Public View Test action1");
+        action1.setPageId(pageId);
+        action1.setDatasource(savedDatasource);
+        ActionConfiguration actionConfiguration = new ActionConfiguration();
+        actionConfiguration.setHttpMethod(HttpMethod.GET);
+        action1.setActionConfiguration(actionConfiguration);
+
+        ActionDTO savedAction1 = layoutActionService.createAction(action1).block();
+
+        ActionDTO action2 = new ActionDTO();
+        action2.setName("Public View Test action2");
+        action2.setPageId(pageId);
+        action2.setDatasource(savedDatasource);
+        action2.setActionConfiguration(actionConfiguration);
+
+        ActionDTO savedAction2 = layoutActionService.createAction(action2).block();
+
+        ActionDTO action3 = new ActionDTO();
+        action3.setName("Public View Test action3");
+        action3.setPageId(pageId);
+        action3.setDatasource(savedDatasource);
+        action3.setActionConfiguration(actionConfiguration);
+
+        ActionDTO savedAction3 = layoutActionService.createAction(action3).block();
+
+        ApplicationAccessDTO applicationAccessDTO = new ApplicationAccessDTO();
+        applicationAccessDTO.setPublicAccess(true);
+
+        // Trigger the change view access of application now.
+        applicationService.changeViewAccess(originalApplication.getId(), applicationAccessDTO)
+                .timeout(Duration.ofMillis(10))
+                .subscribe();
+
+        Mono<Application> applicationFromDbPostViewChange = Mono.just(originalApplication)
+                .flatMap(originalApp -> {
+                    try {
+                        // Before fetching the public application, sleep for 5 seconds to ensure that the updating
+                        // all appsmith objects with public permission finishes.
+                        Thread.sleep(5000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    return applicationRepository.findById(originalApplication.getId(), READ_APPLICATIONS);
+                })
+                .cache();
+
+        Mono<List<NewAction>> actionsMono = applicationFromDbPostViewChange
+                .flatMap(clonedAppFromDb -> newActionService
+                        .findAllByApplicationIdAndViewMode(clonedAppFromDb.getId(), false, READ_ACTIONS, null)
+                        .collectList()
+                );
+
+        Mono<List<PageDTO>> pagesMono = applicationFromDbPostViewChange
+                .flatMapMany(application -> Flux.fromIterable(application.getPages()))
+                .flatMap(applicationPage -> newPageService.findPageById(applicationPage.getId(), READ_PAGES, false))
+                .collectList();
+
+        Mono<Datasource> datasourceMono = applicationFromDbPostViewChange
+                .flatMap(application -> datasourceService.findById(savedDatasource.getId(), READ_DATASOURCES));
+
+        StepVerifier
+                .create(Mono.zip(applicationFromDbPostViewChange, actionsMono, pagesMono, datasourceMono))
+                .assertNext(tuple -> {
+                    Application updatedApplication = tuple.getT1();
+                    List<NewAction> actions = tuple.getT2();
+                    List<PageDTO> pages = tuple.getT3();
+                    Datasource datasource1 = tuple.getT4();
+
+                    assertThat(updatedApplication).isNotNull();
+                    assertThat(updatedApplication.getIsPublic()).isTrue();
+                    assertThat(updatedApplication
+                            .getPolicies()
+                            .stream()
+                            .filter(policy -> policy.getPermission().equals(READ_APPLICATIONS.getValue()))
+                            .findFirst()
+                            .get()
+                            .getUsers()
+                    ).contains("anonymousUser");
+
+                    for (PageDTO page : pages) {
+                        assertThat(page
+                                .getPolicies()
+                                .stream()
+                                .filter(policy -> policy.getPermission().equals(READ_PAGES.getValue()))
+                                .findFirst()
+                                .get()
+                                .getUsers()
+                        ).contains("anonymousUser");
+                    }
+
+                    for (NewAction action : actions) {
+                        assertThat(action
+                                .getPolicies()
+                                .stream()
+                                .filter(policy -> policy.getPermission().equals(EXECUTE_ACTIONS.getValue()))
+                                .findFirst()
+                                .get()
+                                .getUsers()
+                        ).contains("anonymousUser");
+                    }
+
+
+                    assertThat(datasource1
+                            .getPolicies()
+                            .stream()
+                            .filter(policy -> policy.getPermission().equals(EXECUTE_DATASOURCES.getValue()))
+                            .findFirst()
+                            .get()
+                            .getUsers()
+                    ).contains("anonymousUser");
+
+                })
+                .verifyComplete();
+
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CommentServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CommentServiceTest.java
index 100e6d3301..1d50d00f54 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CommentServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CommentServiceTest.java
@@ -6,6 +6,10 @@ import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.Comment;
 import com.appsmith.server.domains.CommentThread;
 import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.helpers.PolicyUtils;
+import com.appsmith.server.repositories.CommentRepository;
+import com.appsmith.server.repositories.CommentThreadRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,6 +24,7 @@ import reactor.util.function.Tuple2;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,6 +38,12 @@ public class CommentServiceTest {
     @Autowired
     CommentService commentService;
 
+    @Autowired
+    CommentRepository commentRepository;
+
+    @Autowired
+    CommentThreadRepository commentThreadRepository;
+
     @Autowired
     ApplicationService applicationService;
 
@@ -42,6 +53,9 @@ public class CommentServiceTest {
     @Autowired
     OrganizationService organizationService;
 
+    @Autowired
+    PolicyUtils policyUtils;
+
     @Test
     @WithUserDetails(value = "api_user")
     public void setup() {
@@ -53,7 +67,7 @@ public class CommentServiceTest {
                     thread.setComments(List.of(
                             makePlainTextComment("comment one")
                     ));
-                    return commentService.createThread(thread);
+                    return commentService.createThread(thread, "https://app.appsmith.com");
                 })
                 .zipWhen(thread -> commentService.getThreadsByApplicationId(thread.getApplicationId()));
 
@@ -98,6 +112,12 @@ public class CommentServiceTest {
         return comment;
     }
 
+    private Comment.Reaction makeReaction(String emoji) {
+        Comment.Reaction reaction = new Comment.Reaction();
+        reaction.setEmoji(emoji);
+        return reaction;
+    }
+
     @Test
     @WithUserDetails(value = "api_user")
     public void deleteValidComment() {
@@ -118,7 +138,7 @@ public class CommentServiceTest {
                     thread.setComments(List.of(
                             makePlainTextComment("Test Comment")
                     ));
-                    return commentService.createThread(thread);
+                    return commentService.createThread(thread, "https://app.appsmith.com");
                 })
                 .flatMap(commentThread -> Mono.just(commentThread.getComments().get(0)))
                 .cache();
@@ -135,4 +155,125 @@ public class CommentServiceTest {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testAddReaction() {
+        Organization organization = new Organization();
+        organization.setName("ReactionsOrg");
+        Mono<Comment> reactionMono = organizationService
+                .create(organization)
+                .flatMap(org -> {
+                    Application testApplication = new Application();
+                    testApplication.setName("ReactionApp");
+                    return applicationPageService
+                            .createApplication(testApplication, org.getId());
+                })
+                .flatMap(application -> {
+                    final CommentThread thread = new CommentThread();
+                    thread.setApplicationId(application.getId());
+                    thread.setComments(List.of(makePlainTextComment("Test Comment")));
+                    return commentService.createThread(thread, "https://app.appsmith.com");
+                })
+                .flatMap(commentThread -> Mono.just(commentThread.getComments().get(0)))
+                .flatMap(comment -> {
+                    assert comment.getId() != null;
+                    return commentService
+                            .createReaction(comment.getId(), makeReaction("x"))
+                            .then(commentRepository.findById(comment.getId()));
+                })
+                .cache();
+
+        StepVerifier
+                .create(reactionMono)
+                .assertNext(comment -> {
+                    assertThat(comment.getReactions()).hasSize(1);
+                    Comment.Reaction r1 = comment.getReactions().get(0);
+                    assertThat(r1.getEmoji()).isEqualTo("x");
+                    assertThat(r1.getByName()).isEqualTo("api_user");
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testAddAndRemoveReaction() {
+        Organization organization = new Organization();
+        organization.setName("ReactionsOrg");
+        Mono<Comment> reactionMono = organizationService
+                .create(organization)
+                .flatMap(org -> {
+                    Application testApplication = new Application();
+                    testApplication.setName("ReactionApp");
+                    return applicationPageService
+                            .createApplication(testApplication, org.getId());
+                })
+                .flatMap(application -> {
+                    final CommentThread thread = new CommentThread();
+                    thread.setApplicationId(application.getId());
+                    thread.setComments(List.of(makePlainTextComment("Test Comment")));
+                    return commentService.createThread(thread, "https://app.appsmith.com");
+                })
+                .flatMap(commentThread -> Mono.just(commentThread.getComments().get(0)))
+                .flatMap(comment -> {
+                    assert comment.getId() != null;
+                    return Mono.when(
+                            commentService.createReaction(comment.getId(), makeReaction("x")),
+                            commentService.createReaction(comment.getId(), makeReaction("y"))
+                    )
+                            .then(commentService.deleteReaction(comment.getId(), makeReaction("x")))
+                            .then(commentRepository.findById(comment.getId()));
+                })
+                .cache();
+
+        StepVerifier
+                .create(reactionMono)
+                .assertNext(comment -> {
+                    assertThat(comment.getReactions()).hasSize(1);
+                    Comment.Reaction r1 = comment.getReactions().get(0);
+                    assertThat(r1.getEmoji()).isEqualTo("y");
+                    assertThat(r1.getByName()).isEqualTo("api_user");
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void getUnreadCount() {
+        User user = new User();
+        user.setEmail("api_user");
+        Map<String, Policy> stringPolicyMap = policyUtils.generatePolicyFromPermission(
+                Set.of(AclPermission.READ_THREAD),
+                user
+        );
+        Set<Policy> policies = Set.copyOf(stringPolicyMap.values());
+
+        // first thread which is read by api_user
+        CommentThread c1 = new CommentThread();
+        c1.setApplicationId("test-application-1");
+        c1.setViewedByUsers(Set.of("api_user", "user2"));
+        c1.setPolicies(policies);
+
+        // second thread which is not read by api_user
+        CommentThread c2 = new CommentThread();
+        c2.setApplicationId("test-application-1");
+        c2.setViewedByUsers(Set.of("user2"));
+        c2.setPolicies(policies);
+
+        // third thread which is read by api_user but in another application
+        CommentThread c3 = new CommentThread();
+        c3.setApplicationId("test-application-2");
+        c3.setViewedByUsers(Set.of("user2", "api_user"));
+        c3.setPolicies(policies);
+
+        Mono<Long> unreadCountMono = commentThreadRepository
+                .saveAll(List.of(c1, c2, c3)) // save all the threads
+                .collectList()
+                .then(commentService.getUnreadCount("test-application-1")); // count unread in first app
+
+        StepVerifier.create(unreadCountMono).assertNext(aLong -> {
+            assertThat(aLong).isEqualTo(1);
+        }).verifyComplete();
+    }
+
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
index 89d59d5511..b31d9d14eb 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
@@ -55,9 +55,6 @@ public class CurlImporterServiceTest {
     @Autowired
     UserService userService;
 
-    @Autowired
-    OrganizationService organizationService;
-
     String orgId;
 
     @Before
@@ -664,6 +661,23 @@ public class CurlImporterServiceTest {
         );
     }
 
+    @Test
+    public void parseMultiFormData() throws AppsmithException {
+        // In the curl command, we test for a combination of --form and -F
+        // Also some values are double-quoted while some aren't. This tests a permutation of all such fields
+        ActionDTO action = curlImporterService.curlToAction("curl --request POST 'http://httpbin.org/post' -F 'somekey=value' --form 'anotherKey=\"anotherValue\"'");
+        assertMethod(action, HttpMethod.POST);
+        assertUrl(action, "http://httpbin.org");
+        assertPath(action, "/post");
+        assertHeaders(action, new Property("Content-Type", "multipart/form-data"));
+        assertEmptyBody(action);
+        assertBodyFormData(
+                action,
+                new Property("somekey", "value"),
+                new Property("anotherKey", "anotherValue")
+        );
+    }
+
     @Test
     public void dontEatBackslashesInSingleQuotes() throws AppsmithException {
         ActionDTO action = curlImporterService.curlToAction("curl http://httpbin.org/post -d 'a\\n'");
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java
index 474af7bfa8..6f7ca33aed 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java
@@ -2,6 +2,7 @@ package com.appsmith.server.services;
 
 import com.appsmith.external.models.DBAuth;
 import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.services.EncryptionService;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.Datasource;
 import com.appsmith.server.domains.Organization;
@@ -10,6 +11,7 @@ import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.repositories.OrganizationRepository;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,15 +24,13 @@ import org.springframework.test.context.junit4.SpringRunner;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @Slf4j
 public class DatasourceContextServiceTest {
 
     @Autowired
-    DatasourceContextService datasourceContextService;
+    EncryptionService encryptionService;
 
     @Autowired
     OrganizationRepository organizationRepository;
@@ -44,7 +44,7 @@ public class DatasourceContextServiceTest {
     @MockBean
     PluginExecutorHelper pluginExecutorHelper;
 
-    String orgId =  "";
+    String orgId = "";
 
     @Before
     @WithUserDetails(value = "api_user")
@@ -53,7 +53,6 @@ public class DatasourceContextServiceTest {
         orgId = testOrg.getId();
     }
 
-
     @Test
     @WithUserDetails(value = "api_user")
     public void checkDecryptionOfAuthenticationDTOTest() {
@@ -73,21 +72,29 @@ public class DatasourceContextServiceTest {
         datasource.setDatasourceConfiguration(datasourceConfiguration);
         datasource.setOrganizationId(orgId);
 
-        Mono<Datasource> datasourceMono = pluginMono.map(plugin -> {
-            datasource.setPluginId(plugin.getId());
-            return datasource;
-        }).flatMap(datasourceService::create);
+        final Datasource createdDatasource = pluginMono
+                .map(plugin -> {
+                    datasource.setPluginId(plugin.getId());
+                    return datasource;
+                })
+                .flatMap(datasourceService::create)
+                .block();
+
+        assert createdDatasource != null;
+        Mono<Datasource> datasourceMono = datasourceService.findById(createdDatasource.getId());
 
         StepVerifier
                 .create(datasourceMono)
                 .assertNext(savedDatasource -> {
                     DBAuth authentication = (DBAuth) savedDatasource.getDatasourceConfiguration().getAuthentication();
-                    DBAuth decryptedAuthentication = (DBAuth) datasourceContextService.decryptSensitiveFields(authentication);
-                    assertThat(decryptedAuthentication.getPassword()).isEqualTo(password);
+                    Assert.assertEquals(password, authentication.getPassword());
+                    DBAuth encryptedAuthentication = (DBAuth) createdDatasource.getDatasourceConfiguration().getAuthentication();
+                    Assert.assertEquals(encryptionService.encryptString(password), encryptedAuthentication.getPassword());
                 })
                 .verifyComplete();
     }
 
+
     @Test
     @WithUserDetails(value = "api_user")
     public void checkDecryptionOfAuthenticationDTONullPassword() {
@@ -103,17 +110,24 @@ public class DatasourceContextServiceTest {
         datasource.setDatasourceConfiguration(datasourceConfiguration);
         datasource.setOrganizationId(orgId);
 
-        Mono<Datasource> datasourceMono = pluginMono.map(plugin -> {
-            datasource.setPluginId(plugin.getId());
-            return datasource;
-        }).flatMap(datasourceService::create);
+        final Datasource createdDatasource = pluginMono
+                .map(plugin -> {
+                    datasource.setPluginId(plugin.getId());
+                    return datasource;
+                })
+                .flatMap(datasourceService::create)
+                .block();
+
+        assert createdDatasource != null;
+        Mono<Datasource> datasourceMono = datasourceService.findById(createdDatasource.getId());
 
         StepVerifier
                 .create(datasourceMono)
                 .assertNext(savedDatasource -> {
                     DBAuth authentication = (DBAuth) savedDatasource.getDatasourceConfiguration().getAuthentication();
-                    DBAuth decryptedAuthentication = (DBAuth) datasourceContextService.decryptSensitiveFields(authentication);
-                    assertThat(decryptedAuthentication.getPassword()).isNull();
+                    Assert.assertNull(authentication.getPassword());
+                    DBAuth encryptedAuthentication = (DBAuth) createdDatasource.getDatasourceConfiguration().getAuthentication();
+                    Assert.assertNull(encryptedAuthentication.getPassword());
                 })
                 .verifyComplete();
     }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
index bcfda29a67..dca99f51c4 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
@@ -469,7 +469,6 @@ public class DatasourceServiceTest {
 
         Mono<DatasourceTestResult> testResultMono = datasourceMono.flatMap(datasource1 -> {
             ((DBAuth) datasource1.getDatasourceConfiguration().getAuthentication()).setPassword(null);
-            datasource1.getDatasourceConfiguration().getAuthentication().setIsEncrypted(false);
             return datasourceService.testDatasource(datasource1);
         });
 
@@ -611,7 +610,6 @@ public class DatasourceServiceTest {
                     DBAuth authentication = (DBAuth) savedDatasource.getDatasourceConfiguration().getAuthentication();
                     assertThat(authentication.getUsername()).isEqualTo(username);
                     assertThat(authentication.getPassword()).isEqualTo(encryptionService.encryptString(password));
-                    assertThat(authentication.isEncrypted()).isTrue();
                 })
                 .verifyComplete();
     }
@@ -619,8 +617,6 @@ public class DatasourceServiceTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void checkEncryptionOfAuthenticationDTONullPassword() {
-        // For this test, all fields that are meant to be encrypted are going to be empty
-        // In such a scenario, we want the isEncrypted field to be in an inactive state, that is, null
         Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
 
         Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
@@ -645,7 +641,6 @@ public class DatasourceServiceTest {
                     DBAuth authentication = (DBAuth) savedDatasource.getDatasourceConfiguration().getAuthentication();
                     assertThat(authentication.getUsername()).isNull();
                     assertThat(authentication.getPassword()).isNull();
-                    assertThat(authentication.isEncrypted()).isNull();
                 })
                 .verifyComplete();
     }
@@ -695,7 +690,6 @@ public class DatasourceServiceTest {
 
                     assertThat(authentication.getUsername()).isEqualTo(username);
                     assertThat(encryptionService.encryptString(password)).isEqualTo(authentication.getPassword());
-                    assertThat(authentication.isEncrypted()).isTrue();
                 })
                 .verifyComplete();
     }
@@ -987,7 +981,7 @@ public class DatasourceServiceTest {
 
     @Test
     @WithUserDetails(value = "api_user")
-    public void testHintMessageOnLocalhostUrlOnUpdateEventOnNonApiDatasource() {
+    public void testHintMessageOnLocalhostIPAddressOnUpdateEventOnNonApiDatasource() {
         Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
 
         Datasource datasource = new Datasource();
@@ -1015,7 +1009,7 @@ public class DatasourceServiceTest {
                     DatasourceConfiguration datasourceConfiguration1 = new DatasourceConfiguration();
                     Connection connection1 = new Connection();
                     datasourceConfiguration1.setConnection(connection1);
-                    Endpoint endpoint = new Endpoint("http://localhost", 0L);
+                    Endpoint endpoint = new Endpoint("http://127.0.0.1/xyz", 0L);
                     datasourceConfiguration1.setEndpoints(new ArrayList<>());
                     datasourceConfiguration1.getEndpoints().add(endpoint);
                     updates.setDatasourceConfiguration(datasourceConfiguration1);
@@ -1037,4 +1031,36 @@ public class DatasourceServiceTest {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testHintMessageNPE() {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+        Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
+        Datasource datasource = new Datasource();
+        datasource.setName("NPE check");
+        datasource.setOrganizationId(orgId);
+        DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+        datasourceConfiguration.setEndpoints(new ArrayList<>());
+        Endpoint nullEndpoint = null;
+        datasourceConfiguration.getEndpoints().add(nullEndpoint);
+        Endpoint nullHost = new Endpoint(null, 0L);
+        datasourceConfiguration.getEndpoints().add(nullHost);
+
+        datasource.setDatasourceConfiguration(datasourceConfiguration);
+
+        Mono<Datasource> datasourceMono = pluginMono.map(plugin -> {
+            datasource.setPluginId(plugin.getId());
+            return datasource;
+        }).flatMap(datasourceService::create);
+
+        StepVerifier
+                .create(datasourceMono)
+                .assertNext(createdDatasource -> {
+                    assertThat(createdDatasource.getMessages()).isEmpty();
+                })
+                .verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
index 0864b1c957..7b0859760d 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
@@ -663,4 +663,39 @@ public class LayoutActionServiceTest {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void simpleWidgetNameRefactor() {
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+        JSONObject dsl = new JSONObject();
+        dsl.put("widgetName", "Table1");
+        dsl.put("type", "TABLE_WIDGET");
+        Layout layout = testPage.getLayouts().get(0);
+        layout.setDsl(dsl);
+
+        layoutActionService.updateLayout(testPage.getId(), layout.getId(), layout).block();
+
+        RefactorNameDTO refactorNameDTO = new RefactorNameDTO();
+        refactorNameDTO.setPageId(testPage.getId());
+        refactorNameDTO.setLayoutId(layout.getId());
+        refactorNameDTO.setOldName("Table1");
+        refactorNameDTO.setNewName("NewNameTable1");
+
+        Mono<LayoutDTO> widgetRenameMono = layoutActionService.refactorWidgetName(refactorNameDTO).cache();
+
+        Mono<PageDTO> pageFromRepoMono = widgetRenameMono.then(newPageService.findPageById(testPage.getId(), READ_PAGES, false));
+
+        StepVerifier
+                .create(Mono.zip(widgetRenameMono, pageFromRepoMono))
+                .assertNext(tuple -> {
+                    LayoutDTO updatedLayout = tuple.getT1();
+                    PageDTO pageFromRepo = tuple.getT2();
+
+                    String widgetName = (String) updatedLayout.getDsl().get("widgetName");
+                    assertThat(widgetName).isEqualTo("NewNameTable1");
+                })
+                .verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java
new file mode 100644
index 0000000000..2e679f19ad
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java
@@ -0,0 +1,157 @@
+package com.appsmith.server.services;
+
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.Policy;
+import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.dtos.MockDataSource;
+import com.appsmith.server.helpers.MockPluginExecutor;
+import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.repositories.OrganizationRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.util.Set;
+
+import static com.appsmith.server.acl.AclPermission.EXECUTE_DATASOURCES;
+import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
+import static com.appsmith.server.acl.AclPermission.READ_DATASOURCES;
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Slf4j
+@DirtiesContext
+public class MockDataServiceTest {
+
+    @Autowired
+    PluginService pluginService;
+
+    @Autowired
+    OrganizationRepository organizationRepository;
+
+    @Autowired
+    LayoutActionService layoutActionService;
+
+    @Autowired
+    MockDataService mockDataService;
+
+    @MockBean
+    PluginExecutorHelper pluginExecutorHelper;
+
+    String orgId = "";
+
+    @Before
+    @WithUserDetails(value = "api_user")
+    public void setup() {
+        Organization testOrg = organizationRepository.findByName("Another Test Organization", AclPermission.READ_ORGANIZATIONS).block();
+        orgId = testOrg == null ? "" : testOrg.getId();
+    }
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testGetMockDataSets() {
+        StepVerifier
+                .create(mockDataService.getMockDataSet())
+                .assertNext( mockDataSets -> {
+                    assertThat(mockDataSets.getMockdbs().size()).isEqualTo(2);
+                    assertThat(mockDataSets.getMockdbs().stream().anyMatch(data -> {
+                        return data.getName().equals("movies") &&
+                                data.getPackageName().equals("mongo-plugin");
+                    }));
+                    assertThat(mockDataSets.getMockdbs().stream().anyMatch(data -> {
+                        return data.getName().equals("users") &&
+                                data.getPackageName().equals("postgres-plugin");
+                    }));
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testCreateMockDataSetsMongo() {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+        Plugin pluginMono = pluginService.findByName("Installed Plugin Name").block();
+        MockDataSource mockDataSource = new MockDataSource();
+        mockDataSource.setName("movies");
+        mockDataSource.setOrganizationId(orgId);
+        mockDataSource.setPackageName("mongo-plugin");
+        mockDataSource.setPluginId(pluginMono.getId());
+
+        StepVerifier
+                .create(mockDataService.createMockDataSet(mockDataSource))
+                .assertNext(createdDatasource -> {
+                    assertThat(createdDatasource.getId()).isNotEmpty();
+                    assertThat(createdDatasource.getPluginId()).isEqualTo(pluginMono.getId());
+                    assertThat(createdDatasource.getName()).isEqualTo("MOVIES - Mock");
+                    Policy manageDatasourcePolicy = Policy.builder().permission(MANAGE_DATASOURCES.getValue())
+                            .users(Set.of("api_user"))
+                            .build();
+                    Policy readDatasourcePolicy = Policy.builder().permission(READ_DATASOURCES.getValue())
+                            .users(Set.of("api_user"))
+                            .build();
+                    Policy executeDatasourcePolicy = Policy.builder().permission(EXECUTE_DATASOURCES.getValue())
+                            .users(Set.of("api_user"))
+                            .build();
+
+                    DBAuth auth = (DBAuth) createdDatasource.getDatasourceConfiguration().getAuthentication();
+                    assertThat(createdDatasource.getPolicies()).isNotEmpty();
+                    assertThat(createdDatasource.getPolicies()).containsAll(Set.of(manageDatasourcePolicy, readDatasourcePolicy, executeDatasourcePolicy));
+                    assertThat(createdDatasource.getDatasourceConfiguration().getProperties().get(0).getValue()).isEqualTo("Yes");
+                    assertThat(createdDatasource.getDatasourceConfiguration().getProperties().get(0).getKey()).isEqualTo("Use Mongo Connection String URI");
+                    assertThat(auth.getDatabaseName()).isEqualTo("movies");
+                    assertThat(auth.getUsername()).isEqualTo("mockdb-admin");
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testCreateMockDataSetsPostgres() {
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+        Plugin pluginMono = pluginService.findByName("Installed Plugin Name").block();
+        MockDataSource mockDataSource = new MockDataSource();
+        mockDataSource.setName("users");
+        mockDataSource.setOrganizationId(orgId);
+        mockDataSource.setPackageName("postgres-plugin");
+        mockDataSource.setPluginId(pluginMono.getId());
+
+        StepVerifier
+                .create(mockDataService.createMockDataSet(mockDataSource))
+                .assertNext(createdDatasource -> {
+                    assertThat(createdDatasource.getId()).isNotEmpty();
+                    assertThat(createdDatasource.getPluginId()).isEqualTo(pluginMono.getId());
+                    assertThat(createdDatasource.getName()).isEqualTo("USERS - Mock");
+                    Policy manageDatasourcePolicy = Policy.builder().permission(MANAGE_DATASOURCES.getValue())
+                            .users(Set.of("api_user"))
+                            .build();
+                    Policy readDatasourcePolicy = Policy.builder().permission(READ_DATASOURCES.getValue())
+                            .users(Set.of("api_user"))
+                            .build();
+                    Policy executeDatasourcePolicy = Policy.builder().permission(EXECUTE_DATASOURCES.getValue())
+                            .users(Set.of("api_user"))
+                            .build();
+
+                    DBAuth auth = (DBAuth) createdDatasource.getDatasourceConfiguration().getAuthentication();
+                    assertThat(createdDatasource.getPolicies()).isNotEmpty();
+                    assertThat(createdDatasource.getPolicies()).containsAll(Set.of(manageDatasourcePolicy, readDatasourcePolicy, executeDatasourcePolicy));
+                    assertThat(auth.getDatabaseName()).isEqualTo("users");
+                    assertThat(auth.getUsername()).isEqualTo("users");
+                })
+                .verifyComplete();
+    }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/NotificationServiceImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/NotificationServiceImplTest.java
new file mode 100644
index 0000000000..ec98d08d4f
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/NotificationServiceImplTest.java
@@ -0,0 +1,175 @@
+package com.appsmith.server.services;
+
+import com.appsmith.server.domains.Notification;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.dtos.UpdateIsReadNotificationByIdDTO;
+import com.appsmith.server.dtos.UpdateIsReadNotificationDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.repositories.NotificationRepository;
+import com.mongodb.client.result.UpdateResult;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
+import reactor.test.StepVerifier;
+
+import javax.validation.Validator;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+public class NotificationServiceImplTest {
+    @MockBean
+    private Scheduler scheduler;
+    @MockBean
+    private Validator validator;
+    @MockBean
+    private MongoConverter mongoConverter;
+    @MockBean
+    private ReactiveMongoTemplate reactiveMongoTemplate;
+    @MockBean
+    private NotificationRepository repository;
+    @MockBean
+    private AnalyticsService analyticsService;
+    @MockBean
+    private SessionUserService sessionUserService;
+
+    NotificationService notificationService;
+    private User currentUser;
+
+    @Before
+    public void setUp() {
+        notificationService = new NotificationServiceImpl(
+                scheduler, validator, mongoConverter, reactiveMongoTemplate,
+                repository, analyticsService, sessionUserService
+        );
+        currentUser = new User();
+        currentUser.setEmail("sample-email");
+
+        Mockito.when(sessionUserService.getCurrentUser()).thenReturn(Mono.just(currentUser));
+        // mock the repository to return count as 100
+        Mockito.when(repository.countByForUsername(currentUser.getUsername())).thenReturn(Mono.just(100L));
+        // mock the repository to return unread count as 5
+        Mockito.when(repository.countByForUsernameAndIsReadIsFalse(currentUser.getUsername())).thenReturn(Mono.just(5L));
+    }
+
+    private List<Notification> createSampleNotificationList() {
+        // create some sample notification
+        List<Notification> notificationList = new ArrayList<>();
+        for(int i = 1; i <= 5; i++) {
+            Notification notification = new Notification();
+            notification.setId("test-id-" + i);
+            notificationList.add(notification);
+        }
+        return notificationList;
+    }
+
+    @Test
+    public void get_WhenNoBeforeParamProvided_ReturnsData() {
+        List<Notification> notificationList = createSampleNotificationList();
+
+        // mock the repository to return the sample list of notification when called with current time
+        Mockito.when(repository.findByForUsernameAndCreatedAtBefore(
+                eq(currentUser.getUsername()), Mockito.any(Instant.class), Mockito.any(Pageable.class))
+        ).thenReturn(Flux.fromIterable(notificationList));
+
+        Flux<Notification> notificationFlux = notificationService.get(new LinkedMultiValueMap<>());
+        StepVerifier
+                .create(notificationFlux.collectList())
+                .assertNext(listResponseDTO -> {
+                    assertThat(listResponseDTO.size()).isEqualTo(notificationList.size());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void get_WhenValidBeforeParamExists_ReturnsData() {
+        List<Notification> notificationList = createSampleNotificationList();
+
+        Instant instant = Instant.now();
+
+        // mock the repository to return the sample list of notification
+        Mockito.when(repository.findByForUsernameAndCreatedAtBefore(
+                eq(currentUser.getUsername()), eq(instant), Mockito.any(Pageable.class))
+        ).thenReturn(Flux.fromIterable(notificationList));
+
+        // add the sample pagination parameters
+        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+        params.put("beforeDate", List.of(instant.toString()));
+
+        Flux<Notification> notificationFlux = notificationService.get(params);
+
+        StepVerifier
+                .create(notificationFlux.collectList())
+                .assertNext(listResponseDTO -> {
+                    assertThat(listResponseDTO.size()).isEqualTo(notificationList.size());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void get_WhenInvalidValidBeforeParam_ThrowsException() {
+        // add the sample pagination parameters
+        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+        params.put("beforeDate", List.of("abcd"));
+
+        Flux<Notification> notificationFlux = notificationService.get(params);
+
+        StepVerifier
+                .create(notificationFlux.collectList())
+                .expectErrorMessage(AppsmithError.INVALID_PARAMETER.getMessage("as beforeDate"))
+                .verify();
+    }
+
+    @Test
+    public void updateIsRead_WhenUpdateAll_ReturnSuccessfully() {
+        UpdateIsReadNotificationDTO dto = new UpdateIsReadNotificationDTO();
+        dto.setIsRead(true);
+
+        Mockito.when(repository.updateIsReadByForUsername(currentUser.getUsername(), true)).thenReturn(
+                Mono.just(Mockito.mock(UpdateResult.class))
+        );
+
+        StepVerifier
+                .create(notificationService.updateIsRead(dto))
+                .assertNext(responseDTO -> {
+                    assertThat(responseDTO.getIsRead()).isTrue();
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void updateIsRead_WhenUpdateById_ReturnSuccessfully() {
+        UpdateIsReadNotificationByIdDTO dto = new UpdateIsReadNotificationByIdDTO();
+        dto.setIsRead(true);
+        dto.setIdList(List.of("sample-id-1", "sample-id-2", "sample-id-3"));
+
+        Mockito.when(repository.updateIsReadByForUsernameAndIdList(
+                currentUser.getUsername(), dto.getIdList(), true)
+        ).thenReturn(
+                Mono.just(Mockito.mock(UpdateResult.class))
+        );
+
+        StepVerifier
+                .create(notificationService.updateIsRead(dto))
+                .assertNext(responseDTO -> {
+                    assertThat(responseDTO.getIsRead()).isTrue();
+                    assertThat(responseDTO.getIdList()).isEqualTo(dto.getIdList());
+                })
+                .verifyComplete();
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java
index ae6f8ca312..6c7b195e13 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java
@@ -607,8 +607,10 @@ public class OrganizationServiceTest {
         Mono<Organization> readOrganizationByNameMono = organizationRepository.findByName("Member Management Admin Test Organization")
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "organization by name")));
 
-        Mono<Datasource> readDatasourceByNameMono = datasourceRepository.findByName("test datasource", READ_DATASOURCES)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "Datasource")));
+        Mono<Datasource> readDatasourceByNameMono = organizationMono.flatMap(organization1 ->
+                datasourceRepository.findByNameAndOrganizationId("test datasource", organization1.getId(),READ_DATASOURCES)
+                        .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "Datasource")))
+        );
 
         Mono<Tuple3<Application, Organization, Datasource>> testMono = organizationMono
                 // create application and datasource
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceUnitTest.java
new file mode 100644
index 0000000000..076af9e999
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceUnitTest.java
@@ -0,0 +1,92 @@
+package com.appsmith.server.services;
+
+import com.appsmith.server.acl.RoleGraph;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.UserRole;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.repositories.AssetRepository;
+import com.appsmith.server.repositories.OrganizationRepository;
+import com.appsmith.server.repositories.PluginRepository;
+import com.appsmith.server.repositories.UserRepository;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
+import reactor.test.StepVerifier;
+
+import javax.validation.Validator;
+import java.util.List;
+
+import static com.appsmith.server.acl.AclPermission.ORGANIZATION_INVITE_USERS;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+public class OrganizationServiceUnitTest {
+
+    @MockBean PluginRepository pluginRepository;
+    @MockBean SessionUserService sessionUserService;
+    @MockBean UserOrganizationService userOrganizationService;
+    @MockBean UserRepository userRepository;
+    @MockBean RoleGraph roleGraph;
+    @MockBean AssetRepository assetRepository;
+    @MockBean AssetService assetService;
+    @MockBean Scheduler scheduler;
+    @MockBean MongoConverter mongoConverter;
+    @MockBean ReactiveMongoTemplate reactiveMongoTemplate;
+    @MockBean OrganizationRepository organizationRepository;
+    @MockBean Validator validator;
+    @MockBean AnalyticsService analyticsService;
+
+    OrganizationService organizationService;
+
+    @Before
+    public void setUp() {
+        organizationService = new OrganizationServiceImpl(scheduler, validator, mongoConverter, reactiveMongoTemplate,
+                organizationRepository, analyticsService, pluginRepository, sessionUserService, userOrganizationService,
+                userRepository, roleGraph, assetRepository, assetService
+        );
+    }
+
+    @Test
+    public void getOrganizationMembers_WhenRoleIsNull_ReturnsEmptyList() {
+        // create a organization object
+        Organization testOrg = new Organization();
+        testOrg.setName("Get All Members For Organization Test");
+        testOrg.setDomain("test.com");
+        testOrg.setWebsite("https://test.com");
+        testOrg.setId("test-org-id");
+
+        // mock repository methods so that they return the objects we've created
+        Mockito.when(organizationRepository.findById("test-org-id", ORGANIZATION_INVITE_USERS))
+                .thenReturn(Mono.just(testOrg));
+
+        Mono<List<UserRole>> organizationMembers = organizationService.getOrganizationMembers(testOrg.getId());
+        StepVerifier
+                .create(organizationMembers)
+                .assertNext(userRoles -> {
+                    Assert.assertEquals(0, userRoles.size());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void getOrganizationMembers_WhenNoOrgFound_ThrowsException() {
+        String sampleOrgId = "test-org-id";
+        // mock repository methods so that they return the objects we've created
+        Mockito.when(organizationRepository.findById(sampleOrgId, ORGANIZATION_INVITE_USERS))
+                .thenReturn(Mono.empty());
+
+        Mono<List<UserRole>> organizationMembers = organizationService.getOrganizationMembers(sampleOrgId);
+        StepVerifier
+                .create(organizationMembers)
+                .expectErrorMessage(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.ORGANIZATION, sampleOrgId))
+                .verify();
+    }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
index da49dcf673..2560f4c393 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
@@ -10,6 +10,7 @@ import com.appsmith.server.domains.Layout;
 import com.appsmith.server.domains.NewAction;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.ApplicationPage;
 import com.appsmith.server.dtos.ActionDTO;
 import com.appsmith.server.dtos.LayoutDTO;
 import com.appsmith.server.dtos.PageDTO;
@@ -44,6 +45,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
 import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
@@ -385,6 +387,127 @@ public class PageServiceTest {
                 .verifyComplete();
     }
 
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void reOrderPageFromHighOrderToLowOrder() {
+
+        User apiUser = userService.findByEmail("api_user").block();
+        orgId = apiUser.getOrganizationIds().iterator().next();
+        Application newApp = new Application();
+        newApp.setName(UUID.randomUUID().toString());
+
+        application = applicationPageService.createApplication(newApp, orgId).block();
+        applicationId = application.getId();
+        final String[] pageIds = new String[4];
+
+        PageDTO testPage1 = new PageDTO();
+        testPage1.setName("Page2");
+        testPage1.setApplicationId(applicationId);
+        Mono<Application> applicationPageReOrdered = applicationPageService.createPage(testPage1)
+                .flatMap(pageDTO -> {
+                    PageDTO testPage = new PageDTO();
+                    testPage.setName("Page3");
+                    testPage.setApplicationId(applicationId);
+                    return applicationPageService.createPage(testPage);
+                })
+                .flatMap(pageDTO -> {
+                    PageDTO testPage = new PageDTO();
+                    testPage.setName("Page4");
+                    testPage.setApplicationId(applicationId);
+                    return applicationPageService.createPage(testPage);
+                })
+                .flatMap(pageDTO -> applicationService.getById(pageDTO.getApplicationId()))
+                .flatMap( application -> {
+                    pageIds[0] = application.getPages().get(0).getId();
+                    pageIds[1] = application.getPages().get(1).getId();
+                    pageIds[2] = application.getPages().get(2).getId();
+                    pageIds[3] = application.getPages().get(3).getId();
+                    return applicationPageService.reorderPage(application.getId(), application.getPages().get(3).getId(), 1);
+                });
+
+        StepVerifier
+                .create(applicationPageReOrdered)
+                .assertNext(application -> {
+                    final List<ApplicationPage> pages = application.getPages();
+                    assertThat(application.getPages().size()).isEqualTo(4);
+                    for(ApplicationPage page : pages) {
+                        if(pageIds[0].equals(page.getId())) {
+                            assertThat(page.getOrder()).isEqualTo(0);
+                        }
+                        if(pageIds[1].equals(page.getId())) {
+                            assertThat(page.getOrder()).isEqualTo(2);
+                        }
+                        if(pageIds[2].equals(page.getId())) {
+                            assertThat(page.getOrder()).isEqualTo(3);
+                        }
+                        if(pageIds[3].equals(page.getId())) {
+                            assertThat(page.getOrder()).isEqualTo(1);
+                        }
+                    }
+                } )
+                .verifyComplete();
+    }
+
+    @Test
+    @WithUserDetails(value ="api_user")
+    public void reOrderPageFromLowOrderToHighOrder() {
+
+        User apiUser = userService.findByEmail("api_user").block();
+        orgId = apiUser.getOrganizationIds().iterator().next();
+        Application newApp = new Application();
+        newApp.setName(UUID.randomUUID().toString());
+
+        application = applicationPageService.createApplication(newApp, orgId).block();
+        applicationId = application.getId();
+        final String[] pageIds = new String[4];
+
+        PageDTO testPage1 = new PageDTO();
+        testPage1.setName("Page2");
+        testPage1.setApplicationId(applicationId);
+        Mono<Application> applicationPageReOrdered = applicationPageService.createPage(testPage1)
+                .flatMap(pageDTO -> {
+                    PageDTO testPage = new PageDTO();
+                    testPage.setName("Page3");
+                    testPage.setApplicationId(applicationId);
+                    return applicationPageService.createPage(testPage);
+                })
+                .flatMap(pageDTO -> {
+                    PageDTO testPage = new PageDTO();
+                    testPage.setName("Page4");
+                    testPage.setApplicationId(applicationId);
+                    return applicationPageService.createPage(testPage);
+                })
+                .flatMap(pageDTO -> applicationService.getById(pageDTO.getApplicationId()))
+                .flatMap( application -> {
+                    pageIds[0] = application.getPages().get(0).getId();
+                    pageIds[1] = application.getPages().get(1).getId();
+                    pageIds[2] = application.getPages().get(2).getId();
+                    pageIds[3] = application.getPages().get(3).getId();
+                    return applicationPageService.reorderPage(application.getId(), application.getPages().get(0).getId(), 3);
+                });
+
+        StepVerifier
+                .create(applicationPageReOrdered)
+                .assertNext(application -> {
+                    final List<ApplicationPage> pages = application.getPages();
+                    assertThat(application.getPages().size()).isEqualTo(4);
+                    for(ApplicationPage page : pages) {
+                        if(pageIds[0].equals(page.getId())) {
+                            assertThat(page.getOrder()).isEqualTo(3);
+                        }
+                        if(pageIds[1].equals(page.getId())) {
+                            assertThat(page.getOrder()).isEqualTo(0);
+                        }
+                        if(pageIds[2].equals(page.getId())) {
+                            assertThat(page.getOrder()).isEqualTo(1);
+                        }
+                        if(pageIds[3].equals(page.getId())) {
+                            assertThat(page.getOrder()).isEqualTo(2);
+                        }
+                    }
+                } )
+                .verifyComplete();
+    }
 
     @After
     public void purgeAllPages() {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java
index cf314e6c3e..784e9a648a 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java
@@ -5,6 +5,7 @@ import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.UserData;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.repositories.AssetRepository;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,6 +27,7 @@ import reactor.test.StepVerifier;
 import reactor.util.function.Tuple2;
 
 import java.time.Duration;
+import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -167,4 +169,34 @@ public class UserDataServiceTest {
                 .verify();
     }
 
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testUpdateLastUsedOrgList_WhenListIsEmpty_orgIdPrepended() {
+        String sampleOrgId = "abcd";
+        final Mono<UserData> saveMono = userDataService.updateLastUsedOrgList(sampleOrgId);
+        StepVerifier.create(saveMono).assertNext(userData -> {
+            Assert.assertEquals(1, userData.getRecentlyUsedOrgIds().size());
+            Assert.assertEquals(sampleOrgId, userData.getRecentlyUsedOrgIds().get(0));
+        }).verifyComplete();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testUpdateLastUsedOrgList_WhenListIsNotEmpty_orgIdPrepended() {
+        // Set an initial list of org ids to the current user.
+        UserData changes = new UserData();
+        changes.setRecentlyUsedOrgIds(Arrays.asList("123", "456"));
+
+        final Mono<UserData> resultMono = userDataService.updateForCurrentUser(changes)
+                .flatMap(userData -> {
+                    // Now check whether a new org id is put at first.
+                    String sampleOrgId = "sample-org-id";
+                    return userDataService.updateLastUsedOrgList(sampleOrgId);
+                });
+
+        StepVerifier.create(resultMono).assertNext(userData -> {
+            Assert.assertEquals(3, userData.getRecentlyUsedOrgIds().size());
+            Assert.assertEquals("sample-org-id", userData.getRecentlyUsedOrgIds().get(0));
+        }).verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserOrganizationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserOrganizationServiceTest.java
new file mode 100644
index 0000000000..7d0066df46
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserOrganizationServiceTest.java
@@ -0,0 +1,184 @@
+package com.appsmith.server.services;
+
+import com.appsmith.server.acl.AppsmithRole;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.UserRole;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.repositories.OrganizationRepository;
+import com.appsmith.server.repositories.UserRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@DirtiesContext
+class UserOrganizationServiceTest {
+
+    @Autowired
+    private UserOrganizationService userOrganizationService;
+
+    @Autowired
+    private OrganizationRepository organizationRepository;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    private Organization organization;
+    private User user;
+
+    @BeforeEach
+    public void setup() {
+        Organization org = new Organization();
+        org.setName("Test org");
+
+        UserRole userRole = new UserRole();
+        userRole.setUsername("dummy_username");
+        userRole.setUserId("dummy_user_id");
+        userRole.setName("dummy_username");
+        userRole.setRoleName(AppsmithRole.ORGANIZATION_DEVELOPER.getName());
+        userRole.setRole(AppsmithRole.ORGANIZATION_DEVELOPER);
+
+        List<UserRole> userRoles = new ArrayList<>();
+        userRoles.add(userRole);
+        org.setUserRoles(userRoles);
+
+        this.organization = organizationRepository.save(org).block();
+    }
+
+    @AfterEach
+    public void clear() {
+        User currentUser = userRepository.findByEmail("api_user").block();
+        currentUser.getOrganizationIds().remove(organization.getId());
+        userRepository.save(currentUser);
+
+        organizationRepository.deleteById(organization.getId()).block();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    void leaveOrganization_WhenUserExistsInOrg_RemovesUser() {
+        User currentUser = userRepository.findByEmail("api_user").block();
+        Set<String> organizationIdsBefore = Set.copyOf(currentUser.getOrganizationIds());
+
+        List<UserRole> userRolesBeforeAddUser = List.copyOf(organization.getUserRoles());
+
+        currentUser.getOrganizationIds().add(organization.getId());
+        userRepository.save(currentUser).block();
+
+        UserRole userRole = new UserRole();
+        userRole.setUsername(currentUser.getUsername());
+        userRole.setUserId(currentUser.getId());
+        userRole.setName(currentUser.getName());
+        userRole.setRoleName(AppsmithRole.ORGANIZATION_DEVELOPER.getName());
+
+        Organization updatedOrganization = userOrganizationService.addUserToOrganizationGivenUserObject(
+                this.organization, currentUser, userRole
+        ).block();
+
+        Mono<User> userMono = userOrganizationService.leaveOrganization(this.organization.getId());
+        StepVerifier.create(userMono).assertNext(user -> {
+            assertEquals("api_user", user.getEmail());
+            assertEquals(organizationIdsBefore, user.getOrganizationIds());
+        }).verifyComplete();
+
+        StepVerifier.create(organizationRepository.findById(this.organization.getId())).assertNext(organization1 -> {
+            assertEquals(userRolesBeforeAddUser.size(), organization1.getUserRoles().size());
+        }).verifyComplete();
+
+        StepVerifier.create(userRepository.findByEmail("api_user")).assertNext(user1 -> {
+            assertFalse(
+                    "user's orgId list should not have left org id",
+                    user1.getOrganizationIds().contains(this.organization.getId())
+            );
+        }).verifyComplete();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    void leaveOrganization_WhenUserDoesNotExistInOrg_ThrowsException() {
+        Mono<User> userMono = userOrganizationService.leaveOrganization(this.organization.getId());
+        StepVerifier.create(userMono).expectErrorMessage(
+                AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.USER + " api_user in the organization", organization.getName())
+        ).verify();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void updateRoleForMember_WhenAdminRoleRemovedWithNoOtherAdmin_ThrowsExceptions() {
+        // add the current user as an admin to the organization first
+        User currentUser = userRepository.findByEmail("api_user").block();
+        UserRole userRole = new UserRole();
+        userRole.setUsername(currentUser.getUsername());
+        userRole.setRole(AppsmithRole.ORGANIZATION_DEVELOPER);
+        userRole.setRoleName(AppsmithRole.ORGANIZATION_ADMIN.getName());
+
+        userOrganizationService.addUserToOrganizationGivenUserObject(organization, currentUser, userRole).block();
+
+        // try to remove the user from org
+        UserRole updatedRole = new UserRole();
+        updatedRole.setUsername(currentUser.getUsername());
+
+        Mono<UserRole> userRoleMono = userOrganizationService.updateRoleForMember(organization.getId(), updatedRole, null);
+        StepVerifier.create(userRoleMono).expectErrorMessage(
+                AppsmithError.REMOVE_LAST_ORG_ADMIN_ERROR.getMessage()
+        ).verify();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void updateRoleForMember_WhenAdminRoleRemovedButOtherAdminExists_MemberRemoved() {
+        // add another admin role to the organization
+        UserRole adminRole = new UserRole();
+        adminRole.setUsername("dummy_username2");
+        adminRole.setUserId("dummy_user_id2");
+        adminRole.setName("dummy_username2");
+        adminRole.setRoleName(AppsmithRole.ORGANIZATION_ADMIN.getName());
+        adminRole.setRole(AppsmithRole.ORGANIZATION_ADMIN);
+        this.organization.getUserRoles().add(adminRole);
+
+        this.organization = organizationRepository.save(this.organization).block();
+
+        // add the current user as an admin to the organization
+        User currentUser = userRepository.findByEmail("api_user").block();
+        UserRole userRole = new UserRole();
+        userRole.setUsername(currentUser.getUsername());
+        userRole.setRole(AppsmithRole.ORGANIZATION_ADMIN);
+        userRole.setRoleName(AppsmithRole.ORGANIZATION_ADMIN.getName());
+
+        userOrganizationService.addUserToOrganizationGivenUserObject(organization, currentUser, userRole).block();
+
+        // try to remove the user from org
+        UserRole updatedRole = new UserRole();
+        updatedRole.setUsername(currentUser.getUsername());
+
+        Mono<UserRole> userRoleMono = userOrganizationService.updateRoleForMember(organization.getId(), updatedRole, null);
+        StepVerifier.create(userRoleMono).assertNext(
+                userRole1 -> {
+                    assertEquals(currentUser.getUsername(), userRole1.getUsername());
+                }
+        ).verifyComplete();
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java
index 642ed5cc70..a389563a4c 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java
@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -451,4 +452,22 @@ public class UserServiceTest {
                 .verifyComplete();
     }
 
+    @Test
+    public void createUserAndSendEmail_WhenUserExistsWithEmailInOtherCase_ThrowsException() {
+        User existingUser = new User();
+        existingUser.setEmail("abcd@gmail.com");
+        userRepository.save(existingUser).block();
+
+        User newUser = new User();
+        newUser.setEmail("abCd@gmail.com"); // same as above except c in uppercase
+        newUser.setSource(LoginSource.FORM);
+        newUser.setPassword("abcdefgh");
+        Mono<User> userAndSendEmail = userService.createUserAndSendEmail(newUser, null);
+
+        StepVerifier.create(userAndSendEmail)
+                .expectErrorMessage(
+                        AppsmithError.USER_ALREADY_EXISTS_SIGNUP.getMessage(existingUser.getEmail())
+                );
+    }
+
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java
new file mode 100644
index 0000000000..feca05e538
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java
@@ -0,0 +1,189 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.external.models.DatasourceStructure;
+import com.appsmith.external.models.DatasourceStructure.Column;
+import com.appsmith.external.models.DatasourceStructure.Key;
+import com.appsmith.external.models.DatasourceStructure.Table;
+import com.appsmith.external.models.DatasourceStructure.TableType;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.Datasource;
+import com.appsmith.server.domains.Layout;
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.dtos.CRUDPageResourceDTO;
+import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.MockPluginExecutor;
+import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.repositories.PluginRepository;
+import com.appsmith.server.services.ApplicationPageService;
+import com.appsmith.server.services.DatasourceService;
+import com.appsmith.server.services.OrganizationService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@DirtiesContext
+public class CreateDBTablePageSolutionTests {
+
+    @Autowired
+    CreateDBTablePageSolution solution;
+
+    @Autowired
+    OrganizationService organizationService;
+
+    @Autowired
+    DatasourceService datasourceService;
+
+    @Autowired
+    ApplicationPageService applicationPageService;
+
+    @Autowired
+    PluginRepository pluginRepository;
+
+    @MockBean
+    private PluginExecutorHelper pluginExecutorHelper;
+
+    CRUDPageResourceDTO resource = new CRUDPageResourceDTO();
+
+    Datasource testDatasource = new Datasource();
+
+    Organization testOrg;
+
+    Application testApp;
+
+    private Plugin postgreSQLPlugin;
+
+    @Before
+    @WithUserDetails(value = "api_user")
+    public void setup() {
+
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+        postgreSQLPlugin = pluginRepository.findByName("PostgreSQL").block();
+
+        Organization organization = new Organization();
+        organization.setName("Create-DB-Table-Page-Org");
+        testOrg = organizationService.create(organization).block();
+
+        Application testApplication = new Application();
+        testApplication.setName("DB-Table-Page-Test-Application");
+        testApplication.setOrganizationId(testOrg.getId());
+        testApp = applicationPageService.createApplication(testApplication, testOrg.getId()).block();
+
+        DatasourceStructure structure = new DatasourceStructure();
+        List<Key> keys = List.of(new DatasourceStructure.PrimaryKey("pKey", List.of("id")));
+        List<Column> columns = List.of(
+            new Column("testId", "type1", null),
+            new Column("testField1", "type2", null),
+            new Column("testField2", "type3", null)
+        );
+        List<Table> tables = List.of(new Table(TableType.TABLE, "", "sampleTable", columns, keys, new ArrayList<>()));
+        structure.setTables(tables);
+        testDatasource.setPluginId(postgreSQLPlugin.getId());
+        testDatasource.setOrganizationId(testOrg.getId());
+        testDatasource.setName("CRUD-Page-Table-DS");
+        testDatasource.setStructure(structure);
+        datasourceService.create(testDatasource).block();
+
+        resource.setTableName(testDatasource.getStructure().getTables().get(0).getName());
+        resource.setDatasourceId(testDatasource.getId());
+        resource.setColumns(Set.of("id", "field1", "field2", "field3"));
+
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void createPageWithInvalidApplicationIdTest() {
+        
+        Mono<PageDTO> resultMono = solution.createPageFromDBTable(testApp.getPages().get(0).getId(), resource);
+
+        StepVerifier
+            .create(resultMono)
+            .expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
+                throwable.getMessage().equals(AppsmithError.INVALID_PARAMETER.getMessage(FieldName.APPLICATION_ID)))
+            .verify();
+
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void createPageWithInvalidRequestBodyTest() {
+        Mono<PageDTO> resultMono = solution.createPageFromDBTable(testApp.getPages().get(0).getId(), new CRUDPageResourceDTO());
+
+        StepVerifier
+            .create(resultMono)
+            .expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
+                throwable.getMessage().equals(AppsmithError.INVALID_PARAMETER.getMessage(", tableName and datasourceId must be present")))
+            .verify();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void createPageWithNullPageId() {
+
+        resource.setApplicationId(testApp.getId());
+        Mono<PageDTO> resultMono = solution.createPageFromDBTable(null, resource);
+
+        StepVerifier
+            .create(resultMono)
+            .assertNext(page -> {
+                Layout layout = page.getLayouts().get(0);
+                assertThat(page.getName()).containsIgnoringCase("Admin Page:");
+                assertThat(page.getLayouts()).isNotEmpty();
+                assertThat(layout.getDsl()).isNotEmpty();
+                assertThat(layout.getLayoutOnLoadActions()).hasSize(1);
+                assertThat(layout.getId()).isNotNull();
+                assertThat(layout.getWidgetNames()).isNotEmpty();
+                assertThat(layout.getActionsUsedInDynamicBindings()).isNotEmpty();
+            })
+            .verifyComplete();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void createPageWithValidPageId() {
+
+        resource.setApplicationId(testApp.getId());
+        PageDTO newPage = new PageDTO();
+        newPage.setApplicationId(testApp.getId());
+        newPage.setName("crud-admin-page");
+
+        Mono<PageDTO> resultMono = applicationPageService.createPage(newPage)
+            .flatMap(savedPage -> solution.createPageFromDBTable(savedPage.getId(), resource));
+
+        StepVerifier
+            .create(resultMono)
+            .assertNext(page -> {
+                Layout layout = page.getLayouts().get(0);
+                assertThat(page.getName()).isEqualTo(newPage.getName());
+                assertThat(page.getLayouts()).isNotEmpty();
+                assertThat(layout.getDsl()).isNotEmpty();
+                assertThat(layout.getLayoutOnLoadActions()).hasSize(1);
+                assertThat(layout.getId()).isNotNull();
+                assertThat(layout.getWidgetNames()).isNotEmpty();
+                assertThat(layout.getActionsUsedInDynamicBindings()).isNotEmpty();
+            })
+            .verifyComplete();
+    }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EmailEventHandlerTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EmailEventHandlerTest.java
new file mode 100644
index 0000000000..e622720c72
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EmailEventHandlerTest.java
@@ -0,0 +1,272 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.server.acl.AppsmithRole;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.Comment;
+import com.appsmith.server.domains.CommentThread;
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.UserRole;
+import com.appsmith.server.events.CommentAddedEvent;
+import com.appsmith.server.events.CommentThreadClosedEvent;
+import com.appsmith.server.helpers.PolicyUtils;
+import com.appsmith.server.notifications.EmailSender;
+import com.appsmith.server.repositories.ApplicationRepository;
+import com.appsmith.server.repositories.OrganizationRepository;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+public class EmailEventHandlerTest {
+
+    private static final String COMMENT_ADDED_EMAIL_TEMPLATE = "email/commentAddedTemplate.html";
+
+    @MockBean
+    private ApplicationEventPublisher applicationEventPublisher;
+    @MockBean
+    private EmailSender emailSender;
+    @MockBean
+    private OrganizationRepository organizationRepository;
+    @MockBean
+    private ApplicationRepository applicationRepository;
+
+    @MockBean
+    private PolicyUtils policyUtils;
+
+    EmailEventHandler emailEventHandler;
+    private Application application;
+    private Organization organization;
+
+    String authorUserName = "abc";
+    String originHeader = "efg";
+    String applicationId = "application-id";
+    String organizationId = "organization-id";
+    String emailReceiverUsername = "email-receiver";
+
+    @Before
+    public void setUp() {
+        emailEventHandler = new EmailEventHandler(
+                applicationEventPublisher, emailSender, organizationRepository, applicationRepository, policyUtils
+        );
+        application = new Application();
+        application.setName("Test application for comment");
+        application.setOrganizationId(organizationId);
+        organization = new Organization();
+
+        // add a role with email receiver username
+        UserRole userRole = new UserRole();
+        userRole.setUsername(emailReceiverUsername);
+        userRole.setRole(AppsmithRole.ORGANIZATION_ADMIN);
+        organization.setUserRoles(List.of(userRole));
+
+        Mockito.when(applicationRepository.findById(applicationId)).thenReturn(Mono.just(application));
+        Mockito.when(organizationRepository.findById(organizationId)).thenReturn(Mono.just(organization));
+    }
+
+    @Test
+    public void publish_CommentProvidedWithSubscriber_ReturnsTrue() {
+        Comment comment = new Comment();
+        Set<String> subscribers = Set.of("dummy-username1");
+        CommentAddedEvent commentAddedEvent = new CommentAddedEvent(
+                authorUserName, organization, application, originHeader, comment, subscribers
+        );
+
+        Mockito.doNothing().when(applicationEventPublisher).publishEvent(commentAddedEvent);
+
+        Mono<Boolean> booleanMono = emailEventHandler.publish(
+                authorUserName, applicationId, comment, originHeader, subscribers
+        );
+        StepVerifier.create(booleanMono).assertNext(aBoolean -> {
+            Assert.assertEquals(Boolean.TRUE, aBoolean);
+        }).verifyComplete();
+    }
+
+    @Test
+    public void publish_CommentProvidedSubscriberIsNull_ReturnsFalse() {
+        Mono<Boolean> booleanMono = emailEventHandler.publish(
+                authorUserName, applicationId, new Comment(), originHeader, null
+        );
+        StepVerifier.create(booleanMono).assertNext(aBoolean -> {
+            Assert.assertEquals(Boolean.FALSE, aBoolean);
+        }).verifyComplete();
+    }
+
+    @Test
+    public void publish_CommentProvidedSubscriberIsEmpty_ReturnsFalse() {
+        Mono<Boolean> booleanMono = emailEventHandler.publish(
+                authorUserName, applicationId, new Comment(), originHeader, Set.of()
+        );
+        StepVerifier.create(booleanMono).assertNext(aBoolean -> {
+            Assert.assertEquals(Boolean.FALSE, aBoolean);
+        }).verifyComplete();
+    }
+
+    @Test
+    public void publish_WhenCommentThreadHasNoPublishersProvided_ReturnsFalse() {
+        CommentThread commentThread = new CommentThread();
+        CommentThreadClosedEvent commentThreadClosedEvent = new CommentThreadClosedEvent(
+                authorUserName, organization, application, originHeader, commentThread
+        );
+        Mockito.doNothing().when(applicationEventPublisher).publishEvent(commentThreadClosedEvent);
+
+        Mono<Boolean> booleanMono = emailEventHandler.publish(authorUserName, applicationId, commentThread, originHeader);
+        StepVerifier.create(booleanMono).assertNext(aBoolean -> {
+            Assert.assertEquals(Boolean.FALSE, aBoolean);
+        }).verifyComplete();
+    }
+
+    @Test
+    public void publish_WhenCommentThreadHasPublishersProvided_ReturnsTrue() {
+        CommentThread commentThread = new CommentThread();
+        commentThread.setSubscribers(Set.of("abc"));
+        CommentThreadClosedEvent commentThreadClosedEvent = new CommentThreadClosedEvent(
+                authorUserName, organization, application, originHeader, commentThread
+        );
+        Mockito.doNothing().when(applicationEventPublisher).publishEvent(commentThreadClosedEvent);
+
+        Mono<Boolean> booleanMono = emailEventHandler.publish(authorUserName, applicationId, commentThread, originHeader);
+        StepVerifier.create(booleanMono).assertNext(aBoolean -> {
+            Assert.assertEquals(Boolean.TRUE, aBoolean);
+        }).verifyComplete();
+    }
+
+    @Test
+    public void handle_WhenValidCommentAddedEvent_SendEmailCalled() {
+        Comment sampleComment = new Comment();
+        sampleComment.setAuthorUsername(authorUserName);
+        sampleComment.setAuthorName("Test Author");
+        sampleComment.setApplicationName(application.getName());
+        Set<String> subscribers = Set.of(emailReceiverUsername);
+
+        // send the event
+        CommentAddedEvent commentAddedEvent = new CommentAddedEvent(
+                authorUserName, organization, application, originHeader, sampleComment, subscribers
+        );
+        emailEventHandler.handle(commentAddedEvent);
+
+        String expectedEmailSubject = String.format(
+                "New comment from %s in %s", sampleComment.getAuthorName(), application.getName()
+        );
+        // check email sender was called with expected template and subject
+        Mockito.verify(emailSender, Mockito.times(1)).sendMail(
+                eq(emailReceiverUsername), eq(expectedEmailSubject), eq(COMMENT_ADDED_EMAIL_TEMPLATE), Mockito.anyMap()
+        );
+    }
+
+    @Test
+    public void handle_WhenSubscriberDoesNotMatch_SendEmailNotCalled() {
+        Comment sampleComment = new Comment();
+        sampleComment.setAuthorUsername(authorUserName);
+        sampleComment.setAuthorName("Test Author");
+        Set<String> subscribers = Set.of("test-subscriber-1");
+
+        // send the event
+        CommentAddedEvent commentAddedEvent = new CommentAddedEvent(
+                authorUserName, organization, application, originHeader, sampleComment, subscribers
+        );
+        emailEventHandler.handle(commentAddedEvent);
+
+        String expectedEmailSubject = String.format(
+                "New comment from %s in %s", sampleComment.getAuthorName(), application.getName()
+        );
+        // check email sender was called with expected template and subject
+        Mockito.verify(emailSender, Mockito.times(0)).sendMail(
+                anyString(), anyString(), anyString(), Mockito.anyMap()
+        );
+    }
+
+    private Map<String, Comment.Entity> createEntityMapForUsers(List<String> mentionedUserNames) {
+        Map<String, Comment.Entity> entityMap = new HashMap<>();
+        for (String username: mentionedUserNames) {
+            Comment.EntityData.EntityUser entityUser = new Comment.EntityData.EntityUser();
+            entityUser.setUsername(username);
+            Comment.EntityData.Mention mention = new Comment.EntityData.Mention();
+            mention.setUser(entityUser);
+
+            Comment.EntityData entityData = new Comment.EntityData();
+            entityData.setMention(mention);
+
+            Comment.Entity entity = new Comment.Entity();
+            entity.setType("mention");
+            entity.setData(entityData);
+            entityMap.put(username, entity);
+        }
+        return entityMap;
+    }
+
+    @Test
+    public void handle_WhenUserMentionedEvent_ReturnsTrue() {
+        Comment sampleComment = new Comment();
+        sampleComment.setAuthorUsername(authorUserName);
+        sampleComment.setAuthorName("Test Author");
+        sampleComment.setApplicationId("test-app-id");
+        sampleComment.setPageId("test-page-id");
+        sampleComment.setThreadId("test-thread-id");
+        Set<String> subscribers = Set.of(emailReceiverUsername);
+
+        // mention the emailReceiverUsername in the sample comment
+        Map<String, Comment.Entity> entityMap = createEntityMapForUsers(List.of(emailReceiverUsername));
+        Comment.Body body = new Comment.Body();
+        body.setEntityMap(entityMap);
+        sampleComment.setBody(body);
+
+        // send the event
+        CommentAddedEvent commentAddedEvent = new CommentAddedEvent(
+                authorUserName, organization, application, originHeader, sampleComment, subscribers
+        );
+        emailEventHandler.handle(commentAddedEvent);
+
+        // check if expectation meets
+        String expectedEmailSubject = String.format("New comment for you from %s", sampleComment.getAuthorName());
+
+        // check email sender was called with expected template and subject
+        Mockito.verify(emailSender, Mockito.times(1)).sendMail(
+                eq(emailReceiverUsername), eq(expectedEmailSubject), eq(COMMENT_ADDED_EMAIL_TEMPLATE), Mockito.anyMap()
+        );
+    }
+
+    @Test
+    public void handle_WhenThreadClosed_ReturnsTrue() {
+        // add comment thread with a resolved state where resolver is `authorUserName`
+        String resolverName = "Test Author";
+        CommentThread.CommentThreadState resolveState = new CommentThread.CommentThreadState();
+        resolveState.setAuthorUsername(authorUserName);
+        resolveState.setAuthorName(resolverName);
+        resolveState.setActive(true);
+
+        CommentThread commentThread = new CommentThread();
+        commentThread.setResolvedState(resolveState);
+        commentThread.setSubscribers(Set.of(emailReceiverUsername));
+        commentThread.setApplicationName(application.getName());
+
+        // send the event
+        CommentThreadClosedEvent commentAddedEvent = new CommentThreadClosedEvent(
+                authorUserName, organization, application, originHeader, commentThread
+        );
+        emailEventHandler.handle(commentAddedEvent);
+
+        // check if expectation meets
+        String expectedEmailSubject = String.format(
+                "%s has resolved comment in %s", resolveState.getAuthorName(), application.getName()
+        );
+        // check email sender was called with expected template and subject
+        Mockito.verify(emailSender, Mockito.times(1)).sendMail(
+                eq(emailReceiverUsername), eq(expectedEmailSubject), eq(COMMENT_ADDED_EMAIL_TEMPLATE), Mockito.anyMap()
+        );
+    }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java
index ee49e1c7a6..c11deb3dcb 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java
@@ -1,5 +1,6 @@
 package com.appsmith.server.solutions;
 
+import com.appsmith.server.configurations.InstanceConfig;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.Organization;
 import com.appsmith.server.services.ApplicationPageService;
@@ -13,6 +14,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.test.context.support.WithUserDetails;
@@ -51,6 +53,9 @@ public class ExampleApplicationsAreMarked {
     @MockBean
     private ConfigService configService;
 
+    @MockBean
+    private InstanceConfig instanceConfig;
+
     @Test
     @WithUserDetails(value = "api_user")
     public void exampleApplicationsAreMarked() {
@@ -66,7 +71,9 @@ public class ExampleApplicationsAreMarked {
 
                     assert organization.getId() != null;
                     Mockito.when(configService.getTemplateOrganizationId()).thenReturn(Mono.just(organization.getId()));
-
+                    Mockito.doNothing().when(instanceConfig).onApplicationEvent(
+                            Mockito.any(ApplicationReadyEvent.class)
+                    );
                     // Create 4 applications inside the example organization but only mark three applications as example
                     final Application app1 = new Application();
                     app1.setName("first application");
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExamplesOrganizationClonerTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExamplesOrganizationClonerTests.java
index b0b16354fd..32d438ee0f 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExamplesOrganizationClonerTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExamplesOrganizationClonerTests.java
@@ -473,6 +473,7 @@ public class ExamplesOrganizationClonerTests {
                     final Datasource ds1 = new Datasource();
                     ds1.setName("datasource 1");
                     ds1.setOrganizationId(organization.getId());
+                    ds1.setPluginId(installedPlugin.getId());
                     final DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
                     ds1.setDatasourceConfiguration(datasourceConfiguration);
                     datasourceConfiguration.setUrl("http://httpbin.org/get");
@@ -483,6 +484,7 @@ public class ExamplesOrganizationClonerTests {
                     final Datasource ds2 = new Datasource();
                     ds2.setName("datasource 2");
                     ds2.setOrganizationId(organization.getId());
+                    ds2.setPluginId(installedPlugin.getId());
                     ds2.setDatasourceConfiguration(new DatasourceConfiguration());
                     DBAuth auth = new DBAuth();
                     auth.setPassword("answer-to-life");
@@ -797,6 +799,7 @@ public class ExamplesOrganizationClonerTests {
                             Connection.Type.DIRECT,
                             new SSLDetails(
                                     SSLDetails.AuthType.ALLOW,
+                                    SSLDetails.CACertificateType.NONE,
                                     new UploadedFile("keyFile", "key file content"),
                                     new UploadedFile("certFile", "cert file content"),
                                     new UploadedFile("caCertFile", "caCert file content"),
@@ -851,7 +854,9 @@ public class ExamplesOrganizationClonerTests {
                             Set.of(
                                     new Property("custom token param 1", "custom token param value 1"),
                                     new Property("custom token param 2", "custom token param value 2")
-                            )
+                            ),
+                            null,
+                            null
                     ));
 
                     final Datasource ds3 = new Datasource();
@@ -929,7 +934,8 @@ public class ExamplesOrganizationClonerTests {
                                         .thenReturn(targetOrg1);
                             });
                 })
-                .flatMap(this::loadOrganizationData);
+                .flatMap(this::loadOrganizationData)
+                .doOnError(error -> log.error("Error in test", error));
 
         StepVerifier.create(resultMono)
                 .assertNext(data -> {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
new file mode 100644
index 0000000000..f788a28a36
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
@@ -0,0 +1,543 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.DecryptedSensitiveFields;
+import com.appsmith.external.models.Policy;
+import com.appsmith.external.models.Property;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.ApplicationJson;
+import com.appsmith.server.domains.ApplicationPage;
+import com.appsmith.server.domains.Datasource;
+import com.appsmith.server.domains.Layout;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.domains.PluginType;
+import com.appsmith.server.dtos.ActionDTO;
+import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.MockPluginExecutor;
+import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.repositories.NewPageRepository;
+import com.appsmith.server.repositories.PluginRepository;
+import com.appsmith.server.services.ApplicationPageService;
+import com.appsmith.server.services.ApplicationService;
+import com.appsmith.server.services.DatasourceService;
+import com.appsmith.server.services.LayoutActionService;
+import com.appsmith.server.services.NewActionService;
+import com.appsmith.server.services.NewPageService;
+import com.appsmith.server.services.OrganizationService;
+import com.appsmith.server.services.SessionUserService;
+import com.appsmith.server.services.UserService;
+import lombok.extern.slf4j.Slf4j;
+import net.minidev.json.JSONArray;
+import net.minidev.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.core.io.buffer.DefaultDataBufferFactory;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.codec.multipart.FilePart;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.LinkedMultiValueMap;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.appsmith.server.acl.AclPermission.EXPORT_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
+import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
+import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
+import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.READ_PAGES;
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@DirtiesContext
+public class ImportExportApplicationServiceTests {
+
+    @Autowired
+    private ImportExportApplicationService importExportApplicationService;
+
+    @Autowired
+    private ApplicationPageService applicationPageService;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private PluginRepository pluginRepository;
+
+    @Autowired
+    private ApplicationService applicationService;
+
+    @Autowired
+    private DatasourceService datasourceService;
+
+    @Autowired
+    private NewPageService newPageService;
+
+    @Autowired
+    private NewActionService newActionService;
+    
+    @Autowired
+    private OrganizationService organizationService;
+
+    @Autowired
+    private SessionUserService sessionUserService;
+
+    @Autowired
+    private LayoutActionService layoutActionService;
+    
+    @Autowired
+    private NewPageRepository newPageRepository;
+
+    @MockBean
+    private PluginExecutorHelper pluginExecutorHelper;
+    
+    private String invalid_json_file;
+    private Plugin installedPlugin;
+    private String orgId;
+    private String testAppId;
+    private Map<String, Datasource> datasourceMap = new HashMap<>();
+    
+    private Flux<ActionDTO> getActionsInApplication(Application application) {
+        return newPageService
+                // fetch the unpublished pages
+                .findByApplicationId(application.getId(), READ_PAGES, false)
+                .flatMap(page -> newActionService.getUnpublishedActions(new LinkedMultiValueMap<>(
+                        Map.of(FieldName.PAGE_ID, Collections.singletonList(page.getId())))));
+    }
+
+    @Before
+    @WithUserDetails(value = "api_user")
+    public void setup() {
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+        installedPlugin = pluginRepository.findByPackageName("installed-plugin").block();
+
+        Organization organization = new Organization();
+        organization.setName("Import-Export-Test-Organization");
+        Organization savedOrganization = organizationService.create(organization).block();
+        orgId = savedOrganization.getId();
+
+        Application testApplication = new Application();
+        testApplication.setName("Export-Application-Test-Application");
+        testApplication.setOrganizationId(orgId);
+        Application savedApplication = applicationPageService.createApplication(testApplication, orgId).block();
+        testAppId = savedApplication.getId();
+
+        invalid_json_file = importExportApplicationService.INVALID_JSON_FILE;
+
+        Datasource ds1 = new Datasource();
+        ds1.setName("DS1");
+        ds1.setOrganizationId(orgId);
+        ds1.setPluginId(installedPlugin.getId());
+        final DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+        ds1.setDatasourceConfiguration(datasourceConfiguration);
+        datasourceConfiguration.setUrl("http://httpbin.org/get");
+        datasourceConfiguration.setHeaders(List.of(
+                new Property("X-Answer", "42")
+        ));
+
+        final Datasource ds2 = new Datasource();
+        ds2.setName("DS2");
+        ds2.setPluginId(installedPlugin.getId());
+        ds2.setDatasourceConfiguration(new DatasourceConfiguration());
+        DBAuth auth = new DBAuth();
+        auth.setPassword("awesome-password");
+        ds2.getDatasourceConfiguration().setAuthentication(auth);
+
+        datasourceMap.put("DS1", ds1);
+        datasourceMap.put("DS2", ds2);
+    }
+    
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void exportApplicationWithNullApplicationIdTest() {
+        Mono<ApplicationJson> resultMono = importExportApplicationService.exportApplicationById(null);
+        
+        StepVerifier
+            .create(resultMono)
+            .expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
+                throwable.getMessage().equals(AppsmithError.INVALID_PARAMETER.getMessage(FieldName.APPLICATION_ID)))
+            .verify();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void createExportAppJsonWithoutActionsAndDatasourceTest() {
+
+        final Mono<ApplicationJson> resultMono = importExportApplicationService.exportApplicationById(testAppId);
+
+        StepVerifier.create(resultMono)
+                .assertNext(applicationJson -> {
+                    Application exportedApp = applicationJson.getExportedApplication();
+                    List<NewPage> pageList = applicationJson.getPageList();
+                    List<NewAction> actionList = applicationJson.getActionList();
+                    List<Datasource> datasourceList = applicationJson.getDatasourceList();
+
+                    NewPage defaultPage = pageList.get(0);
+
+                    assertThat(exportedApp.getId()).isNull();
+                    assertThat(exportedApp.getOrganizationId()).isNull();
+                    assertThat(exportedApp.getPages()).isNull();
+                    assertThat(exportedApp.getPolicies().size()).isEqualTo(0);
+                    assertThat(exportedApp.getUserPermissions()).contains(EXPORT_APPLICATIONS.getValue());
+
+                    assertThat(pageList.isEmpty()).isFalse();
+                    assertThat(defaultPage.getApplicationId()).isNull();
+                    assertThat(defaultPage.getUnpublishedPage().getLayouts().get(0).getLayoutOnLoadActions()).isNull();
+
+                    assertThat(actionList.isEmpty()).isTrue();
+
+                    assertThat(datasourceList.isEmpty()).isTrue();
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void createExportAppJsonWithDatasourceButWithoutActionsTest() {
+
+        Application testApplication = new Application();
+        testApplication.setName("Another Export Application");
+
+        final Mono<ApplicationJson> resultMono = organizationService.getById(orgId)
+                .flatMap(organization -> {
+
+                    final Datasource ds1 = datasourceMap.get("DS1");
+                    ds1.setOrganizationId(organization.getId());
+
+                    final Datasource ds2 = datasourceMap.get("DS2");
+                    ds2.setOrganizationId(organization.getId());
+
+                    return Mono.zip(
+                            datasourceService.create(ds1),
+                            datasourceService.create(ds2),
+                            applicationPageService.createApplication(testApplication, orgId)
+                    );
+                })
+                .flatMap(tuple -> importExportApplicationService.exportApplicationById(tuple.getT3().getId()));
+
+        StepVerifier.create(resultMono)
+                .assertNext(applicationJson -> {
+
+                    assertThat(applicationJson.getPageList()).hasSize(1);
+                    assertThat(applicationJson.getActionList()).isEmpty();
+                    assertThat(applicationJson.getDatasourceList()).isEmpty();
+                    assertThat(applicationJson.getDecryptedFields()).isEmpty();
+                })
+                .verifyComplete();
+    }
+    
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void createExportAppJsonWithActionsAndDatasourceTest() {
+        
+        Organization newOrganization = new Organization();
+        newOrganization.setName("template-org-with-ds");
+        
+        Application testApplication = new Application();
+        testApplication.setName("ApplicationWithActionsAndDatasource");
+
+        final Mono<ApplicationJson> resultMono = organizationService.create(newOrganization)
+                .zipWhen(org -> applicationPageService.createApplication(testApplication, org.getId()))
+                .flatMap(tuple -> {
+
+                    Organization organization = tuple.getT1();
+                    Application testApp = tuple.getT2();
+
+                    final Datasource ds1 = datasourceMap.get("DS1");
+                    ds1.setOrganizationId(organization.getId());
+
+                    final Datasource ds2 = datasourceMap.get("DS2");
+                    ds2.setOrganizationId(organization.getId());
+
+                    final String pageId = testApp.getPages().get(0).getId();
+
+                    return Mono.zip(
+                            datasourceService.create(ds1),
+                            datasourceService.create(ds2),
+                            Mono.just(testApp),
+                            newPageService.findPageById(pageId, READ_PAGES, false)
+                    );
+                })
+                .flatMap(tuple -> {
+
+                    Datasource ds1 = tuple.getT1();
+                    Datasource ds2 = tuple.getT2();
+                    Application testApp = tuple.getT3();
+                    PageDTO testPage = tuple.getT4();
+
+                    Layout layout = testPage.getLayouts().get(0);
+                    JSONObject dsl = new JSONObject(Map.of("text", "{{ query1.data }}"));
+
+                    JSONObject dsl2 = new JSONObject();
+                    dsl2.put("widgetName", "Table1");
+                    dsl2.put("type", "TABLE_WIDGET");
+                    Map<String, Object> primaryColumns = new HashMap<>();
+                    JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
+                    primaryColumns.put("_id", "{{ query1.data }}");
+                    primaryColumns.put("_class", jsonObject);
+                    dsl2.put("primaryColumns", primaryColumns);
+                    final ArrayList<Object> objects = new ArrayList<>();
+                    JSONArray temp2 = new JSONArray();
+                    temp2.addAll(List.of(new JSONObject(Map.of("key", "primaryColumns._id"))));
+                    dsl2.put("dynamicBindingPathList", temp2);
+                    objects.add(dsl2);
+                    dsl.put("children", objects);
+
+                    layout.setDsl(dsl);
+                    layout.setPublishedDsl(dsl);
+
+                    ActionDTO action = new ActionDTO();
+                    action.setName("validAction");
+                    action.setPageId(testPage.getId());
+                    action.setExecuteOnLoad(true);
+                    ActionConfiguration actionConfiguration = new ActionConfiguration();
+                    actionConfiguration.setHttpMethod(HttpMethod.GET);
+                    action.setActionConfiguration(actionConfiguration);
+                    action.setDatasource(ds2);
+
+                    return layoutActionService.createAction(action)
+                            .flatMap(createdAction -> newActionService.findById(createdAction.getId(), READ_ACTIONS))
+                            .flatMap(newAction -> newActionService.generateActionByViewMode(newAction, false))
+                            .then(importExportApplicationService.exportApplicationById(testApp.getId()));
+                });
+
+        StepVerifier
+                .create(resultMono)
+                .assertNext(applicationJson -> {
+
+                    Application exportedApp = applicationJson.getExportedApplication();
+                    List<NewPage> pageList = applicationJson.getPageList();
+                    List<NewAction> actionList = applicationJson.getActionList();
+                    List<Datasource> datasourceList = applicationJson.getDatasourceList();
+
+                    NewPage defaultPage = pageList.get(0);
+
+                    assertThat(exportedApp.getName()).isEqualTo(testApplication.getName());
+                    assertThat(exportedApp.getOrganizationId()).isNull();
+                    assertThat(exportedApp.getPages()).isNull();
+                    
+                    assertThat(exportedApp.getPolicies()).hasSize(0);
+
+                    assertThat(pageList).hasSize(1);
+                    assertThat(defaultPage.getApplicationId()).isNull();
+                    assertThat(defaultPage.getUnpublishedPage().getLayouts().get(0).getDsl()).isNotNull();
+                    assertThat(defaultPage.getId()).isNull();
+                    assertThat(defaultPage.getPolicies()).isEmpty();
+
+                    assertThat(actionList.isEmpty()).isFalse();
+                    NewAction validAction = actionList.get(0);
+                    assertThat(validAction.getApplicationId()).isNull();
+                    assertThat(validAction.getPluginId()).isEqualTo(installedPlugin.getPackageName());
+                    assertThat(validAction.getPluginType()).isEqualTo(PluginType.API);
+                    assertThat(validAction.getOrganizationId()).isNull();
+                    assertThat(validAction.getPolicies()).isNull();
+                    assertThat(validAction.getId()).isNotNull();
+                    assertThat(validAction.getUnpublishedAction().getPageId())
+                            .isEqualTo(defaultPage.getUnpublishedPage().getName());
+
+                    assertThat(datasourceList).hasSize(1);
+                    Datasource datasource = datasourceList.get(0);
+                    assertThat(datasource.getOrganizationId()).isNull();
+                    assertThat(datasource.getId()).isNull();
+                    assertThat(datasource.getPluginId()).isEqualTo(installedPlugin.getPackageName());
+                    assertThat(datasource.getDatasourceConfiguration().getAuthentication()).isNull();
+
+                    DecryptedSensitiveFields decryptedFields =
+                            applicationJson.getDecryptedFields().get(datasource.getName());
+
+                    DBAuth auth = (DBAuth) datasourceMap.get("DS2").getDatasourceConfiguration().getAuthentication();
+                    assertThat(decryptedFields.getAuthType()).isEqualTo(auth.getClass().getName());
+                    assertThat(decryptedFields.getPassword()).isEqualTo("awesome-password");
+
+                    assertThat(applicationJson.getUnpublishedLayoutmongoEscapedWidgets()).isNotEmpty();
+                    assertThat(applicationJson.getPublishedLayoutmongoEscapedWidgets()).isNotEmpty();
+                })
+                .verifyComplete();
+    }
+    
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void importApplicationFromInvalidFileTest() {
+        FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
+        Flux<DataBuffer> dataBufferFlux = DataBufferUtils
+                .read(new ClassPathResource("test_assets/OrganizationServiceTest/my_organization_logo.png"), new DefaultDataBufferFactory(), 4096)
+                .cache();
+
+        Mockito.when(filepart.content()).thenReturn(dataBufferFlux);
+        Mockito.when(filepart.headers().getContentType()).thenReturn(MediaType.IMAGE_PNG);
+
+        Mono<Application> resultMono = importExportApplicationService.extractFileAndSaveApplication(orgId, filepart);
+
+        StepVerifier
+                .create(resultMono)
+                .expectErrorMatches(error -> error instanceof AppsmithException)
+                .verify();
+    }
+    
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void importApplicationWithNullOrganizationIdTest() {
+        FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
+        
+        Mono<Application> resultMono = importExportApplicationService
+            .extractFileAndSaveApplication(null, filepart);
+        
+        StepVerifier
+            .create(resultMono)
+            .expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
+                throwable.getMessage().equals(AppsmithError.INVALID_PARAMETER.getMessage(FieldName.ORGANIZATION_ID)))
+            .verify();
+    }
+    
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void importApplicationFromInvalidJsonFileWithoutPagesTest() {
+        
+        FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/invalid-json-without-pages.json");
+        Mono<Application> resultMono = importExportApplicationService.extractFileAndSaveApplication(orgId,filePart);
+        
+        StepVerifier
+            .create(resultMono)
+            .expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
+                throwable.getMessage().equals(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.PAGES, invalid_json_file)))
+            .verify();
+    }
+    
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void importApplicationFromInvalidJsonFileWithoutApplicationTest() {
+        
+        FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/invalid-json-without-app.json");
+        Mono<Application> resultMono = importExportApplicationService.extractFileAndSaveApplication(orgId,filePart);
+        
+        StepVerifier
+            .create(resultMono)
+            .expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
+                throwable.getMessage().equals(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.APPLICATION, invalid_json_file)))
+            .verify();
+    }
+    
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void importApplicationFromValidJsonFileTest() {
+        
+        FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application.json");
+    
+        Organization newOrganization = new Organization();
+        newOrganization.setName("Template Organization");
+    
+        Policy manageAppPolicy = Policy.builder().permission(MANAGE_APPLICATIONS.getValue())
+            .users(Set.of("api_user"))
+            .build();
+        Policy readAppPolicy = Policy.builder().permission(READ_APPLICATIONS.getValue())
+            .users(Set.of("api_user"))
+            .build();
+    
+        final Mono<Application> resultMono = organizationService
+            .create(newOrganization)
+            .flatMap(organization -> importExportApplicationService
+                .extractFileAndSaveApplication(organization.getId(), filePart)
+            );
+        
+        StepVerifier
+            .create(resultMono
+                .flatMap(application -> Mono.zip(
+                    Mono.just(application),
+                    datasourceService.findAllByOrganizationId(application.getOrganizationId(), MANAGE_DATASOURCES).collectList(),
+                    getActionsInApplication(application).collectList(),
+                    newPageService.findByApplicationId(application.getId(), MANAGE_PAGES, false).collectList()
+                )))
+            .assertNext(tuple -> {
+                final Application application = tuple.getT1();
+                final List<Datasource> datasourceList = tuple.getT2();
+                final List<ActionDTO> actionDTOS = tuple.getT3();
+                final List<PageDTO> pageList = tuple.getT4();
+                
+                assertThat(application.getName()).isEqualTo("valid_application");
+                assertThat(application.getOrganizationId()).isNotNull();
+                assertThat(application.getPages()).isNotEmpty();
+                assertThat(application.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
+                
+                assertThat(datasourceList).isNotEmpty();
+                datasourceList.forEach(datasource -> {
+                    assertThat(datasource.getOrganizationId()).isEqualTo(application.getOrganizationId());
+                    if (datasource.getName().contains("wo-auth")) {
+                        assertThat(datasource.getDatasourceConfiguration().getAuthentication()).isNull();
+                    } else if (datasource.getName().contains("db")) {
+                        DBAuth auth = (DBAuth) datasource.getDatasourceConfiguration().getAuthentication();
+                        assertThat(auth).isNotNull();
+                        assertThat(auth.getPassword()).isNotNull();
+                        assertThat(auth.getUsername()).isNotNull();
+                    }
+                });
+                
+                assertThat(actionDTOS).isNotEmpty();
+                actionDTOS.forEach(actionDTO -> {
+                    assertThat(actionDTO.getPageId()).isNotEqualTo(pageList.get(0).getName());
+                    
+                });
+                
+                assertThat(pageList).isNotEmpty();
+    
+                ApplicationPage defaultAppPage = application.getPages()
+                    .stream()
+                    .filter(ApplicationPage::getIsDefault)
+                    .findFirst()
+                    .orElse(null);
+                assertThat(defaultAppPage).isNotNull();
+    
+                PageDTO defaultPageDTO = pageList.stream()
+                    .filter(pageDTO -> pageDTO.getId().equals(defaultAppPage.getId())).findFirst().orElse(null);
+    
+                assertThat(defaultPageDTO).isNotNull();
+                assertThat(defaultPageDTO.getLayouts().get(0).getLayoutOnLoadActions()).isNotEmpty();
+            })
+            .verifyComplete();
+    }
+    
+    private FilePart createFilePart(String filePath) {
+        FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
+        Flux<DataBuffer> dataBufferFlux = DataBufferUtils
+            .read(
+                new ClassPathResource(filePath),
+                new DefaultDataBufferFactory(),
+                4096)
+            .cache();
+    
+        Mockito.when(filepart.content()).thenReturn(dataBufferFlux);
+        Mockito.when(filepart.headers().getContentType()).thenReturn(MediaType.APPLICATION_JSON);
+    
+        return filepart;
+    
+    }
+    
+}
diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/invalid-json-without-app.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/invalid-json-without-app.json
new file mode 100644
index 0000000000..2c91f465bf
--- /dev/null
+++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/invalid-json-without-app.json
@@ -0,0 +1,18 @@
+{
+    "datasourceList": [],
+    "pageList": [
+      {
+        "applicationId": "test_app"
+      }
+    ],
+    "actionList": [
+      {
+        "id": "randomId",
+        "userPermissions": [],
+        "unpublishedAction": {},
+        "publishedAction": {}
+      }
+    ],
+    "decryptedFields": {},
+    "mongoEscapedWidgets": {}
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/invalid-json-without-pages.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/invalid-json-without-pages.json
new file mode 100644
index 0000000000..2918b2bea0
--- /dev/null
+++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/invalid-json-without-pages.json
@@ -0,0 +1,12 @@
+{
+    "exportedApplication": {},
+    "datasourceList": [],
+    "pageList": [],
+    "actionList": [
+      {
+        "id": "randomId"
+      }
+    ],
+    "decryptedFields": {},
+    "mongoEscapedWidgets": {}
+}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json
new file mode 100644
index 0000000000..8572858c94
--- /dev/null
+++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json
@@ -0,0 +1,505 @@
+{
+    "exportedApplication": {
+      "userPermissions": [
+        "canComment:applications",
+        "manage:applications",
+        "read:applications",
+        "publish:applications",
+        "makePublic:applications"
+      ],
+      "name": "valid_application",
+      "isPublic": false,
+      "appIsExample": false,
+      "color": "#EA6179",
+      "icon": "medical",
+      "new": true
+    },
+    "datasourceList": [
+      {
+        "userPermissions": [
+          "execute:datasources",
+          "manage:datasources",
+          "read:datasources"
+        ],
+        "name": "db-auth",
+        "pluginId": "mongo-plugin",
+        "datasourceConfiguration": {
+          "connection": {
+            "mode": "READ_WRITE",
+            "type": "REPLICA_SET",
+            "ssl": {
+              "authType": "DEFAULT"
+            }
+          },
+          "endpoints": [
+            {
+              "host": "db-auth-uri.net"
+            }
+          ],
+          "sshProxyEnabled": false,
+          "properties": [
+            {
+              "key": "Use Mongo Connection String URI",
+              "value": "No"
+            }
+          ]
+        },
+        "invalids": [],
+        "isValid": true,
+        "new": true
+      },
+      {
+        "userPermissions": [
+          "execute:datasources",
+          "manage:datasources",
+          "read:datasources"
+        ],
+        "name": "api_ds_wo_auth",
+        "pluginId": "restapi-plugin",
+        "datasourceConfiguration": {
+          "sshProxyEnabled": false,
+          "properties": [
+            {
+              "key": "isSendSessionEnabled",
+              "value": "N"
+            },
+            {
+              "key": "sessionSignatureKey",
+              "value": ""
+            }
+          ],
+          "url": "https://api-ds-wo-auth-uri.com",
+          "headers": []
+        },
+        "invalids": [],
+        "isValid": true,
+        "new": true
+      }
+    ],
+    "pageList": [
+      {
+        "userPermissions": [
+          "read:pages",
+          "manage:pages"
+        ],
+        "applicationId": "valid_application",
+        "unpublishedPage": {
+          "name": "Page1",
+          "layouts": [
+            {
+              "id": "60aca056136c4b7178f67906",
+              "userPermissions": [],
+              "dsl": {
+                "widgetName": "MainContainer",
+                "backgroundColor": "none",
+                "rightColumn": 1280,
+                "snapColumns": 16,
+                "detachFromLayout": true,
+                "widgetId": "0",
+                "topRow": 0,
+                "bottomRow": 800,
+                "containerStyle": "none",
+                "snapRows": 33,
+                "parentRowSpace": 1,
+                "type": "CANVAS_WIDGET",
+                "canExtend": true,
+                "version": 4,
+                "minHeight": 840,
+                "parentColumnSpace": 1,
+                "dynamicTriggerPathList": [],
+                "dynamicBindingPathList": [],
+                "leftColumn": 0,
+                "children": [
+                  {
+                    "widgetName": "Table1",
+                    "columnOrder": [
+                      "_id",
+                      "username",
+                      "active"
+                    ],
+                    "dynamicPropertyPathList": [],
+                    "topRow": 4,
+                    "bottomRow": 15,
+                    "parentRowSpace": 40,
+                    "type": "TABLE_WIDGET",
+                    "parentColumnSpace": 77.5,
+                    "dynamicTriggerPathList": [],
+                    "dynamicBindingPathList": [
+                      {
+                        "key": "tableData"
+                      },
+                      {
+                        "key": "primaryColumns._id.computedValue"
+                      },
+                      {
+                        "key": "primaryColumns.username.computedValue"
+                      },
+                      {
+                        "key": "primaryColumns.active.computedValue"
+                      }
+                    ],
+                    "leftColumn": 0,
+                    "primaryColumns": {
+                      "appsmith_mongo_escape_id": {
+                        "isDerived": false,
+                        "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => { return currentRow._id})}}",
+                        "textSize": "PARAGRAPH",
+                        "index": 4,
+                        "isVisible": true,
+                        "label": "_id",
+                        "columnType": "text",
+                        "horizontalAlignment": "LEFT",
+                        "width": 150,
+                        "enableFilter": true,
+                        "enableSort": true,
+                        "id": "_id",
+                        "verticalAlignment": "CENTER"
+                      },
+                      "active": {
+                        "isDerived": false,
+                        "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.active})}}",
+                        "textSize": "PARAGRAPH",
+                        "index": 8,
+                        "isVisible": true,
+                        "label": "active",
+                        "columnType": "text",
+                        "horizontalAlignment": "LEFT",
+                        "width": 150,
+                        "enableFilter": true,
+                        "enableSort": true,
+                        "id": "active",
+                        "verticalAlignment": "CENTER"
+                      },
+                      "username": {
+                        "isDerived": false,
+                        "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => { return currentRow.username})}}",
+                        "textSize": "PARAGRAPH",
+                        "index": 7,
+                        "isVisible": true,
+                        "label": "username",
+                        "columnType": "text",
+                        "horizontalAlignment": "LEFT",
+                        "width": 150,
+                        "enableFilter": true,
+                        "enableSort": true,
+                        "id": "username",
+                        "verticalAlignment": "CENTER"
+                      }
+                    },
+                    "derivedColumns": {},
+                    "rightColumn": 8,
+                    "textSize": "PARAGRAPH",
+                    "widgetId": "aisibaxwhb",
+                    "tableData": "{{get_users.data}}",
+                    "isVisible": true,
+                    "label": "Data",
+                    "searchKey": "",
+                    "version": 1,
+                    "parentId": "0",
+                    "isLoading": false,
+                    "horizontalAlignment": "LEFT",
+                    "verticalAlignment": "CENTER",
+                    "columnSizeMap": {
+                      "task": 245,
+                      "step": 62,
+                      "status": 75
+                    }
+                  },
+                  {
+                    "widgetName": "Form1",
+                    "backgroundColor": "white",
+                    "rightColumn": 16,
+                    "widgetId": "ut3l54pzqw",
+                    "topRow": 4,
+                    "bottomRow": 11,
+                    "parentRowSpace": 40,
+                    "isVisible": true,
+                    "type": "FORM_WIDGET",
+                    "parentId": "0",
+                    "isLoading": false,
+                    "parentColumnSpace": 77.5,
+                    "leftColumn": 9,
+                    "children": [
+                      {
+                        "widgetName": "Canvas1",
+                        "rightColumn": 542.5,
+                        "detachFromLayout": true,
+                        "widgetId": "mcsltg1l0j",
+                        "containerStyle": "none",
+                        "topRow": 0,
+                        "bottomRow": 320,
+                        "parentRowSpace": 1,
+                        "isVisible": true,
+                        "canExtend": false,
+                        "type": "CANVAS_WIDGET",
+                        "version": 1,
+                        "parentId": "ut3l54pzqw",
+                        "minHeight": 520,
+                        "isLoading": false,
+                        "parentColumnSpace": 1,
+                        "leftColumn": 0,
+                        "children": [
+                          {
+                            "widgetName": "Text1",
+                            "rightColumn": 6,
+                            "textAlign": "LEFT",
+                            "widgetId": "7b4x786lxp",
+                            "topRow": 0,
+                            "bottomRow": 1,
+                            "isVisible": true,
+                            "fontStyle": "BOLD",
+                            "type": "TEXT_WIDGET",
+                            "textColor": "#231F20",
+                            "version": 1,
+                            "parentId": "mcsltg1l0j",
+                            "isLoading": false,
+                            "leftColumn": 0,
+                            "fontSize": "HEADING1",
+                            "text": "Form"
+                          },
+                          {
+                            "widgetName": "Text2",
+                            "rightColumn": 16,
+                            "textAlign": "LEFT",
+                            "widgetId": "d0axuxiosp",
+                            "topRow": 3,
+                            "bottomRow": 6,
+                            "parentRowSpace": 40,
+                            "isVisible": true,
+                            "fontStyle": "BOLD",
+                            "type": "TEXT_WIDGET",
+                            "textColor": "#231F20",
+                            "version": 1,
+                            "parentId": "mcsltg1l0j",
+                            "isLoading": false,
+                            "parentColumnSpace": 31.40625,
+                            "dynamicTriggerPathList": [],
+                            "leftColumn": 0,
+                            "dynamicBindingPathList": [
+                              {
+                                "key": "text"
+                              }
+                            ],
+                            "fontSize": "PARAGRAPH2",
+                            "text": "{{api_wo_auth.data.body}}"
+                          },
+                          {
+                            "widgetName": "Text3",
+                            "rightColumn": 4,
+                            "textAlign": "LEFT",
+                            "widgetId": "lmfer0622c",
+                            "topRow": 2,
+                            "bottomRow": 3,
+                            "parentRowSpace": 40,
+                            "isVisible": true,
+                            "fontStyle": "BOLD",
+                            "type": "TEXT_WIDGET",
+                            "textColor": "#231F20",
+                            "version": 1,
+                            "parentId": "mcsltg1l0j",
+                            "isLoading": false,
+                            "parentColumnSpace": 31.40625,
+                            "dynamicTriggerPathList": [],
+                            "leftColumn": 0,
+                            "dynamicBindingPathList": [
+                              {
+                                "key": "text"
+                              }
+                            ],
+                            "fontSize": "PARAGRAPH",
+                            "text": "{{api_wo_auth.data.id}}"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "layoutOnLoadActions": [
+                [
+                  {
+                    "id": "60aca24c136c4b7178f6790d",
+                    "name": "api_wo_auth",
+                    "pluginType": "API",
+                    "jsonPathKeys": [],
+                    "timeoutInMillisecond": 10000
+                  },
+                  {
+                    "id": "60aca092136c4b7178f6790a",
+                    "name": "get_users",
+                    "pluginType": "DB",
+                    "jsonPathKeys": [],
+                    "timeoutInMillisecond": 10000
+                  }
+                ]
+              ],
+              "new": false
+            }
+          ],
+          "userPermissions": []
+        },
+        "publishedPage": {
+          "name": "Page1",
+          "layouts": [
+            {
+              "id": "60aca056136c4b7178f67906",
+              "userPermissions": [],
+              "dsl": {
+                "widgetName": "MainContainer",
+                "backgroundColor": "none",
+                "rightColumn": 1224,
+                "snapColumns": 16,
+                "detachFromLayout": true,
+                "widgetId": "0",
+                "topRow": 0,
+                "bottomRow": 1254,
+                "containerStyle": "none",
+                "snapRows": 33,
+                "parentRowSpace": 1,
+                "type": "CANVAS_WIDGET",
+                "canExtend": true,
+                "version": 4,
+                "minHeight": 1292,
+                "parentColumnSpace": 1,
+                "dynamicBindingPathList": [],
+                "leftColumn": 0,
+                "children": []
+              },
+              "new": false
+            }
+          ],
+          "userPermissions": []
+        },
+        "new": true
+      }
+    ],
+    "actionList": [
+      {
+        "id": "60aca092136c4b7178f6790a",
+        "userPermissions": [],
+        "applicationId": "valid_application",
+        "pluginType": "DB",
+        "pluginId": "mongo-plugin",
+        "unpublishedAction": {
+          "name": "get_users",
+          "datasource": {
+            "id": "db-auth",
+            "userPermissions": [],
+            "isValid": true,
+            "new": false
+          },
+          "pageId": "Page1",
+          "actionConfiguration": {
+            "timeoutInMillisecond": 10000,
+            "paginationType": "NONE",
+            "encodeParamsToggle": true,
+            "body": "{\n \"find\": \"users\",\n \"sort\": {\n \"id\": 1\n },\n \"limit\": 10\n}",
+            "pluginSpecifiedTemplates": [
+              {
+                "value": false
+              }
+            ]
+          },
+          "executeOnLoad": true,
+          "dynamicBindingPathList": [],
+          "isValid": true,
+          "invalids": [],
+          "jsonPathKeys": [],
+          "confirmBeforeExecute": false,
+          "userPermissions": []
+        },
+        "publishedAction": {
+          "datasource": {
+            "userPermissions": [],
+            "isValid": true,
+            "new": true
+          },
+          "confirmBeforeExecute": false,
+          "userPermissions": []
+        },
+        "new": false
+      },
+      {
+        "id": "60aca24c136c4b7178f6790d",
+        "userPermissions": [],
+        "applicationId": "valid_application",
+        "pluginType": "API",
+        "pluginId": "restapi-plugin",
+        "unpublishedAction": {
+          "name": "api_wo_auth",
+          "datasource": {
+            "id": "api_ds_wo_auth",
+            "userPermissions": [],
+            "isValid": true,
+            "new": false
+          },
+          "pageId": "Page1",
+          "actionConfiguration": {
+            "timeoutInMillisecond": 10000,
+            "paginationType": "NONE",
+            "path": "/params",
+            "headers": [
+              {
+                "key": "",
+                "value": ""
+              },
+              {
+                "key": "",
+                "value": ""
+              }
+            ],
+            "encodeParamsToggle": true,
+            "queryParameters": [],
+            "body": "",
+            "httpMethod": "GET",
+            "pluginSpecifiedTemplates": [
+              {
+                "value": false
+              }
+            ]
+          },
+          "executeOnLoad": true,
+          "dynamicBindingPathList": [],
+          "isValid": true,
+          "invalids": [],
+          "jsonPathKeys": [],
+          "confirmBeforeExecute": false,
+          "userPermissions": []
+        },
+        "publishedAction": {
+          "datasource": {
+            "userPermissions": [],
+            "isValid": true,
+            "new": true
+          },
+          "confirmBeforeExecute": false,
+          "userPermissions": []
+        },
+        "new": false
+      }
+    ],
+    "decryptedFields": {
+      "db-auth": {
+        "password": "CreativePassword",
+        "authType": "com.appsmith.external.models.DBAuth",
+        "dbAuth": {
+          "authenticationType": "dbAuth",
+          "authType": "SCRAM_SHA_1",
+          "username": "CreativeUser",
+          "databaseName": "db-name"
+        }
+      }
+    },
+    "publishedDefaultPageName": "Page1",
+    "unpublishedDefaultPageName": "Page1",
+    "publishedLayoutmongoEscapedWidgets": {
+      "60aca056136c4b7178f67906": [
+        "Table1"
+      ]
+    },
+    "unpublishedLayoutmongoEscapedWidgets": {
+      "60aca056136c4b7178f67906": [
+        "Table1"
+      ]
+    }
+}
\ No newline at end of file
diff --git a/app/server/docker-compose.yml b/app/server/docker-compose.yml
index ad99d51deb..e6a1e938ee 100644
--- a/app/server/docker-compose.yml
+++ b/app/server/docker-compose.yml
@@ -2,35 +2,30 @@ version: "3.7"
 
 services:
   appsmith-internal-server:
-    image: arpitappsmith/appsmith-server:maven
+    image: appsmith/appsmith-server
     env_file: envs/docker.env
     environment:
-      APPSMITH_MONGODB_URI: "mongodb://mongo:27017/mobtools"
       APPSMITH_REDIS_URL: "redis://redis:6379"
+      APPSMITH_MONGODB_URI: "mongodb://mongo:27017/appsmith"
     ports:
       - "8080:8080"
-    links:
-      - mongo
     depends_on:
       - mongo
+      - redis
     networks:
       - appsmith
 
   mongo:
     image: mongo
-    ports:
-      - "27017:27017"
     environment:
-      - MONGO_INITDB_DATABASE=mobtools
+      - MONGO_INITDB_DATABASE=appsmith
     volumes:
-      - ./mongo-seed/:/docker-entrypoint-initdb.d/
+      - ./container-volumes/mongo:/data/db
     networks:
       - appsmith
 
   redis:
     image: redis
-    ports:
-      - "6379:6379"
     networks:
       - appsmith
 
diff --git a/app/server/envs/dev.env.example b/app/server/envs/dev.env.example
index e7e74b6bf4..dcfadce836 100644
--- a/app/server/envs/dev.env.example
+++ b/app/server/envs/dev.env.example
@@ -11,6 +11,8 @@ APPSMITH_ENCRYPTION_SALT=abcd
 
 APPSMITH_CODEC_SIZE=10
 
+#APPSMITH_CLOUD_SERVICES_BASE_URL="https://release-cs.appsmith.com"
+
 #APPSMITH_OAUTH2_GOOGLE_CLIENT_ID=""
 #APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET=""
 
@@ -21,4 +23,4 @@ APPSMITH_CODEC_SIZE=10
 #APPSMITH_SENTRY_ENVIRONMENT=
 
 #APPSMITH_RECAPTCHA_SITE_KEY=""
-#APPSMITH_RECAPTCHA_SECRET_KEY=""
+#APPSMITH_RECAPTCHA_SECRET_KEY=""
\ No newline at end of file
diff --git a/app/server/envs/docker.env.example b/app/server/envs/docker.env.example
index 183ed9ff04..a0daf519f5 100644
--- a/app/server/envs/docker.env.example
+++ b/app/server/envs/docker.env.example
@@ -1,25 +1,23 @@
 #!/bin/sh
 
-APPSMITH_OAUTH2_GOOGLE_CLIENT_ID=""
-APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET=""
-APPSMITH_OAUTH2_GITHUB_CLIENT_ID=""
-APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET=""
+# APPSMITH_OAUTH2_GOOGLE_CLIENT_ID=""
+# APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET=""
+# APPSMITH_OAUTH2_GITHUB_CLIENT_ID=""
+# APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET=""
 
-APPSMITH_RAPID_API_KEY_VALUE=""
+# APPSMITH_MAIL_ENABLED=true
+# APPSMITH_MAIL_HOST=localhost
+# APPSMITH_MAIL_PORT=25
+# APPSMITH_MAIL_USERNAME=
+# APPSMITH_MAIL_PASSWORD=
+# APPSMITH_MAIL_SMTP_AUTH=true
+# APPSMITH_MAIL_SMTP_TLS_ENABLED=true
 
-APPSMITH_MAIL_ENABLED=true
-APPSMITH_MAIL_HOST=localhost
-APPSMITH_MAIL_PORT=25
-APPSMITH_MAIL_USERNAME=
-APPSMITH_MAIL_PASSWORD=
-APPSMITH_MAIL_SMTP_AUTH=true
-APPSMITH_MAIL_SMTP_TLS_ENABLED=true
+# APPSMITH_MARKETPLACE_USERNAME=""
+# APPSMITH_MARKETPLACE_PASSWORD=""
 
-APPSMITH_MARKETPLACE_USERNAME=""
-APPSMITH_MARKETPLACE_PASSWORD=""
-
-APPSMITH_ENCRYPTION_PASSWORD=""
-APPSMITH_ENCRYPTION_SALT=""
+APPSMITH_ENCRYPTION_PASSWORD="abcd"
+APPSMITH_ENCRYPTION_SALT="abcd"
 
 #APPSMITH_RECAPTCHA_SITE_KEY=""
 #APPSMITH_RECAPTCHA_SECRET_KEY=""
diff --git a/appsmith_templates.md b/appsmith_templates.md
new file mode 100644
index 0000000000..c076380d68
--- /dev/null
+++ b/appsmith_templates.md
@@ -0,0 +1,33 @@
+## Appsmith Example Applications and Templates
+
+Our team and the community have created a few **example** applications that can be used as is, or as a template which can serve as a starting point for your application.
+
+You can use the applications for yourself following the simple steps below:
+
+1. Click on the application of your choice
+2. On the top right hand corner, you will see an option to `fork` the application
+4. Click on `fork` application 
+5. Log in to Appsmith, if not already
+6. Select organization to which the application should be forked
+7. Change datasource credentials to connect to your backend
+8. You now have a fully functional app to use or build on top of
+
+Would you like to contribute your app? Just write in to akshay@appsmith.com.
+
+### List of forkable applications on Appsmith
+
+1. [Applicant Tracker System](https://app.appsmith.com/applications/5f43bce13697fd5df1c52ce4/pages/5f43c39c3697fd5df1c52d50)
+
+> This application will need you to connect to your instance of Postgres, but once done, you will be able to manage the entire lifecycle of applicants in your hiring pipeline. We've also added Google Calendar API calls so you can schedule interviews directly from this application.
+
+2. [Calendly in Appsmith](https://app.appsmith.com/applications/600186605b452f525458d6d2/pages/600186605b452f525458d6d4)
+
+
+> A barebones version of calendly that you can use to schedule meetings, or just play around with how you can use APIs and Appsmith to build really powerful applications. Connects to Google Calendar API, so will need you to [authorize your OAuth2 token](https://docs.appsmith.com/core-concepts/connecting-to-data-sources/connect-to-apis/authentication/oauth2-authentication).
+
+3. [Founder/Investor CRM](https://app.appsmith.com/applications/6098bdc65864501cc39c3d2f/pages/6098bdc65864501cc39c3d31)
+
+> A pragmatic CRM that helps founders keep track of the investor conversations they have had, and details about the investor, fund and files shared. You can use it to mark next steps and prioritize conversations. We have found this system very useful personally for our fundraises. We chose to use a Google Sheets backend as that's where foudners end up keeping these notes usually. You can just [authorize a sheet](https://docs.appsmith.com/how-to-guides/oauth2-authorization-for-google-sheets) to get it working.
+> 
+
+Watch out for more! If you'd like to contribute a template, please write in to akshay@appsmith.com! 
diff --git a/ci/1-client-scripts/3-build.sh b/ci/1-client-scripts/3-build.sh
new file mode 100644
index 0000000000..00fb399461
--- /dev/null
+++ b/ci/1-client-scripts/3-build.sh
@@ -0,0 +1,26 @@
+# Build phase script for units node in the main build graph.
+
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+{
+
+echo "$BASH_VERSION"
+node --version
+
+cd "$CODEBUILD_SRC_DIR/app/client"
+npm install -g yarn
+yarn install --frozen-lockfile
+
+REACT_APP_ENVIRONMENT=PRODUCTION \
+	npx jest -b --no-cache --coverage --collectCoverage=true --coverageDirectory='../../' --coverageReporters='json-summary'
+
+REACT_APP_SHOW_ONBOARDING_FORM=true \
+	yarn run build
+
+mv -v build client-dist
+tar -caf client-dist.tgz client-dist
+aws s3 cp --no-progress client-dist.tgz "$S3_BUILDS_PREFIX/$BATCH_ID/client-dist.tgz"
+
+} 2>&1 | tee -a "ci/logs/$CODEBUILD_BATCH_BUILD_IDENTIFIER.log"
diff --git a/ci/1-client-unit-tests.yml b/ci/1-client-unit-tests.yml
new file mode 100644
index 0000000000..2e8d4198e7
--- /dev/null
+++ b/ci/1-client-unit-tests.yml
@@ -0,0 +1,22 @@
+# This buildspec will run unit tests on the client code.
+
+version: 0.2
+
+env:
+  shell: bash
+
+phases:
+
+  install:
+    on-failure: ABORT
+    runtime-versions:
+      nodejs: 14
+
+  build:
+    on-failure: ABORT
+    commands:
+      - source ci/common/extra-env.sh
+      - mkdir -pv ci/logs
+      - source ci/1-client-scripts/3-build.sh
+    finally:
+      - source ci/common/upload-logs.sh
diff --git a/ci/1-server-scripts/1-install.sh b/ci/1-server-scripts/1-install.sh
new file mode 100644
index 0000000000..af8de8a9b8
--- /dev/null
+++ b/ci/1-server-scripts/1-install.sh
@@ -0,0 +1,26 @@
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+{
+
+wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add -
+echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" \
+	| tee /etc/apt/sources.list.d/mongodb-org-4.4.list
+
+add-apt-repository --yes ppa:redislabs/redis
+
+apt-get update --yes
+
+time apt-get install --yes maven mongodb-org-{server,shell} redis
+
+mkdir -p "$CODEBUILD_SRC_DIR/logs"
+
+# Start a MongoDB server.
+mkdir -p /data/db
+nohup mongod > "$CODEBUILD_SRC_DIR/logs/mongod.log" 2>&1 & disown $!
+
+# Start a Redis server.
+nohup redis-server > "$CODEBUILD_SRC_DIR/logs/redis.log" 2>&1 & disown $!
+
+} 2>&1 | tee -a "ci/logs/$CODEBUILD_BATCH_BUILD_IDENTIFIER.log"
diff --git a/ci/1-server-scripts/3-build.sh b/ci/1-server-scripts/3-build.sh
new file mode 100644
index 0000000000..99f037ff47
--- /dev/null
+++ b/ci/1-server-scripts/3-build.sh
@@ -0,0 +1,39 @@
+# Build phase script for units node in the main build graph.
+
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+{
+
+echo "BASH_VERSION: '$BASH_VERSION'"
+java -version
+
+export APPSMITH_MONGODB_URI="mongodb://localhost:27017/appsmith"
+export APPSMITH_REDIS_URL="redis://localhost:6379"
+
+export APPSMITH_ENCRYPTION_SALT=ci-salt-is-white-like-radish
+export APPSMITH_ENCRYPTION_PASSWORD=ci-password-is-red-like-carrot
+
+export APPSMITH_CLOUD_SERVICES_BASE_URL=
+export APPSMITH_IS_SELF_HOSTED=false
+
+if ! mongo --eval 'db.runCommand({ connectionStatus: 1 })' "$APPSMITH_MONGODB_URI"; then
+	cat "$CODEBUILD_SRC_DIR/logs/mongod.log"
+fi
+
+cd "$CODEBUILD_SRC_DIR/app/server"
+
+# Not using `build.sh` here since it doesn't exit with a non-zero status when the build fails.
+mvn package --batch-mode
+
+mkdir -p dist/plugins
+
+mv -v appsmith-server/target/server-1.0-SNAPSHOT.jar dist/
+rsync -av --exclude "original-*.jar" appsmith-plugins/*/target/*.jar dist/plugins/
+
+mv -v dist server-dist
+tar -caf server-dist.tgz server-dist
+aws s3 cp --no-progress server-dist.tgz "$S3_BUILDS_PREFIX/$BATCH_ID/server-dist.tgz"
+
+} 2>&1 | tee -a "ci/logs/$CODEBUILD_BATCH_BUILD_IDENTIFIER.log"
diff --git a/ci/1-server-unit-tests.yml b/ci/1-server-unit-tests.yml
new file mode 100644
index 0000000000..0a171e2216
--- /dev/null
+++ b/ci/1-server-unit-tests.yml
@@ -0,0 +1,34 @@
+# This buildspec will run unit tests on the server code.
+
+version: 0.2
+
+env:
+  shell: bash
+
+phases:
+
+  install:
+    on-failure: ABORT
+    runtime-versions:
+      java: corretto11
+    commands:
+      - set -o pipefail
+      - source ci/common/extra-env.sh
+      - mkdir -pv ci/logs
+      - source ci/1-server-scripts/1-install.sh
+    finally:
+      - source ci/common/upload-logs.sh
+
+  build:
+    on-failure: ABORT
+    commands:
+      - set -o pipefail
+      - source ci/common/extra-env.sh
+      - mkdir -pv ci/logs
+      - source ci/1-server-scripts/3-build.sh
+    finally:
+      - source ci/common/upload-logs.sh
+
+cache:
+  paths:
+    - '/root/.m2/**/*'  # Server dependencies.
diff --git a/ci/2-cypress.yml b/ci/2-cypress.yml
new file mode 100644
index 0000000000..5d6d12d1cc
--- /dev/null
+++ b/ci/2-cypress.yml
@@ -0,0 +1,36 @@
+# This buildspec will run Cypress tests.
+# It does NOT build Docker images and it does NOT run unit tests.
+
+version: 0.2
+
+env:
+  shell: bash
+
+phases:
+
+  install:
+    on-failure: ABORT
+    runtime-versions:
+      java: corretto11
+      nodejs: 14
+    commands:
+      - set -o pipefail
+      - source ci/common/extra-env.sh
+      - mkdir -pv ci/logs
+      - source ci/2-scripts/1-install.sh
+    finally:
+      - source ci/common/upload-logs.sh
+
+  build:
+    on-failure: ABORT
+    commands:
+      - set -o pipefail
+      - source ci/common/extra-env.sh
+      - mkdir -pv ci/logs
+      - source ci/2-scripts/3-build.sh
+    finally:
+      - source ci/common/upload-logs.sh
+
+cache:
+  paths:
+    - '/root/.cache/Cypress/**/*'  # Cypress binary.
diff --git a/ci/2-scripts/1-install.sh b/ci/2-scripts/1-install.sh
new file mode 100644
index 0000000000..2ec69e1f19
--- /dev/null
+++ b/ci/2-scripts/1-install.sh
@@ -0,0 +1,40 @@
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+{
+
+wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add -
+echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" \
+	| tee /etc/apt/sources.list.d/mongodb-org-4.4.list
+
+add-apt-repository --yes ppa:redislabs/redis
+
+apt-get update --yes
+
+# Installing `gettext-base` just for `envsubst` command.
+time apt-get install --yes maven gettext-base curl mongodb-org-{server,shell} redis nginx postgresql
+
+mkdir -p "$CODEBUILD_SRC_DIR/logs"
+
+# Start a MongoDB server.
+mkdir -p /data/db
+nohup mongod > "$CODEBUILD_SRC_DIR/logs/mongod.log" 2>&1 & disown $!
+
+# Start a Redis server.
+nohup redis-server > "$CODEBUILD_SRC_DIR/logs/redis.log" 2>&1 & disown $!
+
+# Start a PostgreSQL server.
+pg_ctlcluster 12 main start
+su -c "psql --username=postgres --command=\"alter user postgres with password 'postgres'\"" postgres
+PGPASSWORD=postgres psql \
+	--username=postgres \
+	--host=localhost \
+	--single-transaction \
+	--variable=ON_ERROR_STOP=ON \
+	--file="$CODEBUILD_SRC_DIR/app/client/cypress/init-pg-dump-for-test.sql"
+
+# Start an nginx server.
+nginx
+
+} 2>&1 | tee -a "ci/logs/$CODEBUILD_BATCH_BUILD_IDENTIFIER.log"
diff --git a/ci/2-scripts/3-build.sh b/ci/2-scripts/3-build.sh
new file mode 100644
index 0000000000..bef0964a37
--- /dev/null
+++ b/ci/2-scripts/3-build.sh
@@ -0,0 +1,167 @@
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+curl-fail() {
+	# Source: <https://superuser.com/a/1641410>.
+	outfile="$(mktemp)"
+	local code
+	code="$(curl --insecure --silent --show-error --output "$outfile" --write-out "%{http_code}" "$@")"
+	if [[ $code -lt 200 || $code -gt 302 ]] ; then
+		cat "$outfile" >&2
+		return 22
+	fi
+	cat "$outfile"
+	rm "$outfile"
+	# Need below line because cURL doesn't print a final newline and that messes the logs in CloudWatch.
+	echo
+}
+
+{
+
+echo "$BASH_VERSION"
+java -version
+node --version
+
+aws s3 cp --no-progress "$S3_BUILDS_PREFIX/$BATCH_ID/client-dist.tgz" .
+aws s3 cp --no-progress "$S3_BUILDS_PREFIX/$BATCH_ID/server-dist.tgz" .
+
+tar -xaf client-dist.tgz
+tar -xaf server-dist.tgz
+du -sh client-dist server-dist
+
+echo Building server code
+cd "$CODEBUILD_SRC_DIR/server-dist"
+export APPSMITH_MONGODB_URI="mongodb://localhost:27017/appsmith"
+export APPSMITH_REDIS_URL="redis://localhost:6379"
+APPSMITH_ENCRYPTION_SALT=ci-salt-is-white-like-radish \
+	APPSMITH_ENCRYPTION_PASSWORD=ci-password-is-red-like-carrot \
+	APPSMITH_CLOUD_SERVICES_BASE_URL='' \
+	APPSMITH_IS_SELF_HOSTED=false \
+	java -jar server-*.jar > "$CODEBUILD_SRC_DIR/logs/server.log" 2>&1 &
+
+# Serve the react bundle on a specific port. Nginx will proxy to this port.
+echo "127.0.0.1	dev.appsmith.com" | tee -a /etc/hosts
+npx serve -s "$CODEBUILD_SRC_DIR/client-dist" -p 3000 > "$CODEBUILD_SRC_DIR/logs/client.log" 2>&1 &
+
+export APPSMITH_DISABLE_TELEMETRY=true
+
+echo Building client code
+cd "$CODEBUILD_SRC_DIR/app/client"
+npm install -g yarn
+time yarn install --frozen-lockfile
+if [[ ! -d ~/.cache/Cypress ]]; then
+	npx cypress install
+fi
+
+# Substitute all the env variables in nginx
+vars_to_substitute='\$'"$(env | grep -o "^APPSMITH_[A-Z0-9_]\+" | paste -s -d, - | sed 's/,/,\\$/g')"
+echo "vars_to_substitute: $vars_to_substitute"
+envsubst "$vars_to_substitute" < docker/templates/nginx-app.conf.template \
+	| sed \
+		-e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' \
+		-e "s|__APPSMITH_CLIENT_PROXY_PASS__|http://localhost:3000|g" \
+		-e "s|__APPSMITH_SERVER_PROXY_PASS__|http://localhost:8080|g" \
+	| tee /etc/nginx/conf.d/app.conf
+envsubst "$vars_to_substitute" < docker/templates/nginx-root.conf.template \
+	| sed \
+		-e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' \
+		-e 's/user  *nginx;/user root;/' \
+	| tee /etc/nginx/nginx.conf
+
+# Create the SSL files for Nginx. Required for service workers to work properly.
+# This is a self-signed certificate, and so when using cURL, we need to add the `-k` or `--insecure` argument.
+mkdir -p /etc/certificate
+openssl req -x509 -newkey rsa:4096 -nodes \
+	-out /etc/certificate/dev.appsmith.com.pem \
+	-keyout /etc/certificate/dev.appsmith.com-key.pem \
+	-days 365 \
+	-subj "/O=appsmith/CN=dev.appsmith.com"
+
+if ! /etc/init.d/nginx reload; then
+	cat /var/log/nginx/error.log
+	exit 4
+fi
+
+echo "Sleeping to let the servers start"
+# timeout 20s tail -500 -f "$CODEBUILD_SRC_DIR/logs/server.log" | grep -q 'Mongock has finished'
+sleep 30s  # TODO: Wait more intelligently, by looking at the log files for a specific line.
+
+if ! curl-fail https://dev.appsmith.com; then
+	cat /var/log/nginx/access.log
+	cat /var/log/nginx/error.log
+	exit 5
+fi
+
+if ! mongo --eval 'db.runCommand({ connectionStatus: 1 })' "$APPSMITH_MONGODB_URI"; then
+	cat "$CODEBUILD_SRC_DIR/logs/mongod.log"
+	exit 6
+fi
+
+if ! curl-fail --verbose localhost:3000; then
+	cat "$CODEBUILD_SRC_DIR/logs/client.log"
+	exit 7
+fi
+
+if ! curl --insecure --verbose localhost:8080; then
+	cat "$CODEBUILD_SRC_DIR/logs/server.log"
+	exit 8
+fi
+
+# Create test users.
+# Note: The USERNAME values must be valid email addresses, or the signup API calls will fail.
+export CYPRESS_USERNAME=cy@example.com
+export CYPRESS_PASSWORD=cypas
+export CYPRESS_TESTUSERNAME1=cy1@example.com
+export CYPRESS_TESTPASSWORD1=cypas1
+export CYPRESS_TESTUSERNAME2=cy2@example.com
+export CYPRESS_TESTPASSWORD2=cypas2
+curl-fail -v -d "email=$CYPRESS_USERNAME" -d "password=$CYPRESS_PASSWORD" 'https://dev.appsmith.com/api/v1/users'
+curl-fail -v -d "email=$CYPRESS_TESTUSERNAME1" -d "password=$CYPRESS_TESTPASSWORD1" 'https://dev.appsmith.com/api/v1/users'
+curl-fail -v -d "email=$CYPRESS_TESTUSERNAME2" -d "password=$CYPRESS_TESTPASSWORD2" 'https://dev.appsmith.com/api/v1/users'
+
+# Run the Cypress tests
+if [[ -z $CYPRESS_RECORD_KEY || -z $CYPRESS_PROJECT_ID ]]; then
+	echo 'Missing CYPRESS_RECORD_KEY or CYPRESS_PROJECT_ID.' >&2
+	exit 2
+fi
+
+touch ../../.env  # Doing this to silence a misleading error message from `cypress/plugins/index.js`.
+npx cypress info
+
+# Git information for Cypress: <https://docs.cypress.io/guides/continuous-integration/introduction#Git-information>.
+branch="$(git name-rev --name-only HEAD 2>/dev/null)"
+if [[ -z $branch ]]; then
+	echo "Unable to get branch" >&2
+	git name-rev --name-only HEAD
+else
+	# When this variable is not set, Cypress will try to detect it itself, but it's not very reliable so we try our hand
+	# at it first.
+	export COMMIT_INFO_BRANCH="$branch"
+fi
+
+#	COMMIT_INFO_MESSAGE="$(git log -1 --pretty=%s)" \
+#	COMMIT_INFO_EMAIL="$(git log -1 --pretty=%ae)" \
+#	COMMIT_INFO_AUTHOR="$(git log -1 --pretty=%an)" \
+#	COMMIT_INFO_SHA="$CODEBUILD_RESOLVED_SOURCE_VERSION" \
+#	COMMIT_INFO_REMOTE="$CODEBUILD_SOURCE_REPO_URL" \
+
+export NO_COLOR=1
+
+if ! npx cypress run --headless --browser chrome \
+		--record \
+		--ci-build-id "$CODEBUILD_INITIATOR" \
+		--parallel \
+		--group 'Electrons on CodeBuild CI' \
+		--env 'NODE_ENV=development' \
+		--tag "$CODEBUILD_WEBHOOK_TRIGGER" \
+		--spec 'cypress/integration/Smoke_TestSuite/**/*.js'; then
+	echo "Cypress tests failed, printing backend server logs."
+	cat "$CODEBUILD_SRC_DIR/logs/server.log"
+	exit 3
+fi
+
+# At end of this script, CodeBuild does some cleanup and without the below line, it throws an error.
+unset -f curl-fail
+
+} 2>&1 | tee -a "ci/logs/$CODEBUILD_BATCH_BUILD_IDENTIFIER.log"
diff --git a/ci/3-publish.yml b/ci/3-publish.yml
new file mode 100644
index 0000000000..ccf133b878
--- /dev/null
+++ b/ci/3-publish.yml
@@ -0,0 +1,28 @@
+# This buildspec will build and publish Docker images.
+# It does NOT run any tests.
+
+version: 0.2
+
+env:
+  shell: bash
+
+phases:
+
+  build:
+    on-failure: ABORT
+    commands:
+      - set -o pipefail
+      - source ci/common/extra-env.sh
+      - mkdir -pv ci/logs
+      - source ci/3-scripts/3-build.sh
+    finally:
+      - source ci/common/upload-logs.sh
+
+  post_build:
+    commands:
+      - set -o pipefail
+      - source ci/common/extra-env.sh
+      - mkdir -pv ci/logs
+      - source ci/cleanup.sh
+    finally:
+      - source ci/common/upload-logs.sh
diff --git a/ci/3-scripts/3-build.sh b/ci/3-scripts/3-build.sh
new file mode 100644
index 0000000000..52c6a17b39
--- /dev/null
+++ b/ci/3-scripts/3-build.sh
@@ -0,0 +1,49 @@
+# Build Docker images for client and server, and push to registry/registries.
+
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+{
+
+aws --version
+java -version
+node --version
+docker version
+
+echo "$DOCKER_HUB_PASSWORD" | docker login --username "$DOCKER_HUB_USERNAME" --password-stdin
+docker info
+
+image_prefix=""
+if [[ -z $DOCKER_HUB_ORGANIZATION ]]; then
+	image_prefix="$DOCKER_HUB_ORGANIZATION/"
+fi
+
+if [[ -z $DOCKER_TAG_NAME ]]; then
+	DOCKER_TAG_NAME="${CODEBUILD_SOURCE_VERSION:-release}"
+fi
+
+aws s3 cp --no-progress "$S3_BUILDS_PREFIX/$BATCH_ID/client-dist.tgz" .
+aws s3 cp --no-progress "$S3_BUILDS_PREFIX/$BATCH_ID/server-dist.tgz" .
+
+tar -xaf client-dist.tgz
+mv -v client-dist "$CODEBUILD_SRC_DIR/app/client/build"
+cd "$CODEBUILD_SRC_DIR/app/client"
+docker build --tag "${image_prefix}appsmith-editor:$DOCKER_TAG_NAME" .
+
+echo Building server code
+tar -xaf server-dist.tgz
+# The following is a horrible attempt at moving the jar files to their original locations, before `build.sh` moving
+# them. The Dockerfile expects them to be _kind of_ in these places.
+mkdir -p "$CODEBUILD_SRC_DIR/app/server/appsmith-server/target"
+mv -v server-dist/server-1.0-SNAPSHOT.jar "$CODEBUILD_SRC_DIR/app/server/appsmith-server/target/"
+mkdir -p "$CODEBUILD_SRC_DIR/app/server/appsmith-plugins/dummy"
+mv -v server-dist/plugins "$CODEBUILD_SRC_DIR/app/server/appsmith-plugins/dummy/target"
+ls "$CODEBUILD_SRC_DIR/app/server/appsmith-server/target"  # Should list `server-1.0-SNAPSHOT.jar` only.
+ls"$CODEBUILD_SRC_DIR/app/server/appsmith-plugins/dummy/target"  # Should list all plugin jar files.
+docker build --tag "${image_prefix}appsmith-server:$DOCKER_TAG_NAME" .
+
+docker push "${image_prefix}appsmith-editor:$DOCKER_TAG_NAME"
+docker push "${image_prefix}appsmith-server:$DOCKER_TAG_NAME"
+
+} 2>&1 | tee -a "ci/logs/$CODEBUILD_BATCH_BUILD_IDENTIFIER.log"
diff --git a/ci/buildspec.yml b/ci/buildspec.yml
new file mode 100644
index 0000000000..a13c64fb96
--- /dev/null
+++ b/ci/buildspec.yml
@@ -0,0 +1,188 @@
+version: 0.2
+
+env:
+  shell: bash
+
+phases:
+  install:
+    runtime-versions:
+      java: corretto11
+      nodejs: 14
+
+batch:
+  fail-fast: false
+
+  build-graph:
+
+    # Note: Do NOT use `-` in identifier values. There's pain on the other side of doing that.
+
+    # Run unit tests on client and server.
+    - identifier: client_unit_tests
+      buildspec: ci/1-client-unit-tests.yml
+      env:
+        compute-type: BUILD_GENERAL1_MEDIUM
+      debug-session: true
+
+#   # Run unit tests on client and server.
+#   - identifier: server_unit_tests
+#     buildspec: ci/1-server-unit-tests.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#       # This job doesn't build any Docker images, but the backend tests use Docker to bring up database containers, so
+#       # we need the privileged mode for that.
+#       privileged-mode: true
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress01
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress02
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress03
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress04
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress05
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress06
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress07
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress08
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress09
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress10
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress11
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress12
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress13
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress14
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress15
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Run all Cypress tests.
+#   - identifier: cypress16
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/2-cypress.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#     debug-session: true
+#
+#   # Publish
+#   - identifier: publish
+#     depend-on: [client_unit_tests, server_unit_tests]
+#     buildspec: ci/3-publish.yml
+#     env:
+#       compute-type: BUILD_GENERAL1_MEDIUM
+#       privileged-mode: true
+#     debug-session: true
+#     depend-on:
+#       - cypress01
+#       - cypress02
+#       - cypress03
+#       - cypress04
+#       - cypress05
+#       - cypress06
+#       - cypress07
+#       - cypress08
+#       - cypress09
+#       - cypress10
+#       - cypress11
+#       - cypress12
+#       - cypress13
+#       - cypress14
+#       - cypress15
+#       - cypress16
diff --git a/ci/common/cleanup.sh b/ci/common/cleanup.sh
new file mode 100644
index 0000000000..cd5f0dd0e8
--- /dev/null
+++ b/ci/common/cleanup.sh
@@ -0,0 +1,4 @@
+set -o errexit
+set -o xtrace
+
+aws s3 rm --recursive "$S3_BUILDS_PREFIX/$BATCH_ID"
diff --git a/ci/common/extra-env.sh b/ci/common/extra-env.sh
new file mode 100644
index 0000000000..efdbba6554
--- /dev/null
+++ b/ci/common/extra-env.sh
@@ -0,0 +1,8 @@
+# This script should be idempotent. Meaning, sourcing it multiple times shouldn't cause problems.
+
+set -o errexit
+set -o xtrace
+
+# Replace `/` characters to `--` in the initiator.
+# Sample CODEBUILD_INITIATOR: `codebuild-appsmith-ce-service-role/AWSCodeBuild-146ccba7-69a4-42b1-935b-e5ea50fc7535`
+BATCH_ID="${CODEBUILD_INITIATOR//\//--}"
diff --git a/ci/common/upload-logs.sh b/ci/common/upload-logs.sh
new file mode 100644
index 0000000000..fe85350ebf
--- /dev/null
+++ b/ci/common/upload-logs.sh
@@ -0,0 +1,5 @@
+set -o errexit
+set -o xtrace
+
+ls "$CODEBUILD_SRC_DIR/ci/logs"
+aws s3 cp --no-progress --recursive "$CODEBUILD_SRC_DIR/ci/logs" "$S3_LOGS_PREFIX/$BATCH_ID/"
diff --git a/contributions/ClientSetup.md b/contributions/ClientSetup.md
index 08b13f654a..7cf5d47804 100644
--- a/contributions/ClientSetup.md
+++ b/contributions/ClientSetup.md
@@ -8,8 +8,21 @@ On your development machine, please ensure that:
 
 1. You have `docker` installed in your system. If not, please visit: [https://docs.docker.com/get-docker/](https://docs.docker.com/get-docker/)
 1. You have `mkcert` installed. Please visit: [https://github.com/FiloSottile/mkcert#installation](https://github.com/FiloSottile/mkcert#installation) for details. For `mkcert` to work with Firefox you may require the `nss` utility to be installed. Details are in the link above.
+
+  Note:
+  - On Linux you can easily install `mkcert` using the following command
+  ```
+  curl -s https://api.github.com/repos/FiloSottile/mkcert/releases/latest \
+  | grep "browser_download_url.*linux-amd64" \
+  | cut -d : -f 2,3 | tr -d \" \
+  | wget -i - -O mkcert
+  chmod +x  mkcert
+  sudo mv mkcert /usr/local/bin
+  ```
+
 1. You have `envsubst` installed. use `brew install gettext` on MacOS. Linux machines usually have this installed.
 1. You have cloned the repo in your local machine.
+1. You have yarn installed as a global npm package i.e. `npm install -g yarn`
 
 ### Create local HTTPS certificates:
 
@@ -50,7 +63,7 @@ On your development machine, please ensure that:
 
 ### Steps to build & run the code:
 
-1. Run `yarn`
+1. Run `yarn install`
 
     Note:
 
@@ -70,7 +83,6 @@ On your development machine, please ensure that:
 
 - By default your client app points to the local api server - `http://host.docker.internal:8080` for MacOS or `http://localhost:8080` for Linux. Your page will load with errors if you don't have the api server running on your local system. To setup the api server on your local system please follow the instructions [here](https://github.com/appsmithorg/appsmith/blob/release/contributions/ServerSetup.md)
 - In case you are unable to setup the api server on your local system, you can also [use Appsmith's staging API server](#if-you-would-like-to-hit-a-different-appsmith-server).
-- In case you are using a M1 chip Macbook please run the client with `yarn start-m1`.
 
 #### If yarn start throws mismatch node version error
 
@@ -78,7 +90,7 @@ This error occurs because the node version is not compatible with the app enviro
 node versions to be used in different projects. Check below for installation and usage details:
 
 1. Install a node version manager. For eg: check [nvm](https://github.com/nvm-sh/nvm) or [fnm](https://github.com/Schniz/fnm).
-1. In the root of the project, run `nvm use 10.16.3` or `fnm use 10.16.3`.
+1. In the root of the project, run `nvm use 14.15.4` or `fnm use 14.15.4`.
 
 #### If you would like to hit a different Appsmith server:
 
@@ -95,6 +107,28 @@ node versions to be used in different projects. Check below for installation and
     yarn start
     ```
 
+### Windows WSL2 Setup
+
+Before you follow the instructions above, make sure to check the following steps:
+
+1. You have **WSL2** setup in your machine. If not, please visit: [https://docs.microsoft.com/en-us/windows/wsl/install-win10](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
+2. You have [Node.js](https://www.geeksforgeeks.org/installation-of-node-js-on-linux/) installed on the WSL Distro.
+3. You have **Docker Desktop** installed with WSL2 backend. If not, please visit: [https://docs.docker.com/docker-for-windows/wsl/](https://docs.docker.com/docker-for-windows/wsl/).
+
+In the above [Docker Desktop Setup](https://docs.docker.com/docker-for-windows/wsl/) instructions, make sure to:
+1. Set WSL Distro to run in WSL2 mode.
+2. Enable integration with the WSL Distro in Docker Desktop.
+3. Install [Remote-WSL](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl) extension in VSCode.
+
+Make sure to Clone the Repo in the WSL file system instead of the Windows file System.
+
+And finally, you can open the folder in VSCode with WSL by following the instructions in [Docker Desktop Setup](https://docs.docker.com/docker-for-windows/wsl/),
+or Alternatively by,
+1. Clicking on the Green button on the Bottom Left corner in VSCode.
+2. Selecting **Open Folder in WSL** and navigating to the folder in WSL.
+
+After this You can continue Setting up from [here](#pre-requisites).
+
 ### Troubleshooting
 
 #### I am on WSL and can't reach dev.appsmith.com
diff --git a/contributions/CodeContributionsGuidelines.md b/contributions/CodeContributionsGuidelines.md
index cf4ed51f6d..3d175781a7 100644
--- a/contributions/CodeContributionsGuidelines.md
+++ b/contributions/CodeContributionsGuidelines.md
@@ -65,4 +65,8 @@ Please check out our [Testing Contribution](docs/TestAutomation.md) guide for mo
 ### Contribute Code
 #### Server Code
 Please follow these guidelines according to the module that you wish to contribute to:
-- [Plugin](https://github.com/appsmithorg/appsmith/tree/release/contributions/ServerCodeContributionsGuidelines/PluginCodeContributionsGuidelines.md)
\ No newline at end of file
+- [Plugin](./ServerCodeContributionsGuidelines/PluginCodeContributionsGuidelines.md)
+
+#### Client Code
+Please follow the below guideline to add a new JS library to the Appsmith platform:
+- [Add Custom JS Library](./CustomJsLibrary.md)
\ No newline at end of file
diff --git a/contributions/CustomJsLibrary.md b/contributions/CustomJsLibrary.md
new file mode 100644
index 0000000000..4c9c340dc8
--- /dev/null
+++ b/contributions/CustomJsLibrary.md
@@ -0,0 +1,35 @@
+## Steps to add a custom JS library in Appsmith
+
+1. Install the npm library of your choice in the client codebase
+```
+$ cd app/client
+$ yarn install myLibrary
+```
+2. In the file `app/client/src/utils/DynamicBindingUtils.ts` find the const `extraLibraries` and add details about your library in the codebase
+```
+import myLibrary from "myLibrary";
+
+...
+...
+
+const extraLibraries = [
+	...
+	{  
+	 accessor: "myLibrary",// The namespace for access
+	 lib: myLibrary, // the javascript module from npm
+	 version: "3.17.5", // version number of the module
+	 docsURL: "https://github.com/NaturalIntelligence/fast-xml-parser",  
+	 displayName: "xmlParser", // Display name on the left pane
+	},
+]
+```
+3. To make this show up in autocomplete of appsmith we will need to add this to the Tern server file `app/client/src/utils/autocomplete/TernServer.ts`
+	- Add a new def file for your library usages [ref](https://ternjs.net/doc/manual.html#typedef) under  `app/client/src/constants/defs/`
+	- Import that file in the Tern Server file and add the def in the `DEFS` array right at the top of file
+	```
+	const DEFS = [..., myLibraryDef];
+	```
+	
+Notes:
+- Step 3 is optional but really helpful to get the hints in autocomplete.
+- All JS libraries run in a worker thread with a protected context. Make sure they run as expected during testing
diff --git a/contributions/ServerCodeContributionsGuidelines/PluginCodeContributionsGuidelines.md b/contributions/ServerCodeContributionsGuidelines/PluginCodeContributionsGuidelines.md
index 4be6e0f6eb..1e570ed02a 100644
--- a/contributions/ServerCodeContributionsGuidelines/PluginCodeContributionsGuidelines.md
+++ b/contributions/ServerCodeContributionsGuidelines/PluginCodeContributionsGuidelines.md
@@ -2,6 +2,246 @@
 
 Please follow the given guidelines to make sure that your commit sails through the review process without any 
 hiccups.
+### Steps to create a new plugin
+
+At this point, we assume that you have Appsmith's server code base setup locally. If not, please check out [the guide here](../ServerSetup.md).
+
+1. Create a new maven module in the folder: `app/server/appsmith-plugins` via the command:
+```
+mvn archetype:generate \
+-DgroupId=com.external.plugins \
+-DartifactId=helloWorldPlugin \
+-DarchetypeArtifactId=maven-archetype-quickstart \
+-DinteractiveMode=false
+```
+Replace the `artifactId` with your plugin name. This tutorial will use `helloWorldPlugin` as a place-holder.
+
+This command will generate a folder called `helloWorldPlugin` with default source code in the `appsmith-plugins` directory.
+
+2. Navigate to your plugin code with your favourite IDE. 
+
+3. Copy the required properties in the plugin's `pom.xml` file. Example:
+```
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>11</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <plugin.id>hello-world-plugin</plugin.id>
+        <plugin.class>com.external.plugins.HelloWorldPlugin</plugin.class>
+        <plugin.version>1.0-SNAPSHOT</plugin.version>
+        <plugin.provider>tech@appsmith.com</plugin.provider>
+        <plugin.dependencies/>
+    </properties>
+```
+Replace the properties `plugin.id` and `plugin.class` with your plugin name.
+
+4. Replace the default dependencies generated by maven with the following:
+```
+    <dependencies>
+        <dependency>
+            <groupId>org.pf4j</groupId>
+            <artifactId>pf4j-spring</artifactId>
+            <version>0.7.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.appsmith</groupId>
+            <artifactId>interfaces</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.8</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <version>3.2.11.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.1.0</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+```
+
+5. Add the `build` command to `pom.xml`:
+```
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <configuration>
+                    <minimizeJar>false</minimizeJar>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <manifestEntries>
+                                <Plugin-Id>${plugin.id}</Plugin-Id>
+                                <Plugin-Class>${plugin.class}</Plugin-Class>
+                                <Plugin-Version>${plugin.version}</Plugin-Version>
+                                <Plugin-Provider>${plugin.provider}</Plugin-Provider>
+                            </manifestEntries>
+                        </transformer>
+                    </transformers>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeScope>runtime</includeScope>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+```
+
+6. Add a file called `plugin.properties` with the following content:
+```
+plugin.id=hello-world-plugin
+plugin.class=com.external.plugins.HelloWorldPlugin
+plugin.version=1.0-SNAPSHOT
+plugin.provider=tech@appsmith.com
+plugin.dependencies=
+```
+Please remember that the `plugin.class` and `plugin.id` MUST be the same as the ones defined in your `pom.xml`.
+
+7. Navigate to your plugin's Java source folder `src/` and create a new class file `HelloWorldPlugin.java`. This is the same name as defined in your `pom.xml` property `plugin.class`.
+
+8. Ensure that the class has the following structure:
+
+```
+public class HelloWorldPlugin extends BasePlugin {
+
+    public HelloWorldPlugin(PluginWrapper wrapper) {
+        super(wrapper);
+    }
+
+    @Slf4j
+    @Extension
+    public static class HelloWorldPluginExecutor implements PluginExecutor<Object> {
+    }
+}
+```
+The `BasePlugin` & `PluginExecutor` classes define the basic operations of plugin execution
+
+9. Add the plugin to the DB so that the Appsmith platform understands that a new plugin has been created. This can be done via the `DatabaseChangelog.java` file. Eg:
+```
+    @ChangeSet(order = "076", id = "add-hello-world-plugin", author = "")
+    public void addHelloWorldPlugin(MongoTemplate mongoTemplate) {
+        Plugin plugin = new Plugin();
+        plugin.setName("Hello World Plugin");
+        plugin.setType(PluginType.DB);
+        plugin.setPackageName("hello-world-plugin");
+        plugin.setUiComponent("DbEditorForm");
+        plugin.setResponseType(Plugin.ResponseType.JSON);
+        plugin.setIconLocation("https://your-plugin-icon-location.png");
+        plugin.setDocumentationLink("https://link-to-plugin-documentation.html");
+        plugin.setDefaultInstall(true);
+        try {
+            mongoTemplate.insert(plugin);
+        } catch (DuplicateKeyException e) {
+            log.warn(plugin.getPackageName() + " already present in database.");
+        }
+
+        installPluginToAllOrganizations(mongoTemplate, plugin.getId());
+    }
+```
+
+10. Add the files `editor.json` and `form.json` in the `src/main/resources` folder. These JSON files are required to render the UI for your plugin. Samples are given below:
+```
+# form.json
+
+{
+  "form": [
+    {
+      "sectionName": "Details",
+      "id": 1,
+      "children": [
+        {
+          "label": "DB Username",
+          "configProperty": "datasourceConfiguration.authentication.username",
+          "controlType": "INPUT_TEXT",
+          "isRequired": true,
+          "placeholderText": "",
+          "initialValue": ""
+        },
+        {
+          "label": "DB Password",
+          "configProperty": "datasourceConfiguration.authentication.password",
+          "controlType": "INPUT_TEXT",
+          "dataType": "PASSWORD",
+          "initialValue": "",
+          "encrypted": true
+        }
+      ]
+    }
+  ]
+}
+
+# editor.json
+{
+  "editor": [
+    {
+      "sectionName": "",
+      "id": 1,
+      "children": [
+        {
+          "label": "",
+          "configProperty": "actionConfiguration.body",
+          "controlType": "QUERY_DYNAMIC_TEXT"
+        }
+      ]
+    }
+  ]
+}
+
+```
+
+11. Compile & run your code via the command:
+```
+cd app/server && ./build.sh && cd scripts && ./start-dev-server.sh
+```
 
 ### Code Design
 As much as possible, please try to abide by the following code design:
@@ -17,6 +257,7 @@ As much as possible, please try to abide by the following code design:
    For details, please see [this mapping](https://github.com/appsmithorg/appsmith/tree/release/static/editor.png) 
    between `editor.json` and the rendered web page.
 
+
 ### Package Dependency
 1. We use `Maven` to manage package dependencies, hence please add all your dependencies in `POM` file as shown in this 
    [pom.xml file](https://github.com/appsmithorg/appsmith/blob/release/app/server/appsmith-plugins/postgresPlugin/pom.xml) for postgreSQL plugin.
diff --git a/contributions/ServerSetup.md b/contributions/ServerSetup.md
index 5cbc4d2cff..c49108d4b7 100644
--- a/contributions/ServerSetup.md
+++ b/contributions/ServerSetup.md
@@ -1,28 +1,60 @@
 ## Running Server Codebase
 
-The server codebase is written in Java and is powered by Spring + WebFlux. This document explains how you can setup a development environment to make changes and test your changes.
+This document explains how you can setup a development environment for Appsmith server. As the server codebase is written in Java and is powered by Spring + WebFlux we need Java and Maven installed to build the code. In addition we also need one instance of MongoDB and Redis each to run Appsmith server. Lastly, we will set up IntelliJ IDEA to let you edit the code. Let's get those prerequisites installed on your machine.
+
+>If you are not setting up a development environment you can get the Appsmith server up and running quickly with `Docker`. Please refer to the [Setup Guide](../app/server/README.md#run-locally-with-docker) on how to do that.
 
 ## Pre-requisites
 
-- Java --- OpenJDK 11.
-- Maven --- version 3+ (preferably 3.6).
-- A MongoDB database --- A simple way to get this up is explained [further down in this document](#setting-up-a-local-mongodb).
-- A Redis instance --- A simple way to get this up is explained [further down in this document](#setting-up-a-local-redis).
-- An IDE --- We use IntelliJ IDEA as our primary IDE for backend development.
+Before you can start to hack on the Appsmith server, your machine should have the following installed:
 
-## Steps for Setup
+- Java - OpenJDK 11.
+- Maven - Version 3+ (preferably 3.6).
+- A MongoDB database - Refer to the [Setting up a local MongoDB instance](#setting-up-a-local-mongodb-instance) section to setup a MongoDB instance using `Docker`.
+- A Redis instance - Refer to the [Setting up a local Redis instance](#setting-up-a-local-redis-instance) section to setup a Redis instance using `Docker`.
+- An IDE - We use IntelliJ IDEA as our primary IDE for backend development. To set it up, refer to the [Setting up IntelliJ IDEA](#setting-up-intellij-idea) section.
 
-1. After cloning the repository, change your directory to `app/server`
+This document doesn't provide instructions to install Java and Maven because these vary between different operating systems and distributions. Please refer to the documentation of your operating system or package manager to install these. Next we will setup MondoDB and Redis using `Docker`.
 
-2. Run the command  
+### Setting up a local MongoDB instance
+
+The following command will start a MongoDB docker instance locally:
+
+```sh
+docker run -p 127.0.0.1:27017:27017 --name appsmith-mongodb -e MONGO_INITDB_DATABASE=appsmith -v /path/to/store/data:/data/db mongo
+```
+
+Please change the `/path/to/store/data` to a valid path on your system. This is where MongoDB will persist it's data across runs of this container.
+
+Note that this command doesn't set any username or password on the database so we make it accessible only from localhost using the `127.0.0.1:` part in the port mapping argument. Please refer to the documentation of this image to learn [how to set a username and password](https://hub.docker.com/_/mongo).
+
+MongoDB will now be running on `mongodb://localhost:27017/appsmith`.
+
+### Setting up a local Redis instance
+
+The following command will start a Redis docker instance locally:
+
+```sh
+docker run -p 127.0.0.1:6379:6379 --name appsmith-redis redis
+```
+
+Redis will now be running on `redis://localhost:6379`.
+
+With the prerequisites met, let's build the code.
+
+## Building and running the code
+
+1. Clone Appsmith repository.
+2. Change your directory to `app/server`.
+3. Run the following command: 
 
 ```sh
 mvn clean compile
 ```  
-  
+
 This generates a bunch of classes required by IntelliJ for compiling the rest of the source code. Without this step, your IDE may complain about missing classes and will be unable to compile the code.
 
-3. Create a copy of the `envs/dev.env.example` 
+4. Create a copy of the `envs/dev.env.example` 
 
 ```sh
 cp envs/dev.env.example .env
@@ -30,14 +62,14 @@ cp envs/dev.env.example .env
 
 This command creates a `.env` file in the `app/server` folder. All run scripts pick up environment configuration from this file.
 
-4. Modify the property values in the file `.env` to point to your local running instance of MongoDB and Redis.
+5. Ensure that the environment variables `APPSMITH_MONGODB_URI` and `APPSMITH_REDIS_URI` in the file `.env` point to your local running instances of MongoDB and Redis.
 
-5. In order to create the final JAR for the Appsmith server, run the command:
+6. Run the following command to create the final JAR for the Appsmith server:
 
 ```
 ./build.sh
 ```
-This command will create a `dist` folder which contains the final packaged jar along with multiple jars for the binaries for plugins as well.
+This command will create a `dist` folder which contains the final packaged jar along with multiple jars for plugins as well.
 
 Note:
 - If you want to skip tests, you can pass `-DskipTests` flag to the build cmd.
@@ -53,7 +85,7 @@ Check failed: Docker environment should have more than 2GB free disk space.
 There are two ways to resolve this issue: (1) free up more space (2) change docker's data root path.
 
 
-6. Start the Java server by running
+7. Start the Java server by running
 
 ```
 ./scripts/start-dev-server.sh
@@ -61,35 +93,13 @@ There are two ways to resolve this issue: (1) free up more space (2) change dock
 
 By default, the server will start on port 8080.
 
-7. When the server starts, it automatically runs migrations on MongoDB and will populate it with some initial required data.
+8. When the server starts, it automatically runs migrations on MongoDB and will populate it with some initial required data.
 
-8. You can check the status of the server by hitting the endpoint: [http://localhost:8080](http://localhost:8080) on your browser. By default you should see an HTTP 401 error.
+9. You can check the status of the server by hitting the endpoint: [http://localhost:8080](http://localhost:8080) on your browser. By default you should see an HTTP 401 error.
 
-## Setting up a local MongoDB
+Now the last bit, let's get your Intellij IDEA up and running.
 
-The following command can bring up a MongoDB docker instance locally.
-
-```sh
-docker run -p 127.0.0.1:27017:27017 --name appsmith-mongodb -e MONGO_INITDB_DATABASE=appsmith -v /path/to/store/data:/data/db mongo
-```
-
-Please change the `/path/to/store/data` to a valid path on your system. This is where MongoDB will persist it's data across runs of this container.
-
-Note that this command doesn't set any username or password on the database so we make it accessible only from localhost using the `127.0.0.1:` part in the port mapping argument. Please refer to the documentation of this image to learn [how to set a username and password](https://hub.docker.com/_/mongo).
-
-When using this command, the value of `APPSMITH_MONGODB_URI` should be set to `mongodb://localhost:27017/appsmith` (which is what's provided in the example env file).
-
-## Setting up a local Redis
-
-The following command can bring up a Redis docker instance locally.
-
-```sh
-docker run -p 127.0.0.1:6379:6379 --name appsmith-redis redis
-```
-
-When using this command, the value of `APPSMITH_REDIS_URI` should be set to `redis://localhost:6379`.
-
-## Seting up IntelliJ IDE
+## Setting up IntelliJ IDEA
 
 To run the project from within the IDE, you will need to make use of the run configuration that is part of the repository. The run configuration uses the [EnvFile](https://plugins.jetbrains.com/plugin/7861-envfile) plugin to include environment variables in the path. Any and all tests can be run within the IDE by cloning this run configuration.
 
@@ -107,7 +117,8 @@ Please note when setting **Working directory** option. If the path is not correc
 3. Load your env file by going to the EnvFile Tab in the Run/Debug configuration settings for your server.
 <img width="1067" alt="Screenshot 2021-03-03 at 1 49 17 PM" src="https://user-images.githubusercontent.com/458946/109775238-451c8d80-7c27-11eb-98ad-61fc33082b63.png">
 
+Happy hacking.
 
-## Need Assistance
+## Need Assistance?
 - If you are unable to resolve any issue while doing the setup, please feel free to ask questions on our [Discord channel](https://discord.com/invite/rBTTVJp) or initiate a [Github discussion](https://github.com/appsmithorg/appsmith/discussions) or send an email to `support@appsmith.com`. We'll be happy to help you. 
 - In case you notice any discrepancy, please raise an issue on Github and/or send an email to support@appsmith.com.
diff --git a/deploy/ansible/appsmith_playbook/appsmith-vars.yml b/deploy/ansible/appsmith_playbook/appsmith-vars.yml
index 81dd498371..bca918e2f0 100644
--- a/deploy/ansible/appsmith_playbook/appsmith-vars.yml
+++ b/deploy/ansible/appsmith_playbook/appsmith-vars.yml
@@ -39,4 +39,7 @@ tnc_pp: ''
 version_id: ''
 version_release_date: ''
 intercom_app_id: ''
+google_recaptcha_site_key: ''
+google_recaptcha_secret_key: ''
+google_recaptcha_enabled: 'false'
 
diff --git a/deploy/ansible/appsmith_playbook/roles/generate_template/templates/docker.env.j2 b/deploy/ansible/appsmith_playbook/roles/generate_template/templates/docker.env.j2
index f62bf401da..7bd7a504fc 100644
--- a/deploy/ansible/appsmith_playbook/roles/generate_template/templates/docker.env.j2
+++ b/deploy/ansible/appsmith_playbook/roles/generate_template/templates/docker.env.j2
@@ -45,3 +45,9 @@ APPSMITH_MONGODB_URI=mongodb://{{ mongo_root_user }}:{{ mongo_root_password }}@{
 # *******************************
 
 APPSMITH_DISABLE_TELEMETRY={{ disable_telemetry }}
+
+# ******** Google Recaptcha Keys ***********
+APPSMITH_RECAPTCHA_SITE_KEY= {{ google_recaptcha_site_key }}
+APPSMITH_RECAPTCHA_SECRET_KEY= {{ google_recaptcha_secrete_key }}
+APPSMITH_RECAPTCHA_ENABLED= {{ google_recaptcha_enabled }}
+# ********************************
diff --git a/deploy/ansible/appsmith_playbook/roles/generate_template/templates/nginx-app.conf.j2 b/deploy/ansible/appsmith_playbook/roles/generate_template/templates/nginx-app.conf.j2
index c46d49e702..0436cadb49 100644
--- a/deploy/ansible/appsmith_playbook/roles/generate_template/templates/nginx-app.conf.j2
+++ b/deploy/ansible/appsmith_playbook/roles/generate_template/templates/nginx-app.conf.j2
@@ -37,6 +37,9 @@
         sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '{{ version_release_date }}';
         sub_filter __APPSMITH_INTERCOM_APP_ID__ '{{ intercom_app_id }}';
         sub_filter __APPSMITH_MAIL_ENABLED__ '{{ mail_enabled }}';
+        sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '{{ google_recaptcha_site_key }}';
+        sub_filter __APPSMITH_RECAPTCHA_SECRET_KEY__ '{{ google_recaptcha_secrete_key }}';
+        sub_filter __APPSMITH_RECAPTCHA_ENABLED__ '{{ google_recaptcha_enabled }}';
     }
 
     location /f {
@@ -93,6 +96,9 @@
 {{ ssl_cmt }}        sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '{{ version_release_date }}';
 {{ ssl_cmt }}        sub_filter __APPSMITH_INTERCOM_APP_ID__ '{{ intercom_app_id }}';
 {{ ssl_cmt }}        sub_filter __APPSMITH_MAIL_ENABLED__ '{{ mail_enabled }}';
+{{ ssl_cmt }}        sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '{{ google_recaptcha_site_key }}';
+{{ ssl_cmt }}        sub_filter __APPSMITH_RECAPTCHA_SECRET_KEY__ '{{ google_recaptcha_secrete_key }}';
+{{ ssl_cmt }}        sub_filter __APPSMITH_RECAPTCHA_ENABLED__ '{{ google_recaptcha_enabled }}';
 {{ ssl_cmt }}    }
 
 {{ ssl_cmt }}    location /f {
diff --git a/deploy/heroku/README.MD b/deploy/heroku/README.MD
index 14b6740d62..552bb15245 100644
--- a/deploy/heroku/README.MD
+++ b/deploy/heroku/README.MD
@@ -33,6 +33,10 @@ Quickly set up Appsmith to explore product functionality using Heroku.
         - `APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET`: Client secret provided by Github for OAuth2 login
     - `APPSMITH_GOOGLE_MAPS_API_KEY`: Google Maps API key which is required if you wish to leverage Google Maps widget. Read more at: https://docs.appsmith.com/v/v1.2.1/setup/docker/google-maps
     - `APPSMITH_DISABLE_TELEMETRY`: We want to be transparent and request that you share anonymous usage data with us. This data is purely statistical in nature and helps us understand your needs & provide better support to your self-hosted instance. You can read more about what information is collected in our documentation https://docs.appsmith.com/v/v1.2.1/setup/telemetry
+    - Google reCAPTCHA v3 Configuration:
+      - `APPSMITH_RECAPTCHA_SITE_KEY`: Google reCAPTCHA v3 site key, it is required if you wish to enable protection against spam/abusive users. Read more at: https://developers.google.com/recaptcha/docs/v3
+      - `APPSMITH_RECAPTCHA_SECRET_KEY`: Google reCAPTCHA v3 verification secret key, it is required if you wish to enable spam protection in your backend server.
+      - `APPSMITH_RECAPTCHA_ENABLED`: Boolean config to enable or disable Google reCAPTCHA v3 verification feature. If set to true, both site key and secret key should be provided.
 
     After Heroku finishes setting up the app, click “View” and your Appsmith should be up and running. You will be taken to the account creation page, where you can enter credentials to create an account and get started.
 
diff --git a/deploy/heroku/bootstrap.sh b/deploy/heroku/bootstrap.sh
index 8e07179d37..4275fb890b 100755
--- a/deploy/heroku/bootstrap.sh
+++ b/deploy/heroku/bootstrap.sh
@@ -42,6 +42,12 @@ if [[ -z "${APPSMITH_GOOGLE_MAPS_API_KEY}" ]]; then
     unset APPSMITH_GOOGLE_MAPS_API_KEY
 fi
 
+if [[ -z "${APPSMITH_RECAPTCHA_SITE_KEY}" ]] || [[ -z "${APPSMITH_RECAPTCHA_SECRET_KEY}" ]] || [[ -z "${APPSMITH_RECAPTCHA_ENABLED}" ]]; then
+    unset APPSMITH_RECAPTCHA_SITE_KEY # If this field is empty is might cause application crash
+    unset APPSMITH_RECAPTCHA_SECRET_KEY
+    unset APPSMITH_RECAPTCHA_ENABLED
+fi
+
 cat /etc/nginx/conf.d/default.conf.template | envsubst "$(printf '$%s,' $(env | grep -Eo '^APPSMITH_[A-Z0-9_]+'))" | sed -e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' > /etc/nginx/conf.d/default.conf.template.1
 
 envsubst "\$PORT" < /etc/nginx/conf.d/default.conf.template.1 > /etc/nginx/conf.d/default.conf
diff --git a/deploy/heroku/default.conf.template b/deploy/heroku/default.conf.template
index 8362ccc505..490cacb32d 100644
--- a/deploy/heroku/default.conf.template
+++ b/deploy/heroku/default.conf.template
@@ -32,6 +32,9 @@ server {
         sub_filter __APPSMITH_INTERCOM_APP_ID__ '${APPSMITH_INTERCOM_APP_ID}';
         sub_filter __APPSMITH_MAIL_ENABLED__ '${APPSMITH_MAIL_ENABLED}';
         sub_filter __APPSMITH_DISABLE_TELEMETRY__ '${APPSMITH_DISABLE_TELEMETRY}';
+        sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
+        sub_filter __APPSMITH_RECAPTCHA_SECRET_KEY__ '${APPSMITH_RECAPTCHA_SECRET_KEY}';
+        sub_filter __APPSMITH_RECAPTCHA_ENABLED__ '${APPSMITH_RECAPTCHA_ENABLED}';
     }
 
     location /f {
diff --git a/deploy/k8s/scripts/appsmith-configmap.yaml.sh b/deploy/k8s/scripts/appsmith-configmap.yaml.sh
index d664292f6f..beb60f4194 100644
--- a/deploy/k8s/scripts/appsmith-configmap.yaml.sh
+++ b/deploy/k8s/scripts/appsmith-configmap.yaml.sh
@@ -30,4 +30,7 @@ data:
   APPSMITH_REDIS_URL: redis://redis-service:6379
   APPSMITH_MONGODB_URI: $mongo_protocol$encoded_mongo_root_user:$encoded_mongo_root_password@$mongo_host/$mongo_db?retryWrites=true&authSource=admin
   APPSMITH_DISABLE_TELEMETRY: "$disable_telemetry"
+  APPSMITH_RECAPTCHA_SITE_KEY: ""
+  APPSMITH_RECAPTCHA_SECRET_KEY: ""
+  APPSMITH_RECAPTCHA_ENABLED: "false"
 EOF
diff --git a/deploy/k8s/scripts/nginx-configmap.yaml b/deploy/k8s/scripts/nginx-configmap.yaml
index b2fbc721bf..eef8665258 100644
--- a/deploy/k8s/scripts/nginx-configmap.yaml
+++ b/deploy/k8s/scripts/nginx-configmap.yaml
@@ -36,6 +36,10 @@ data:
         sub_filter __APPSMITH_INTERCOM_APP_ID__ '${APPSMITH_INTERCOM_APP_ID}';
         sub_filter __APPSMITH_MAIL_ENABLED__ '${APPSMITH_MAIL_ENABLED}';
         sub_filter __APPSMITH_DISABLE_TELEMETRY__ '${APPSMITH_DISABLE_TELEMETRY}';
+        sub_filter __APPSMITH_CLOUD_SERVICES_BASE_URL__ '${APPSMITH_CLOUD_SERVICES_BASE_URL}';
+        sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
+        sub_filter __APPSMITH_RECAPTCHA_SECRET_KEY__ '${APPSMITH_RECAPTCHA_SECRET_KEY}';
+        sub_filter __APPSMITH_RECAPTCHA_ENABLED__ '${APPSMITH_RECAPTCHA_ENABLED}';
     }
 
     location /f {
diff --git a/deploy/template/docker.env.sh b/deploy/template/docker.env.sh
index 6bbeb5e901..d1561b8902 100644
--- a/deploy/template/docker.env.sh
+++ b/deploy/template/docker.env.sh
@@ -59,4 +59,10 @@ APPSMITH_DISABLE_TELEMETRY=$disable_telemetry
 # APPSMITH_CODEC_SIZE=
 # *******************************
 
+# ***** Google Recaptcha Config ******
+# APPSMITH_RECAPTCHA_SITE_KEY=
+# APPSMITH_RECAPTCHA_SECRET_KEY=
+# APPSMITH_RECAPTCHA_ENABLED=
+# ************************************
+
 EOF
diff --git a/deploy/template/nginx_app.conf.sh b/deploy/template/nginx_app.conf.sh
index cb0a0928b4..0e56aa3361 100644
--- a/deploy/template/nginx_app.conf.sh
+++ b/deploy/template/nginx_app.conf.sh
@@ -49,6 +49,9 @@ $NGINX_SSL_CMNT    server_name $custom_domain ;
         sub_filter __APPSMITH_INTERCOM_APP_ID__ '\${APPSMITH_INTERCOM_APP_ID}';
         sub_filter __APPSMITH_MAIL_ENABLED__ '\${APPSMITH_MAIL_ENABLED}';
         sub_filter __APPSMITH_DISABLE_TELEMETRY__ '\${APPSMITH_DISABLE_TELEMETRY}';
+        sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '\${APPSMITH_RECAPTCHA_SITE_KEY}';
+        sub_filter __APPSMITH_RECAPTCHA_SECRET_KEY__ '\${APPSMITH_RECAPTCHA_SECRET_KEY}';
+        sub_filter __APPSMITH_RECAPTCHA_ENABLED__ '\${APPSMITH_RECAPTCHA_ENABLED}';
     }
 
     location /f {
@@ -106,6 +109,9 @@ $NGINX_SSL_CMNT        sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '\${APPSMITH
 $NGINX_SSL_CMNT        sub_filter __APPSMITH_INTERCOM_APP_ID__ '\${APPSMITH_INTERCOM_APP_ID}';
 $NGINX_SSL_CMNT        sub_filter __APPSMITH_MAIL_ENABLED__ '\${APPSMITH_MAIL_ENABLED}';
 $NGINX_SSL_CMNT        sub_filter __APPSMITH_DISABLE_TELEMETRY__ '\${APPSMITH_DISABLE_TELEMETRY}';
+$NGINX_SSL_CMNT        sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '\${APPSMITH_RECAPTCHA_SITE_KEY}';
+$NGINX_SSL_CMNT        sub_filter __APPSMITH_RECAPTCHA_SECRET_KEY__ '\${APPSMITH_RECAPTCHA_SECRET_KEY}';
+$NGINX_SSL_CMNT        sub_filter __APPSMITH_RECAPTCHA_ENABLED__ '\${APPSMITH_RECAPTCHA_ENABLED}';
 $NGINX_SSL_CMNT    }
 $NGINX_SSL_CMNT
 $NGINX_SSL_CMNT    location /f {
diff --git a/office_hours.md b/office_hours.md
index d020c0d34d..48fef782aa 100644
--- a/office_hours.md
+++ b/office_hours.md
@@ -1,33 +1,104 @@
-## Appsmith Office Hours 👩🏽‍💻 👋🏼
+## Appsmith Events 👩🏽‍💻 👋🏼
 
-[Sign Up For Office Hours](https://app.appsmith.com/applications/602b8aef12ba0d29d3ec151c/pages/602b8aef12ba0d29d3ec151e)
+[Sign Up For Events](https://app.appsmith.com/applications/602b8aef12ba0d29d3ec151c/pages/602b8aef12ba0d29d3ec151e)
   
 -----------------
   
-Appsmith office hours are a dedicated time slot in which our team will be available to help our users real time. It also gives us an opportunity to interact with the community, understand your concerns and communicate our thinking to you. Office hours are conducted by the appsmith team every week for 1 hour at 10am CET on Tuesday and 10am PST on Fridays.
+Appsmith Events are a dedicated time slot every Thursday at 10am PT in which our team will spend time with our users in the form of a community discussion, Live Demo or webinar. It gives us an opportunity to interact with the community, understand your concerns and communicate our thinking to you.
 
 The office hours broadly covers the following topics:
 
-<ul>
-    <li>Answering questions on how to get things done on appsmith.</li>
-    <li>Bug fixes and releases from our team over the past week. </li>
-    <li>Community discussions about requested features to help us prioritize product roadmap initiatives. </li>
-    <li>Community discussions about bugs and potential enhancements to the product. </li>
-</ul>
 
-▶️
-Multiple appsmith team members will be on the call, and will step-in to help wherever relevant. The office hours are recorded and will be put up in our [youtube channel](https://www.youtube.com/watch?v=Uqk9jy5CXxY&list=PLE_KXGiWfqwiUzo4-wG1WzU_wtul1Syin&index=4) and website (coming soon!) also.
+The events are recorded and will be put up in our [youtube channel](https://www.youtube.com/watch?v=Uqk9jy5CXxY&list=PLE_KXGiWfqwiUzo4-wG1WzU_wtul1Syin&index=4) and website (coming soon!) also.
 
 🙋🏽‍♀️
-You can <a href = "https://app.appsmith.com/applications/602b8aef12ba0d29d3ec151c/pages/602b8aef12ba0d29d3ec151e">pre-register</a> for the office hours here to get an invite to your email inbox, or just sign up to get alerts from the office hours and reminders with the link to the sessions here. You can also join us on <a href="https://discord.gg/rBTTVJp">discord</a> where we send out periodic reminders for the office hours and have a dedicated support channel. 
+You can <a href = "https://app.appsmith.com/applications/602b8aef12ba0d29d3ec151c/pages/602b8aef12ba0d29d3ec151e">pre-register</a> and search for events here to get an invite to your email inbox, or just sign up to get alerts to the sessions here. You can also join us on <a href="https://discord.gg/rBTTVJp">discord</a> where we send out periodic reminders for the office hours and have a dedicated support channel. 
 
-You can find the archives of the calls below with a brief summary of each session. The video descriptions in youtube have more detailed explanations. If you have any feedback or requests regarding the office hours program, please write to akshay@appsmith.com
+You can find the archives of the calls below with a brief summary of each event. The video descriptions in youtube have more detailed explanations. If you have any feedback or requests regarding the office hours program, please write to akshay@appsmith.com
 
 
 -----------------
 
 ## Archives
 
+<strong>Appsmith Live Demo #5: Building a Tweetdeck Clone With n8n and Appsmith</strong>
+
+<a href = "https://youtu.be/mWZGn8kuIBo">Video Link</a>
+
+#### Summary
+
+We had our friend from n8n join us in this Live Demo session to build a Tweetdeck clone in 20 minutes. Confidence from Appsmith built the demo app
+using Appsmith for the frontend and building the workflow automation with n8n.
+
+------------------
+
+<strong>Community Call Jun 24, 2021: All about Integrations</strong>
+
+<a href = "https://youtu.be/hQScncyEUds">Video Link</a>
+
+#### Summary
+
+This week's community session was all about Integrations. Arpit discusses how we develop integrations at Appsmith, and shows the community how they can contribute new ones.
+
+------------------
+
+<strong>Community Call Jun 10, 2021: New Upcoming Widgets and Latest Releases</strong>
+
+<a href = "https://youtu.be/B6T6L6GYARM">Video Link</a>
+
+#### Summary
+
+Somangshu and Abhishek talked about the latest releases from the past two weeks. Somangshu also demoed a few of our upcoming widgets and share designs for those that are in the works.
+
+------------------
+
+<strong>Appsmith Live Demo #4, 3rd Jun 2021:  Building a CMS with the Notion API</strong>
+
+<a href = "https://youtu.be/O8GyCI-nRLI">Video Link</a>
+
+#### Summary
+
+Akshay and Confidence show the community how we internally used the recently released Notion API to build a CMS with features not available natively in notion. This demo also shows how to work with APIs having complex responses.
+
+------------------
+
+<strong>Appsmith Live Demo #3, 29th May 2021:  Stitching APIs together to automate workflows</strong>
+
+<a href = "https://youtu.be/_8qLbyWwXeA">Video Link</a>
+
+#### Summary
+
+Confidence shows the community how we internally use APIs from multiple services to build apps that simplifies our workflow within Appsmith. Top questions from members of our community was also discussed.
+
+------------------
+
+<strong>Office Hours May 13th, 2021: Product roadmap discussion</strong>
+
+<a href = "https://youtu.be/1sw84i_M4_Y">Video Link</a>
+
+#### Summary
+
+Abhishek shows the community our current product road map and explains how members can contribute to it. Abhishek also hosted an interactive section where members of the community voted for the top features they want to see on Appsmith. 
+
+Some of the most requested features are: 
+1. Generate form from DB schema
+2. Custom NPM packages
+3. Custom theming
+4. Keyboard first navigation
+
+You can vote for your favorite features [here](https://miro.com/app/board/o9J_lE-dkdM=/)
+
+------------------
+
+<strong>Appsmith Live Demo #2, 6th May 2021: Building a support helpdesk using Gmail and Postgres</strong>
+
+<a href = "https://youtu.be/X_x_nRZf418">Video Link</a>
+
+#### Summary
+
+Nikhil shows the community how to build a ticket support dashboard to assign emails to various org members using the Gmail API and Postgres. Questions from members of our community was also discussed.
+
+------------------
 
 <strong>29th April 2021: List widget, Release roadmap and more</strong>
 
diff --git a/static/API2.png b/static/API2.png
deleted file mode 100644
index 1c140d39c9..0000000000
Binary files a/static/API2.png and /dev/null differ
diff --git a/static/Query2.png b/static/Query2.png
deleted file mode 100644
index 410d4f0a34..0000000000
Binary files a/static/Query2.png and /dev/null differ
diff --git a/static/Share5.png b/static/Share5.png
deleted file mode 100644
index c6ee5c8ed8..0000000000
Binary files a/static/Share5.png and /dev/null differ
diff --git a/static/UI.gif b/static/UI.gif
deleted file mode 100644
index dd4bb0ee43..0000000000
Binary files a/static/UI.gif and /dev/null differ
diff --git a/static/animations/invite.gif b/static/animations/invite.gif
new file mode 100644
index 0000000000..5d58236943
Binary files /dev/null and b/static/animations/invite.gif differ
diff --git a/static/animations/javascript.gif b/static/animations/javascript.gif
new file mode 100644
index 0000000000..311075b83e
Binary files /dev/null and b/static/animations/javascript.gif differ
diff --git a/static/animations/login-google.gif b/static/animations/login-google.gif
new file mode 100644
index 0000000000..762a4981f2
Binary files /dev/null and b/static/animations/login-google.gif differ
diff --git a/static/animations/running-api.gif b/static/animations/running-api.gif
new file mode 100644
index 0000000000..2b82c0e457
Binary files /dev/null and b/static/animations/running-api.gif differ
diff --git a/static/animations/widgets.gif b/static/animations/widgets.gif
new file mode 100644
index 0000000000..f9392fe81f
Binary files /dev/null and b/static/animations/widgets.gif differ
diff --git a/static/demo.gif b/static/demo.gif
deleted file mode 100644
index 7a04795c1c..0000000000
Binary files a/static/demo.gif and /dev/null differ
diff --git a/static/git-banner.png b/static/git-banner.png
new file mode 100644
index 0000000000..8156e85cea
Binary files /dev/null and b/static/git-banner.png differ
diff --git a/static/images/animations/drag-drop.gif b/static/images/animations/drag-drop.gif
new file mode 100644
index 0000000000..5ff1635453
Binary files /dev/null and b/static/images/animations/drag-drop.gif differ
diff --git a/static/images/animations/move-around.gif b/static/images/animations/move-around.gif
new file mode 100644
index 0000000000..6511ec7d61
Binary files /dev/null and b/static/images/animations/move-around.gif differ
diff --git a/static/images/animations/running-api.gif b/static/images/animations/running-api.gif
new file mode 100644
index 0000000000..6f45031857
Binary files /dev/null and b/static/images/animations/running-api.gif differ
diff --git a/static/images/animations/selections.gif b/static/images/animations/selections.gif
new file mode 100644
index 0000000000..533c22c550
Binary files /dev/null and b/static/images/animations/selections.gif differ
diff --git a/static/images/animations/video-preview.gif b/static/images/animations/video-preview.gif
new file mode 100644
index 0000000000..448e4ab813
Binary files /dev/null and b/static/images/animations/video-preview.gif differ
diff --git a/static/images/animations/writing-js.gif b/static/images/animations/writing-js.gif
new file mode 100644
index 0000000000..1b7e8150c2
Binary files /dev/null and b/static/images/animations/writing-js.gif differ
diff --git a/static/images/build-tool.png b/static/images/build-tool.png
new file mode 100644
index 0000000000..e44c393bb0
Binary files /dev/null and b/static/images/build-tool.png differ
diff --git a/static/images/git-banner-left.png b/static/images/git-banner-left.png
new file mode 100644
index 0000000000..26c805916f
Binary files /dev/null and b/static/images/git-banner-left.png differ
diff --git a/static/images/git-banner-right.png b/static/images/git-banner-right.png
new file mode 100644
index 0000000000..4b7bd64efd
Binary files /dev/null and b/static/images/git-banner-right.png differ
diff --git a/static/images/git-banner.jpg b/static/images/git-banner.jpg
new file mode 100644
index 0000000000..7bcb0aa969
Binary files /dev/null and b/static/images/git-banner.jpg differ
diff --git a/static/images/git-banner.png b/static/images/git-banner.png
new file mode 100644
index 0000000000..8156e85cea
Binary files /dev/null and b/static/images/git-banner.png differ
diff --git a/static/images/integrations.png b/static/images/integrations.png
new file mode 100644
index 0000000000..f92363d8d2
Binary files /dev/null and b/static/images/integrations.png differ
diff --git a/static/images/users.png b/static/images/users.png
new file mode 100644
index 0000000000..c8f369666f
Binary files /dev/null and b/static/images/users.png differ